@optique/core 1.3.0-dev.2387 → 1.3.0-dev.2390

package/dist/constructs.js

@@ -5,7 +5,7 @@ import { extractArgumentMetavars, extractCommandNames, extractOptionNames, isDoc
 import { deduplicateDocFragments } from "./doc.js";
 import { dispatchByMode, dispatchIterableByMode } from "./internal/mode-dispatch.js";
 import { createDependencySourceState, dependencyId, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, wrappedDependencySourceMarker } from "./internal/dependency.js";
-import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, completeEffectfulSourcesAsync, createDependencyRuntimeContext, effectfulSchedulingNodesKey, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync } from "./dependency-runtime.js";
+import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, completeEffectfulSourcesAsync, createDependencyRuntimeContext, effectfulSchedulingNodesKey, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync, serializeSchedulingPath, sourceCollectionExpansionKey, staticSourceScopeKey } from "./dependency-runtime.js";
 import { defineInheritedAnnotationParser, defineParseLanes, getOwnParseLanes, getParserSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { annotationViewTargets, getWrappedChildParseState, getWrappedChildState, reconcileObjectChildState, unwrapAnnotationView } from "./annotation-state.js";
 import { allowDuplicateLeadingCommandNamesKey } from "./internal/command-alias.js";
@@ -134,6 +134,54 @@ function expandEffectfulRuntimeNodes(nodes) {
 	for (const node of nodes) visit(node);
 	return expanded;
 }
+/**
+* Expands a construct's direct-child nodes for explicit source
+* collection.
+*
+* A direct child that opted in through {@link sourceCollectionExpansionKey}
+* (a `conditional()` or a `command()`, possibly behind transparent
+* wrappers) is replaced in place by its scheduling-hook expansion, so
+* its command-line source values—the discriminator, a committed branch,
+* a selected command subtree—register into the parent's runtime in the
+* child's declaration position.  Every other node passes through
+* unchanged, keeping the existing collection scope for plain nested
+* constructs and uncommitted exclusive branches.
+*/
+function expandSourceCollectionNodes(nodes) {
+	let expanded;
+	for (let i = 0; i < nodes.length; i++) {
+		const node = nodes[i];
+		const optedIn = node.parser[sourceCollectionExpansionKey] === true;
+		if (!optedIn) {
+			expanded?.push(node);
+			continue;
+		}
+		if (expanded == null) expanded = nodes.slice(0, i);
+		expanded.push(...expandEffectfulRuntimeNodes([node]));
+	}
+	return expanded ?? nodes;
+}
+let conditionalInstanceCounter = 0;
+/**
+* Statically collects the dependency source IDs reachable through a
+* parser's composed metadata and flattened field pairs.  Used as the
+* `providesSourceIds` estimate for a conditional()'s branches: an
+* undercount only delays an effectful completion from the seed pass to
+* the final pass of a `runWith()` run.
+*/
+function collectStaticSourceIds(parser, out, seen) {
+	if (seen.has(parser)) return;
+	seen.add(parser);
+	const source = parser.dependencyMetadata?.source;
+	if (source != null) {
+		out.add(source.sourceId);
+		return;
+	}
+	const pairs = parser[fieldParsersKey];
+	if (pairs != null) for (const [, child] of pairs) collectStaticSourceIds(child, out, seen);
+	const scope = parser[staticSourceScopeKey];
+	if (scope != null) for (const child of scope) collectStaticSourceIds(child, out, seen);
+}
 function isDeferredCompletionResult(result) {
 	return typeof result === "object" && result !== null && "success" in result && result.success === true && "deferred" in result && result.deferred === true;
 }
@@ -179,9 +227,19 @@ async function scheduleEffectfulSourceCompletions(nodes, state, runtime, exec, p
 		error: preCompletedFailure
 	};
 	const direct = new Set(nodes);
-	const effectful = await completeEffectfulSourcesAsync(expandEffectfulRuntimeNodes(nodes), state, runtime, exec, {
+	const collected = /* @__PURE__ */ new Set();
+	const expandedNodes = [];
+	for (const node of nodes) {
+		const optedIn = node.parser[sourceCollectionExpansionKey] === true;
+		for (const expandedNode of expandEffectfulRuntimeNodes([node])) {
+			expandedNodes.push(expandedNode);
+			if (optedIn || expandedNode === node) collected.add(expandedNode);
+		}
+	}
+	const effectful = await completeEffectfulSourcesAsync(expandedNodes, state, runtime, exec, {
 		...demandNodes != null ? { demandNodes: expandEffectfulRuntimeNodes(demandNodes) } : {},
-		isReusable: (node) => direct.has(node)
+		isReusable: (node) => direct.has(node),
+		isCollected: (node) => collected.has(node)
 	});
 	if (!effectful.success) return {
 		success: false,
@@ -936,6 +994,11 @@ function getNoMatchError(options, noMatchContext) {
 * when the committed branch completes.
 */
 function defineExclusiveSchedulingNodes(exclusiveParser, parsers) {
+	Object.defineProperty(exclusiveParser, staticSourceScopeKey, {
+		value: parsers,
+		configurable: true,
+		enumerable: false
+	});
 	Object.defineProperty(exclusiveParser, effectfulSchedulingNodesKey, {
 		value: ((state, parentPath) => {
 			const active = normalizeExclusiveState(state);
@@ -1734,7 +1797,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 	const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
 	const sourceParserPairs = filterExcludedFieldParsers(parserPairs, context.exec?.excludedSourceFields);
 	const nodes = buildRuntimeNodesFromPairs(sourceParserPairs, context.state && typeof context.state === "object" ? context.state : {}, context.exec?.path);
-	collectExplicitSourceValues(nodes, runtime);
+	collectExplicitSourceValues(expandSourceCollectionNodes(nodes), runtime);
 	if (context.state && typeof context.state === "object") collectSourcesFromState(context.state, runtime, /* @__PURE__ */ new WeakSet(), context.exec?.excludedSourceFields);
 	completeDependencySourceDefaults(context, sourceParserPairs, runtime.registry, context.exec);
 	const contextWithRegistry = {
@@ -1770,7 +1833,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
 	const sourceParserPairs = filterExcludedFieldParsers(parserPairs, context.exec?.excludedSourceFields);
 	const nodes = buildRuntimeNodesFromPairs(sourceParserPairs, context.state && typeof context.state === "object" ? context.state : {}, context.exec?.path);
-	await collectExplicitSourceValuesAsync(nodes, runtime);
+	await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(nodes), runtime);
 	if (context.state && typeof context.state === "object") collectSourcesFromState(context.state, runtime, /* @__PURE__ */ new WeakSet(), context.exec?.excludedSourceFields);
 	await completeDependencySourceDefaultsAsync(context, sourceParserPairs, runtime.registry, context.exec);
 	const contextWithRegistry = {
@@ -2431,7 +2494,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					const fieldParser = parsers[field];
 					annotatedState[fieldKey] = getFieldState(field, fieldParser);
 				}
-				collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromPairs(typedParserPairs, annotatedState, exec?.path), new Set(preCompleted.keys())), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromPairs(typedParserPairs, annotatedState, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const resolvedFieldStates = resolveStateWithRuntime(annotatedState, runtime);
 				const result = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -2486,7 +2549,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				}
 				const allRuntimeNodes = buildRuntimeNodesFromPairs(asyncParserPairs, annotatedState, exec?.path);
 				const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-				await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), annotatedState, runtime, childExec, preCompleted);
 				if (effectfulFailure != null) return effectfulFailure;
 				const resolvedFieldStates = await resolveStateWithRuntimeAsync(annotatedState, runtime);
@@ -2567,7 +2630,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					const fieldParser = parsers[field];
 					annotatedState[fieldKey] = getFieldState(field, fieldParser);
 				}
-				collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromPairs(typedParserPairs, annotatedState, exec?.path), new Set(preCompleted.keys())), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromPairs(typedParserPairs, annotatedState, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const resolvedFieldStates = resolveStateWithRuntime(annotatedState, runtime);
 				const result = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -2612,7 +2675,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				}
 				const allRuntimeNodes = buildRuntimeNodesFromPairs(asyncParserPairs, annotatedState, exec?.path);
 				const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-				await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), annotatedState, runtime, childExec, preCompleted);
 				if (effectfulFailure != null) return null;
 				const resolvedFieldStates = await resolveStateWithRuntimeAsync(annotatedState, runtime);
@@ -2993,7 +3056,7 @@ function createSeqComplete(parsers, combinedMode) {
 		const pairs = buildIndexedParserPairs(syncParsers);
 		const stateRecord = createAnnotatedArrayStateRecord(stateArray);
 		const preCompleted = preCompleteAndRegisterDependencies(stateRecord, pairs, runtime.registry, childExec);
-		collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
+		collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 		const phase3Exec = {
 			...childExec,
 			preCompletedByParser: void 0
@@ -3035,7 +3098,7 @@ function createSeqComplete(parsers, combinedMode) {
 		const preCompleted = await preCompleteAndRegisterDependenciesAsync(stateRecord, pairs, runtime.registry, childExec);
 		const allRuntimeNodes = buildRuntimeNodesFromArray(parsers, stateArray, exec?.path);
 		const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-		await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+		await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 		const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), stateArray, runtime, childExec, preCompleted);
 		if (effectfulFailure != null) return effectfulFailure;
 		const phase3Exec = {
@@ -3077,7 +3140,7 @@ function suggestTupleSync(context, prefix, parsers) {
 	const runtime = createDependencyRuntimeContext(advancedContext.dependencyRegistry?.clone());
 	if (stateArray && Array.isArray(stateArray)) {
 		const nodes = buildSuggestRuntimeNodesFromArray(parsers, stateArray, advancedContext.exec?.path);
-		collectExplicitSourceValues(nodes, runtime);
+		collectExplicitSourceValues(expandSourceCollectionNodes(nodes), runtime);
 		fillMissingSourceDefaults(nodes, runtime);
 		collectSourcesFromState(stateArray, runtime);
 		completeDependencySourceDefaults({
@@ -3111,7 +3174,7 @@ async function* suggestTupleAsync(context, prefix, parsers) {
 	const runtime = createDependencyRuntimeContext(advancedContext.dependencyRegistry?.clone());
 	if (stateArray && Array.isArray(stateArray)) {
 		const nodes = buildSuggestRuntimeNodesFromArray(parsers, stateArray, advancedContext.exec?.path);
-		await collectExplicitSourceValuesAsync(nodes, runtime);
+		await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(nodes), runtime);
 		await fillMissingSourceDefaultsAsync(nodes, runtime);
 		collectSourcesFromState(stateArray, runtime);
 		await completeDependencySourceDefaultsAsync({
@@ -3280,7 +3343,7 @@ function markFailedTupleSuggestSources(parsers, stateArray, failedParserIndexes,
 		const nodes = getParserSuggestRuntimeNodes(parser, getWrappedChildState(stateArray, parserState, parser), [...prefix, index]);
 		if (nodes.length < 1) continue;
 		const failedRuntime = createDependencyRuntimeContext();
-		collectExplicitSourceValues(nodes, failedRuntime);
+		collectExplicitSourceValues(expandSourceCollectionNodes(nodes), failedRuntime);
 		for (const node of nodes) {
 			const sourceId = node.parser.dependencyMetadata?.source?.sourceId;
 			if (sourceId != null && failedRuntime.isSourceFailed(sourceId)) runtime.markSourceFailed(sourceId);
@@ -3297,7 +3360,7 @@ async function markFailedTupleSuggestSourcesAsync(parsers, stateArray, failedPar
 		const nodes = getParserSuggestRuntimeNodes(parser, getWrappedChildState(stateArray, parserState, parser), [...prefix, index]);
 		if (nodes.length < 1) continue;
 		const failedRuntime = createDependencyRuntimeContext();
-		await collectExplicitSourceValuesAsync(nodes, failedRuntime);
+		await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(nodes), failedRuntime);
 		for (const node of nodes) {
 			const sourceId = node.parser.dependencyMetadata?.source?.sourceId;
 			if (sourceId != null && failedRuntime.isSourceFailed(sourceId)) runtime.markSourceFailed(sourceId);
@@ -3481,7 +3544,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const tuplePairs = buildIndexedParserPairs(syncParsers);
 				const tupleState = createAnnotatedArrayStateRecord(stateArray);
 				const preCompleted = preCompleteAndRegisterDependencies(tupleState, tuplePairs, runtime.registry, childExec);
-				collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
 					preCompletedByParser: void 0
@@ -3530,7 +3593,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(tupleState, tuplePairs, runtime.registry, childExec);
 				const allRuntimeNodes = buildRuntimeNodesFromArray(parsers, stateArray, exec?.path);
 				const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-				await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), stateArray, runtime, childExec, preCompleted);
 				if (effectfulFailure != null) return effectfulFailure;
 				const phase3Exec = {
@@ -3579,7 +3642,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const tuplePairs = buildIndexedParserPairs(syncParsers);
 				const tupleState = createAnnotatedArrayStateRecord(stateArray);
 				const preCompleted = preCompleteAndRegisterDependencies(tupleState, tuplePairs, runtime.registry, childExec);
-				collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
 					preCompletedByParser: void 0
@@ -3618,7 +3681,7 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(tupleState, tuplePairs, runtime.registry, childExec);
 				const allRuntimeNodes = buildRuntimeNodesFromArray(parsers, stateArray, exec?.path);
 				const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-				await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), stateArray, runtime, childExec, preCompleted);
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
@@ -3845,7 +3908,7 @@ function seq(...rawArgs) {
 				const pairs = buildIndexedParserPairs(syncParsers);
 				const stateRecord = createAnnotatedArrayStateRecord(stateArray);
 				const preCompleted = preCompleteAndRegisterDependencies(stateRecord, pairs, runtime.registry, childExec);
-				collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
 					preCompletedByParser: void 0
@@ -3884,7 +3947,7 @@ function seq(...rawArgs) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(stateRecord, pairs, runtime.registry, childExec);
 				const allRuntimeNodes = buildRuntimeNodesFromArray(parsers, stateArray, exec?.path);
 				const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-				await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), stateArray, runtime, childExec, preCompleted);
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
@@ -3926,7 +3989,7 @@ function seq(...rawArgs) {
 				const state = advancedContext.state;
 				const stateArray = state.states;
 				const nodes = buildSuggestRuntimeNodesFromArray(syncParsers, stateArray, advancedContext.exec?.path);
-				collectExplicitSourceValues(nodes, runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(nodes), runtime);
 				fillMissingSourceDefaults(nodes, runtime);
 				collectSourcesFromState(stateArray, runtime);
 				completeDependencySourceDefaults({
@@ -3956,7 +4019,7 @@ function seq(...rawArgs) {
 				const state = advancedContext.state;
 				const stateArray = state.states;
 				const nodes = buildSuggestRuntimeNodesFromArray(parsers, stateArray, advancedContext.exec?.path);
-				await collectExplicitSourceValuesAsync(nodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(nodes), runtime);
 				await fillMissingSourceDefaultsAsync(nodes, runtime);
 				collectSourcesFromState(stateArray, runtime);
 				await completeDependencySourceDefaultsAsync({
@@ -4569,7 +4632,7 @@ function merge(...args) {
 						excludedSourceFields: void 0
 					};
 				});
-				collectExplicitSourceValues(buildRuntimeNodesFromPairs(unambiguousFieldParsers, state, exec?.path), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(buildRuntimeNodesFromPairs(unambiguousFieldParsers, state, exec?.path)), runtime);
 				const resolvedState = resolveStateWithRuntime(state, runtime);
 				const object$1 = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -4642,7 +4705,7 @@ function merge(...args) {
 					};
 				}
 				const mergeNodes = buildMergeSchedulingNodes(state, exec?.path);
-				await collectExplicitSourceValuesAsync(mergeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(mergeNodes), runtime);
 				const effectfulPreCompleted = /* @__PURE__ */ new Map();
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(mergeNodes, state, runtime, childExec, effectfulPreCompleted);
 				if (effectfulFailure != null) return effectfulFailure;
@@ -4743,7 +4806,7 @@ function merge(...args) {
 						excludedSourceFields: void 0
 					};
 				});
-				collectExplicitSourceValues(buildRuntimeNodesFromPairs(unambiguousFieldParsers, state, exec?.path), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(buildRuntimeNodesFromPairs(unambiguousFieldParsers, state, exec?.path)), runtime);
 				const resolvedState = resolveStateWithRuntime(state, runtime);
 				const object$1 = {};
 				const deferredKeys = /* @__PURE__ */ new Map();
@@ -4809,7 +4872,7 @@ function merge(...args) {
 					};
 				}
 				const mergeNodes = buildMergeSchedulingNodes(state, exec?.path);
-				await collectExplicitSourceValuesAsync(mergeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(mergeNodes), runtime);
 				const effectfulPreCompleted = /* @__PURE__ */ new Map();
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(mergeNodes, state, runtime, childExec, effectfulPreCompleted);
 				if (effectfulFailure != null) return null;
@@ -4902,7 +4965,7 @@ function merge(...args) {
 					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 collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs(childFieldPairs$1, context.state, context.exec?.path), runtime$1);
+				if (context.state && typeof context.state === "object") await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(buildRuntimeNodesFromPairs(childFieldPairs$1, context.state, context.exec?.path)), runtime$1);
 				if (context.state && typeof context.state === "object") collectSourcesFromState(context.state, runtime$1, /* @__PURE__ */ new WeakSet(), duplicateFieldNames$1);
 				await completeDependencySourceDefaultsAsync(context, childFieldPairs$1, runtime$1.registry, context.exec);
 				const contextWithRegistry$1 = {
@@ -4942,7 +5005,7 @@ function merge(...args) {
 				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") collectExplicitSourceValues(buildRuntimeNodesFromPairs(childFieldPairs, context.state, context.exec?.path), runtime);
+			if (context.state && typeof context.state === "object") collectExplicitSourceValues(expandSourceCollectionNodes(buildRuntimeNodesFromPairs(childFieldPairs, context.state, context.exec?.path)), runtime);
 			if (context.state && typeof context.state === "object") collectSourcesFromState(context.state, runtime, /* @__PURE__ */ new WeakSet(), duplicateFieldNames);
 			completeDependencySourceDefaults(context, childFieldPairs, runtime.registry, context.exec);
 			const contextWithRegistry = {
@@ -5049,7 +5112,7 @@ function buildSuggestRegistry(preParsedContext, parsers) {
 	const runtime = createDependencyRuntimeContext(preParsedContext.dependencyRegistry?.clone());
 	if (stateArray && Array.isArray(stateArray)) {
 		const nodes = buildSuggestRuntimeNodesFromArray(parsers, stateArray, preParsedContext.exec?.path);
-		collectExplicitSourceValues(nodes, runtime);
+		collectExplicitSourceValues(expandSourceCollectionNodes(nodes), runtime);
 		fillMissingSourceDefaults(nodes, runtime);
 		collectSourcesFromState(stateArray, runtime);
 		completeDependencySourceDefaults({
@@ -5077,7 +5140,7 @@ async function buildSuggestRegistryAsync(preParsedContext, parsers) {
 	const runtime = createDependencyRuntimeContext(preParsedContext.dependencyRegistry?.clone());
 	if (stateArray && Array.isArray(stateArray)) {
 		const nodes = buildSuggestRuntimeNodesFromArray(parsers, stateArray, preParsedContext.exec?.path);
-		await collectExplicitSourceValuesAsync(nodes, runtime);
+		await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(nodes), runtime);
 		await fillMissingSourceDefaultsAsync(nodes, runtime);
 		collectSourcesFromState(stateArray, runtime);
 		await completeDependencySourceDefaultsAsync({
@@ -5107,7 +5170,7 @@ function seedSuggestRuntimeFromFieldParsers(parser, state, runtime, parentPath)
 	const pairs = filterDuplicateFieldParsers(rawPairs);
 	const stateRecord = state != null && typeof state === "object" ? state : {};
 	const nodes = buildSuggestRuntimeNodesFromPairs(pairs, stateRecord, parentPath);
-	collectExplicitSourceValues(nodes, runtime);
+	collectExplicitSourceValues(expandSourceCollectionNodes(nodes), runtime);
 	fillMissingSourceDefaults(nodes, runtime);
 	collectSourcesFromState(state, runtime, /* @__PURE__ */ new WeakSet(), duplicateFieldNames);
 	completeDependencySourceDefaults({
@@ -5139,7 +5202,7 @@ async function seedSuggestRuntimeFromFieldParsersAsync(parser, state, runtime, p
 	const pairs = filterDuplicateFieldParsers(rawPairs);
 	const stateRecord = state != null && typeof state === "object" ? state : {};
 	const nodes = buildSuggestRuntimeNodesFromPairs(pairs, stateRecord, parentPath);
-	await collectExplicitSourceValuesAsync(nodes, runtime);
+	await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(nodes), runtime);
 	await fillMissingSourceDefaultsAsync(nodes, runtime);
 	collectSourcesFromState(state, runtime, /* @__PURE__ */ new WeakSet(), duplicateFieldNames);
 	await completeDependencySourceDefaultsAsync({
@@ -5414,7 +5477,7 @@ function concat(...parsers) {
 		const concatPairs = buildIndexedParserPairs(syncParsers);
 		const concatState = createAnnotatedArrayStateRecord(stateArray);
 		const preCompleted = preCompleteAndRegisterDependencies(concatState, concatPairs, runtime.registry, childExec);
-		collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
+		collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 		const phase3Exec = {
 			...childExec,
 			preCompletedByParser: void 0
@@ -5466,7 +5529,7 @@ function concat(...parsers) {
 		const preCompleted = await preCompleteAndRegisterDependenciesAsync(concatState, concatPairs, runtime.registry, childExec);
 		const allRuntimeNodes = buildRuntimeNodesFromArray(parsers, stateArray, exec?.path);
 		const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-		await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+		await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 		const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), stateArray, runtime, childExec, preCompleted);
 		if (effectfulFailure != null) return effectfulFailure;
 		const phase3Exec = {
@@ -5538,7 +5601,7 @@ function concat(...parsers) {
 				const concatPairs = buildIndexedParserPairs(syncParsers);
 				const concatState = createAnnotatedArrayStateRecord(stateArray);
 				const preCompleted = preCompleteAndRegisterDependencies(concatState, concatPairs, runtime.registry, childExec);
-				collectExplicitSourceValues(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys())), runtime);
+				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
 					preCompletedByParser: void 0
@@ -5574,7 +5637,7 @@ function concat(...parsers) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(concatState, concatPairs, runtime.registry, childExec);
 				const allRuntimeNodes = buildRuntimeNodesFromArray(parsers, stateArray, exec?.path);
 				const runtimeNodes = filterPreCompletedRuntimeNodes(allRuntimeNodes, new Set(preCompleted.keys()));
-				await collectExplicitSourceValuesAsync(runtimeNodes, runtime);
+				await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(runtimeNodes), runtime);
 				const effectfulFailure = await scheduleEffectfulSourceCompletions(filterSchedulableRuntimeNodes(allRuntimeNodes, preCompleted), stateArray, runtime, childExec, preCompleted);
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
@@ -5674,6 +5737,7 @@ function group(label, parser, options = {}) {
 		initialState: parser.initialState,
 		...fieldParsersKey in parser ? { [fieldParsersKey]: parser[fieldParsersKey] } : {},
 		...effectfulSchedulingNodesKey in parser ? { [effectfulSchedulingNodesKey]: parser[effectfulSchedulingNodesKey] } : {},
+		...sourceCollectionExpansionKey in parser ? { [sourceCollectionExpansionKey]: parser[sourceCollectionExpansionKey] } : {},
 		...typeof parser.shouldDeferCompletion === "function" ? { shouldDeferCompletion: parser.shouldDeferCompletion.bind(parser) } : {},
 		...typeof parser.canSkip === "function" ? { canSkip: parser.canSkip.bind(parser) } : {},
 		getSuggestRuntimeNodes(state, path) {
@@ -5728,6 +5792,11 @@ function group(label, parser, options = {}) {
 		}
 	};
 	defineParseLanes(groupParser, getOwnParseLanes(parser));
+	Object.defineProperty(groupParser, staticSourceScopeKey, {
+		value: [parser],
+		configurable: true,
+		enumerable: false
+	});
 	Object.defineProperty(groupParser, extractPhase2SeedKey, {
 		value(state, exec) {
 			return extractPhase2Seed(parser, state, exec);
@@ -6320,7 +6389,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			_branch: getWrappedChildState(state, state.branchState, branchParser)
 		};
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
-		collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
+		collectExplicitSourceValues(expandSourceCollectionNodes(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path)), runtime);
 		collectSourcesFromState(combinedState, runtime);
 		const resolvedBranchState = getWrappedChildState(state, resolveStateWithRuntime(state.branchState, runtime), branchParser);
 		const completionExec = {
@@ -6359,13 +6428,23 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			} : {}
 		};
 	};
+	const preparedKeyPrefix = `c${++conditionalInstanceCounter}|`;
+	const preparedKeyFor = (parentPath) => preparedKeyPrefix + serializeSchedulingPath(parentPath ?? []);
+	const branchProvidedSourceIds = (() => {
+		const out = /* @__PURE__ */ new Set();
+		const seen = /* @__PURE__ */ new Set();
+		for (const key of Object.keys(branches)) collectStaticSourceIds(branches[key], out, seen);
+		if (defaultBranch != null) collectStaticSourceIds(defaultBranch, out, seen);
+		return out;
+	})();
 	const buildConditionalSchedulingNodes = (state, parentPath) => {
 		if (state == null || typeof state !== "object") return [];
 		const conditionalState = state;
+		const annotatedDiscriminatorState = getWrappedChildState(conditionalState, conditionalState.discriminatorState, discriminator);
 		const nodes = [{
 			path: [...parentPath ?? [], "_discriminator"],
 			parser: discriminator,
-			state: getWrappedChildState(conditionalState, conditionalState.discriminatorState, discriminator)
+			state: annotatedDiscriminatorState
 		}];
 		const selected = conditionalState.selectedBranch;
 		if (selected !== void 0 && conditionalState.speculative !== true) {
@@ -6375,7 +6454,115 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				parser: branchParser,
 				state: getWrappedChildState(conditionalState, conditionalState.branchState, branchParser)
 			});
+			return nodes;
+		}
+		const discriminatorSource = discriminator.dependencyMetadata?.source;
+		const innerCompleteSource = discriminatorSource?.completeSource;
+		const discriminatorPathKey = serializeSchedulingPath([...parentPath ?? [], "_discriminator"]);
+		const cell = {};
+		const teeDiscriminatorNode = () => {
+			if (discriminatorSource == null || innerCompleteSource == null) return;
+			nodes[0] = {
+				...nodes[0],
+				parser: { dependencyMetadata: {
+					...discriminator.dependencyMetadata,
+					source: {
+						...discriminatorSource,
+						completeSource: async (s, e) => {
+							const result = await innerCompleteSource(s, e);
+							if (result != null) cell.result = result;
+							return result;
+						}
+					}
+				} }
+			};
+		};
+		if (conditionalState.speculative === true) {
+			if (selected?.kind !== "branch" || innerCompleteSource == null) return nodes;
+			teeDiscriminatorNode();
+			const speculativeKey = selected.key;
+			nodes.push({
+				path: [...parentPath ?? [], "_branch"],
+				parser: {},
+				state: conditionalState,
+				...discriminatorSource != null ? { requiresSourceId: discriminatorSource.sourceId } : {},
+				providesSourceIds: branchProvidedSourceIds,
+				prepare: async (ctx) => {
+					const session = ctx.exec?.effectfulCompletionSession;
+					if (session == null) return void 0;
+					const result = cell.result ?? session.completedByPath.get(discriminatorPathKey);
+					if (result == null || isDeferredCompletionResult(result) || result.success !== true) return void 0;
+					if (String(result.value) !== speculativeKey) return void 0;
+					const branchParser = branches[speculativeKey];
+					if (branchParser == null) return void 0;
+					return await ctx.schedule(expandEffectfulRuntimeNodes([{
+						path: [...parentPath ?? [], "_branch"],
+						parser: branchParser,
+						state: getWrappedChildState(conditionalState, conditionalState.branchState, branchParser)
+					}]));
+				}
+			});
+			return nodes;
 		}
+		if (selected !== void 0) return nodes;
+		if (discriminatorSource == null && typeof discriminator.shouldDeferCompletion === "function") return nodes;
+		teeDiscriminatorNode();
+		nodes.push({
+			path: [...parentPath ?? [], "_branch"],
+			parser: {},
+			state: conditionalState,
+			...discriminatorSource != null ? { requiresSourceId: discriminatorSource.sourceId } : {},
+			providesSourceIds: branchProvidedSourceIds,
+			prepare: async (ctx) => {
+				const session = ctx.exec?.effectfulCompletionSession;
+				if (session == null) return void 0;
+				const key = preparedKeyFor(parentPath);
+				let prepared = session.preparedByPath.get(key);
+				if (prepared == null) {
+					let discriminatorResult = cell.result ?? session.completedByPath.get(discriminatorPathKey);
+					if (discriminatorResult == null && innerCompleteSource == null) {
+						const discriminatorExec = ctx.exec == null ? void 0 : {
+							...ctx.exec,
+							path: [...parentPath ?? [], "_discriminator"]
+						};
+						discriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorState, discriminatorExec));
+					}
+					if (discriminatorResult == null || isDeferredCompletionResult(discriminatorResult)) return void 0;
+					const namedBranch = discriminatorResult.success ? branches[String(discriminatorResult.value)] : void 0;
+					const branchParser = namedBranch ?? defaultBranch;
+					let branchState;
+					if (branchParser != null) {
+						const branchExec = ctx.exec == null ? void 0 : {
+							...ctx.exec,
+							path: [...parentPath ?? [], "_branch"]
+						};
+						const annotatedInitial = getWrappedChildState(conditionalState, branchParser.initialState, branchParser);
+						const replayResult = await branchParser.parse({
+							buffer: [],
+							optionsTerminated: false,
+							usage: [],
+							exec: branchExec,
+							dependencyRegistry: ctx.exec?.dependencyRegistry,
+							state: annotatedInitial
+						});
+						branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
+					}
+					prepared = {
+						discriminatorResult,
+						branchParser,
+						branchKey: namedBranch != null ? String(discriminatorResult.value) : void 0,
+						branchState
+					};
+					session.preparedByPath.set(key, prepared);
+				}
+				if (prepared.branchParser == null) return void 0;
+				return await ctx.schedule(expandEffectfulRuntimeNodes([{
+					path: [...parentPath ?? [], "_branch"],
+					parser: prepared.branchParser,
+					state: getWrappedChildState(conditionalState, prepared.branchState, prepared.branchParser)
+				}]));
+			}
+		});
 		return nodes;
 	};
 	const completeAsync = async (state, exec) => {
@@ -6391,27 +6578,44 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			value: [state.selectedBranch.key, void 0]
 		};
 		if (state.selectedBranch === void 0) {
+			let prepared;
 			if (exec?.phase !== "parse" && exec?.phase !== "suggest") {
+				if (exec?.effectfulCompletionSession != null) {
+					const schedulingRuntime = createDependencyRuntimeContext(exec.dependencyRegistry?.clone());
+					const schedulingExec = {
+						...exec,
+						phase: "complete",
+						dependencyRuntime: schedulingRuntime,
+						dependencyRegistry: schedulingRuntime.registry
+					};
+					const schedulingFailure = await scheduleEffectfulSourceCompletions(buildConditionalSchedulingNodes(state, exec.path), state, schedulingRuntime, schedulingExec, /* @__PURE__ */ new Map());
+					if (schedulingFailure != null) return schedulingFailure;
+					prepared = exec.effectfulCompletionSession.preparedByPath.get(preparedKeyFor(exec.path));
+				}
 				const annotatedDiscriminatorStateForDeferred = getWrappedChildState(state, state.discriminatorState, discriminator);
-				const deferredDiscriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
+				const deferredDiscriminatorResult = prepared != null ? prepared.discriminatorResult : unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = branches[deferredValue];
 					if (deferredBranch) {
 						const branchExec = withChildExecPath(exec, "_branch");
-						const emptyCtx = {
-							buffer: [],
-							optionsTerminated: false,
-							usage: [],
-							exec: branchExec,
-							dependencyRegistry: exec?.dependencyRegistry
-						};
-						const annotatedInitial = getWrappedChildState(state, deferredBranch.initialState, deferredBranch);
-						const replayResult = await deferredBranch.parse({
-							...emptyCtx,
-							state: annotatedInitial
-						});
-						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
+						let branchState;
+						if (prepared != null && prepared.branchKey === deferredValue) branchState = prepared.branchState;
+						else {
+							const emptyCtx = {
+								buffer: [],
+								optionsTerminated: false,
+								usage: [],
+								exec: branchExec,
+								dependencyRegistry: exec?.dependencyRegistry
+							};
+							const annotatedInitial = getWrappedChildState(state, deferredBranch.initialState, deferredBranch);
+							const replayResult = await deferredBranch.parse({
+								...emptyCtx,
+								state: annotatedInitial
+							});
+							branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
+						}
 						const annotatedBranchState = getWrappedChildState(state, branchState, deferredBranch);
 						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
@@ -6439,7 +6643,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				value: [void 0, void 0]
 			};
 			if (defaultBranch !== void 0) {
-				const branchState = getWrappedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
+				const branchState = getWrappedChildState(state, (prepared != null && prepared.branchKey == null ? prepared.branchState : void 0) ?? state.branchState ?? defaultBranch.initialState, defaultBranch);
 				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
@@ -6463,7 +6667,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			_branch: getWrappedChildState(state, state.branchState, branchParser)
 		};
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
-		await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
+		await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path)), runtime);
 		collectSourcesFromState(combinedState, runtime);
 		const completionExec = {
 			...exec ?? {
@@ -6486,7 +6690,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		if (wasSpeculative && needsDiscriminatorCompletion) {
 			const discOnlyState = { _discriminator: annotatedDiscriminatorState };
 			const discOnlyRuntime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
-			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator]], discOnlyState, exec?.path), discOnlyRuntime);
+			await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(buildRuntimeNodesFromPairs([["_discriminator", discriminator]], discOnlyState, exec?.path)), discOnlyRuntime);
 			collectSourcesFromState(discOnlyState, discOnlyRuntime);
 			discriminatorCompletionExec = {
 				...completionExec,
@@ -6552,7 +6756,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				_discriminator: annotatedDiscriminatorState,
 				_branch: syncDefaultBranch == null ? state.branchState : getWrappedChildState(state, state.branchState, syncDefaultBranch)
 			};
-			collectExplicitSourceValues(buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path), runtime);
+			collectExplicitSourceValues(expandSourceCollectionNodes(buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path)), runtime);
 			collectSourcesFromState(defaultCombinedState, runtime);
 			const suggestContext = {
 				...context,
@@ -6581,7 +6785,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				_discriminator: annotatedDiscriminatorState,
 				_branch: getWrappedChildState(state, state.branchState, branchParser)
 			};
-			collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
+			collectExplicitSourceValues(expandSourceCollectionNodes(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path)), runtime);
 			collectSourcesFromState(combinedState, runtime);
 			const suggestContext = {
 				...context,
@@ -6604,7 +6808,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				_discriminator: annotatedDiscriminatorState,
 				_branch: defaultBranch == null ? state.branchState : getWrappedChildState(state, state.branchState, defaultBranch)
 			};
-			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path), runtime);
+			await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path)), runtime);
 			collectSourcesFromState(defaultCombinedState, runtime);
 			const suggestContext = {
 				...context,
@@ -6640,7 +6844,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				_discriminator: annotatedDiscriminatorState,
 				_branch: getWrappedChildState(state, state.branchState, branchParser)
 			};
-			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
+			await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path)), runtime);
 			collectSourcesFromState(combinedState, runtime);
 			const suggestContext = {
 				...context,
@@ -6756,6 +6960,20 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		configurable: true,
 		enumerable: false
 	});
+	Object.defineProperty(conditionalParser, sourceCollectionExpansionKey, {
+		value: true,
+		configurable: true,
+		enumerable: false
+	});
+	Object.defineProperty(conditionalParser, staticSourceScopeKey, {
+		value: [
+			discriminator,
+			...Object.values(branches),
+			...defaultBranch != null ? [defaultBranch] : []
+		],
+		configurable: true,
+		enumerable: false
+	});
 	return fluent(conditionalParser);
 }