@optique/core 1.0.0-dev.1692 → 1.0.0-dev.1693

package/dist/constructs.cjs

@@ -5,6 +5,7 @@ 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_modifiers = require('./modifiers.cjs');
 const require_suggestion = require('./suggestion.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
 const require_parser = require('./parser.cjs');
@@ -512,10 +513,81 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 	const syncParsers = parsers;
 	return (state, exec) => {
 		const activeState = normalizeExclusiveState(state);
-		if (activeState == null) return {
-			success: false,
-			error: getNoMatchError(options, noMatchContext)
-		};
+		if (activeState == null) {
+			const annotations = require_annotations.getAnnotations(state);
+			const annotateInitial = (initial) => annotations != null && initial != null && typeof initial === "object" ? require_annotations.injectAnnotations(initial, annotations) : initial;
+			return require_mode_dispatch.dispatchByMode(mode, () => {
+				const emptyCtx = {
+					buffer: [],
+					optionsTerminated: false,
+					usage: []
+				};
+				let candidateIndex = -1;
+				let candidateCount = 0;
+				for (let i$1 = 0; i$1 < syncParsers.length; i$1++) {
+					const p = syncParsers[i$1];
+					if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
+					const parseResult = p.parse({
+						...emptyCtx,
+						state: annotateInitial(p.initialState)
+					});
+					if (!parseResult.success || parseResult.provisional) continue;
+					candidateCount++;
+					if (candidateIndex < 0) candidateIndex = i$1;
+					if (candidateCount > 1) break;
+				}
+				if (candidateCount === 1 && candidateIndex >= 0) {
+					const p = syncParsers[candidateIndex];
+					const parseResult = p.parse({
+						...emptyCtx,
+						state: annotateInitial(p.initialState)
+					});
+					if (parseResult.success) {
+						const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
+						return p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
+					}
+				}
+				return {
+					success: false,
+					error: getNoMatchError(options, noMatchContext)
+				};
+			}, async () => {
+				const emptyCtx = {
+					buffer: [],
+					optionsTerminated: false,
+					usage: []
+				};
+				let candidateIndex = -1;
+				let candidateCount = 0;
+				for (let i$1 = 0; i$1 < parsers.length; i$1++) {
+					const p = parsers[i$1];
+					if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
+					const parseResult = await p.parse({
+						...emptyCtx,
+						state: annotateInitial(p.initialState)
+					});
+					if (!parseResult.success || parseResult.provisional) continue;
+					candidateCount++;
+					if (candidateIndex < 0) candidateIndex = i$1;
+					if (candidateCount > 1) break;
+				}
+				if (candidateCount === 1 && candidateIndex >= 0 && exec?.phase !== "parse" && exec?.phase !== "suggest") {
+					const p = parsers[candidateIndex];
+					const parseResult = await p.parse({
+						...emptyCtx,
+						state: annotateInitial(p.initialState)
+					});
+					if (parseResult.success) {
+						const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
+						return await p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
+					}
+				}
+				return {
+					success: false,
+					error: getNoMatchError(options, noMatchContext)
+				};
+			});
+		}
 		const [i, result] = activeState;
 		if (!result.success) return {
 			success: false,
@@ -537,7 +609,7 @@ function createExclusiveSuggest(parsers, mode) {
 		return require_mode_dispatch.dispatchIterableByMode(mode, function* () {
 			const suggestions = [];
 			const activeState = normalizeExclusiveState(context.state);
-			if (activeState == null) for (let i = 0; i < syncParsers.length; i++) {
+			if (activeState == null || activeState[1].success && activeState[1].consumed.length === 0) for (let i = 0; i < syncParsers.length; i++) {
 				const parser = syncParsers[i];
 				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
 				suggestions.push(...parserSuggestions);
@@ -554,7 +626,7 @@ function createExclusiveSuggest(parsers, mode) {
 		}, async function* () {
 			const suggestions = [];
 			const activeState = normalizeExclusiveState(context.state);
-			if (activeState == null) for (let i = 0; i < parsers.length; i++) {
+			if (activeState == null || activeState[1].success && activeState[1].consumed.length === 0) for (let i = 0; i < parsers.length; i++) {
 				const parser = parsers[i];
 				const parserSuggestions = parser.suggest(withChildContext(context, i, parser.initialState, parser), prefix);
 				if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -642,10 +714,29 @@ function or(...args) {
 		const activeState = normalizeExclusiveState(context.state);
 		const orderedParsers = syncParsers.map((p, i) => [p, i]);
 		orderedParsers.sort(([_, a], [__, b]) => activeState?.[0] === a ? -1 : activeState?.[0] === b ? 1 : a - b);
+		let zeroConsumedBranch = null;
+		let zeroConsumedCount = 0;
 		for (const [parser, i] of orderedParsers) {
 			const result = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			if (result.success && result.consumed.length > 0) {
 				if (activeState?.[0] !== i && activeState?.[1].success) {
+					if (activeState[1].consumed.length === 0) {
+						const mergedExec$2 = mergeChildExec(context.exec, result.next.exec);
+						return {
+							success: true,
+							next: {
+								...context,
+								buffer: result.next.buffer,
+								optionsTerminated: result.next.optionsTerminated,
+								state: createExclusiveState(context.state, i, parser, result),
+								...mergedExec$2 != null ? {
+									exec: mergedExec$2,
+									dependencyRegistry: mergedExec$2.dependencyRegistry
+								} : {}
+							},
+							consumed: result.consumed
+						};
+					}
 					const previouslyConsumed = activeState[1].consumed;
 					const checkResult = parser.parse({
 						...withChildContext(context, i, parser.initialState, parser),
@@ -700,8 +791,31 @@ function or(...args) {
 					},
 					consumed: result.consumed
 				};
+			} else if (result.success && result.consumed.length === 0 && !result.provisional && parser.leadingNames.size === 0 && !parser.acceptingAnyToken) {
+				if (zeroConsumedBranch === null) zeroConsumedBranch = {
+					index: i,
+					parser,
+					result
+				};
+				zeroConsumedCount++;
 			} else if (!result.success && error.consumed < result.consumed) error = result;
 		}
+		if (zeroConsumedBranch !== null && zeroConsumedCount === 1 && error.consumed === 0 && context.buffer.length === 0) {
+			const mergedExec = mergeChildExec(context.exec, zeroConsumedBranch.result.next.exec);
+			return {
+				success: true,
+				...zeroConsumedBranch.result.provisional ? { provisional: true } : {},
+				next: {
+					...context,
+					state: createExclusiveState(context.state, zeroConsumedBranch.index, zeroConsumedBranch.parser, zeroConsumedBranch.result),
+					...mergedExec != null ? {
+						exec: mergedExec,
+						dependencyRegistry: mergedExec.dependencyRegistry
+					} : {}
+				},
+				consumed: []
+			};
+		}
 		return {
 			...error,
 			success: false
@@ -712,11 +826,30 @@ function or(...args) {
 		const activeState = normalizeExclusiveState(context.state);
 		const orderedParsers = parsers.map((p, i) => [p, i]);
 		orderedParsers.sort(([_, a], [__, b]) => activeState?.[0] === a ? -1 : activeState?.[0] === b ? 1 : a - b);
+		let zeroConsumedBranch = null;
+		let zeroConsumedCount = 0;
 		for (const [parser, i] of orderedParsers) {
 			const resultOrPromise = parser.parse(withChildContext(context, i, activeState == null || activeState[0] !== i || !activeState[1].success ? parser.initialState : activeState[1].next.state, parser));
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
 				if (activeState?.[0] !== i && activeState?.[1].success) {
+					if (activeState[1].consumed.length === 0) {
+						const mergedExec$2 = mergeChildExec(context.exec, result.next.exec);
+						return {
+							success: true,
+							next: {
+								...context,
+								buffer: result.next.buffer,
+								optionsTerminated: result.next.optionsTerminated,
+								state: createExclusiveState(context.state, i, parser, result),
+								...mergedExec$2 != null ? {
+									exec: mergedExec$2,
+									dependencyRegistry: mergedExec$2.dependencyRegistry
+								} : {}
+							},
+							consumed: result.consumed
+						};
+					}
 					const previouslyConsumed = activeState[1].consumed;
 					const checkResultOrPromise = parser.parse({
 						...withChildContext(context, i, parser.initialState, parser),
@@ -773,8 +906,31 @@ function or(...args) {
 					},
 					consumed: result.consumed
 				};
+			} else if (result.success && result.consumed.length === 0 && !result.provisional && parser.leadingNames.size === 0 && !parser.acceptingAnyToken) {
+				if (zeroConsumedBranch === null) zeroConsumedBranch = {
+					index: i,
+					parser,
+					result
+				};
+				zeroConsumedCount++;
 			} else if (!result.success && error.consumed < result.consumed) error = result;
 		}
+		if (zeroConsumedBranch !== null && zeroConsumedCount === 1 && error.consumed === 0 && context.buffer.length === 0) {
+			const mergedExec = mergeChildExec(context.exec, zeroConsumedBranch.result.next.exec);
+			return {
+				success: true,
+				...zeroConsumedBranch.result.provisional ? { provisional: true } : {},
+				next: {
+					...context,
+					state: createExclusiveState(context.state, zeroConsumedBranch.index, zeroConsumedBranch.parser, zeroConsumedBranch.result),
+					...mergedExec != null ? {
+						exec: mergedExec,
+						dependencyRegistry: mergedExec.dependencyRegistry
+					} : {}
+				},
+				consumed: []
+			};
+		}
 		return {
 			...error,
 			success: false
@@ -1407,6 +1563,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		let currentContext = context;
 		let anySuccess = false;
 		const allConsumed = [];
+		const consumedFields = /* @__PURE__ */ new Set();
 		let madeProgress = true;
 		while (madeProgress && currentContext.buffer.length > 0) {
 			madeProgress = false;
@@ -1432,21 +1589,47 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					allConsumed.push(...result.consumed);
 					anySuccess = true;
 					madeProgress = true;
+					consumedFields.add(field);
 					break;
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 		}
+		{
+			const getFieldState = createFieldStateGetter(currentContext.state, getObjectParseChildState);
+			for (const [field, parser] of parserPairs) {
+				if (consumedFields.has(field)) continue;
+				const typedParser = parser;
+				if (parser.leadingNames.size > 0 || typedParser.acceptingAnyToken || Reflect.get(parser, require_modifiers.optionalStyleWrapperKey) === true) continue;
+				const fieldState = getFieldState(field, parser);
+				const result = typedParser.parse(withChildContext(currentContext, field, fieldState, parser));
+				if (result.success && result.consumed.length === 0 && result.next.state !== fieldState) {
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					currentContext = {
+						...currentContext,
+						state: {
+							...currentContext.state,
+							[field]: getAnnotatedChildState(currentContext.state, result.next.state, parser)
+						},
+						...mergedExec != null ? {
+							trace: mergedExec.trace,
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					};
+				}
+			}
+		}
 		if (anySuccess) return {
 			success: true,
 			next: currentContext,
 			consumed: allConsumed
 		};
-		if (context.buffer.length === 0) {
+		if (currentContext.buffer.length === 0) {
 			let allCanComplete = true;
-			const getFieldState = createFieldStateGetter(context.state);
+			const getFieldState = createFieldStateGetter(currentContext.state);
 			for (const [field, parser] of parserPairs) {
 				const fieldState = getFieldState(field, parser);
-				const completeResult = parser.complete(fieldState, withChildExecPath(context.exec, field));
+				const completeResult = parser.complete(fieldState, withChildExecPath(currentContext.exec, field));
 				if (!completeResult.success) {
 					allCanComplete = false;
 					break;
@@ -1454,7 +1637,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			}
 			if (allCanComplete) return {
 				success: true,
-				next: context,
+				next: currentContext,
 				consumed: []
 			};
 		}
@@ -1468,6 +1651,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		let currentContext = context;
 		let anySuccess = false;
 		const allConsumed = [];
+		const consumedFields = /* @__PURE__ */ new Set();
 		let madeProgress = true;
 		while (madeProgress && currentContext.buffer.length > 0) {
 			madeProgress = false;
@@ -1494,21 +1678,47 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					allConsumed.push(...result.consumed);
 					anySuccess = true;
 					madeProgress = true;
+					consumedFields.add(field);
 					break;
 				} else if (!result.success && error.consumed < result.consumed) error = result;
 			}
 		}
+		{
+			const getFieldState = createFieldStateGetter(currentContext.state, getObjectParseChildState);
+			for (const [field, parser] of parserPairs) {
+				if (consumedFields.has(field)) continue;
+				if (parser.leadingNames.size > 0 || parser.acceptingAnyToken || Reflect.get(parser, require_modifiers.optionalStyleWrapperKey) === true) continue;
+				const fieldState = getFieldState(field, parser);
+				const resultOrPromise = parser.parse(withChildContext(currentContext, field, fieldState, parser));
+				const result = await resultOrPromise;
+				if (result.success && result.consumed.length === 0 && result.next.state !== fieldState) {
+					const mergedExec = mergeChildExec(currentContext.exec, result.next.exec);
+					currentContext = {
+						...currentContext,
+						state: {
+							...currentContext.state,
+							[field]: getAnnotatedChildState(currentContext.state, result.next.state, parser)
+						},
+						...mergedExec != null ? {
+							trace: mergedExec.trace,
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					};
+				}
+			}
+		}
 		if (anySuccess) return {
 			success: true,
 			next: currentContext,
 			consumed: allConsumed
 		};
-		if (context.buffer.length === 0) {
+		if (currentContext.buffer.length === 0) {
 			let allCanComplete = true;
-			const getFieldState = createFieldStateGetter(context.state);
+			const getFieldState = createFieldStateGetter(currentContext.state);
 			for (const [field, parser] of parserPairs) {
 				const fieldState = getFieldState(field, parser);
-				const completeResult = await parser.complete(fieldState, withChildExecPath(context.exec, field));
+				const completeResult = await parser.complete(fieldState, withChildExecPath(currentContext.exec, field));
 				if (!completeResult.success) {
 					allCanComplete = false;
 					break;
@@ -1516,7 +1726,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			}
 			if (allCanComplete) return {
 				success: true,
-				next: context,
+				next: currentContext,
 				consumed: []
 			};
 		}
@@ -3432,6 +3642,19 @@ function group(label, parser, options = {}) {
 * // defaultResult.value = [undefined, {}]
 * ```
 *
+* ### Async discriminator limitation
+*
+* When the discriminator is an async parser that succeeds without consuming
+* input (e.g., `prompt(option(...))` with no CLI input), branch selection
+* is deferred to the complete phase.  If the selected branch needs to
+* consume remaining tokens, those tokens cannot be consumed because the
+* branch is not known during parse.  In practice, this means
+* `conditional(prompt(option(...)), { key: option(...) })` cannot parse
+* branch-specific tokens when the discriminator requires interactive
+* resolution.  Provide a default branch or ensure the discriminator
+* can resolve synchronously (e.g., via `bindEnv()` or `withDefault()`)
+* to avoid this limitation.
+*
 * @since 0.8.0
 */
 function conditional(discriminator, branches, defaultBranch, options) {
@@ -3510,7 +3733,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			return branchResult;
 		}
 		const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
-		if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
+		if (discriminatorResult.success) {
 			const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, syncDiscriminator);
 			const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
 			if (completionResult.success) {
@@ -3531,8 +3754,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					});
 					if (branchParseResult.success) {
 						const mergedExec = mergeChildExec(discriminatorExec, branchParseResult.next.exec);
+						const isProvisional = branchParseResult.provisional || discriminatorResult.consumed.length === 0 && branchParseResult.consumed.length === 0 && branchParser.leadingNames.size > 0;
 						return {
 							success: true,
+							...isProvisional ? { provisional: true } : {},
 							next: {
 								...branchParseResult.next,
 								state: {
@@ -3552,7 +3777,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 							consumed: [...discriminatorResult.consumed, ...branchParseResult.consumed]
 						};
 					}
-					return {
+					if (discriminatorResult.consumed.length > 0) return {
 						success: true,
 						next: {
 							...discriminatorResult.next,
@@ -3572,20 +3797,24 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						},
 						consumed: discriminatorResult.consumed
 					};
+					return branchParseResult;
 				}
 			}
 		}
+		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (syncDefaultBranch !== void 0) {
 			const defaultResult = syncDefaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
-			if (defaultResult.success && defaultResult.consumed.length > 0) {
+			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
+				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
 				return {
 					success: true,
+					...defaultResult.provisional ? { provisional: true } : {},
 					next: {
 						...defaultResult.next,
 						state: {
 							...state,
-							selectedBranch: { kind: "default" },
+							...commitDefault ? { selectedBranch: { kind: "default" } } : {},
 							branchState: getAnnotatedChildState(state, defaultResult.next.state, syncDefaultBranch)
 						},
 						...mergedExec != null ? {
@@ -3629,7 +3858,49 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			return branchResult;
 		}
 		const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, discriminator) });
-		if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
+		if (discriminatorResult.success) {
+			if (discriminatorResult.consumed.length === 0 && discriminator.$mode === "async") {
+				if (defaultBranch !== void 0) {
+					const defaultResult = await defaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+					if (defaultResult.success && defaultResult.consumed.length > 0) {
+						const defaultExec = mergeChildExec(context.exec, defaultResult.next.exec);
+						return {
+							success: true,
+							next: {
+								...defaultResult.next,
+								state: {
+									...state,
+									selectedBranch: { kind: "default" },
+									branchState: getAnnotatedChildState(state, defaultResult.next.state, defaultBranch)
+								},
+								...defaultExec != null ? {
+									exec: defaultExec,
+									dependencyRegistry: defaultExec.dependencyRegistry
+								} : {}
+							},
+							consumed: defaultResult.consumed
+						};
+					}
+				}
+				const annotatedDiscriminatorState$1 = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
+				const mergedExec = mergeChildExec(context.exec, discriminatorResult.next.exec);
+				return {
+					success: true,
+					provisional: true,
+					next: {
+						...context,
+						state: {
+							...state,
+							discriminatorState: annotatedDiscriminatorState$1
+						},
+						...mergedExec != null ? {
+							exec: mergedExec,
+							dependencyRegistry: mergedExec.dependencyRegistry
+						} : {}
+					},
+					consumed: []
+				};
+			}
 			const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
 			const completionResult = await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
 			if (completionResult.success) {
@@ -3652,6 +3923,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						const mergedExec = mergeChildExec(discriminatorExec, branchParseResult.next.exec);
 						return {
 							success: true,
+							...branchParseResult.provisional || discriminatorResult.consumed.length === 0 && branchParseResult.consumed.length === 0 && branchParser.leadingNames.size > 0 ? { provisional: true } : {},
 							next: {
 								...branchParseResult.next,
 								state: {
@@ -3671,7 +3943,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 							consumed: [...discriminatorResult.consumed, ...branchParseResult.consumed]
 						};
 					}
-					return {
+					if (discriminatorResult.consumed.length > 0) return {
 						success: true,
 						next: {
 							...discriminatorResult.next,
@@ -3691,20 +3963,24 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						},
 						consumed: discriminatorResult.consumed
 					};
+					return branchParseResult;
 				}
 			}
 		}
+		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (defaultBranch !== void 0) {
 			const defaultResult = await defaultBranch.parse(withChildContext(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
-			if (defaultResult.success && defaultResult.consumed.length > 0) {
+			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
+				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
 				return {
 					success: true,
+					...defaultResult.provisional ? { provisional: true } : {},
 					next: {
 						...defaultResult.next,
 						state: {
 							...state,
-							selectedBranch: { kind: "default" },
+							...commitDefault ? { selectedBranch: { kind: "default" } } : {},
 							branchState: getAnnotatedChildState(state, defaultResult.next.state, defaultBranch)
 						},
 						...mergedExec != null ? {
@@ -3727,6 +4003,46 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const syncDefaultBranch = defaultBranch;
 		const syncBranches = branches;
 		if (state.selectedBranch === void 0) {
+			{
+				const annotatedDiscriminatorStateForDeferred = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+				const deferredDiscriminatorResult = unwrapCompleteResult(syncDiscriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
+				if (deferredDiscriminatorResult.success) {
+					const deferredValue = deferredDiscriminatorResult.value;
+					const deferredBranch = syncBranches[deferredValue];
+					if (deferredBranch) {
+						const emptyCtx = {
+							buffer: [],
+							optionsTerminated: false,
+							usage: []
+						};
+						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
+						const replayResult = deferredBranch.parse({
+							...emptyCtx,
+							state: annotatedInitial
+						});
+						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
+						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
+						const branchResult$1 = unwrapCompleteResult(deferredBranch.complete(annotatedBranchState, withChildExecPath(exec, "_branch")));
+						if (branchResult$1.success) return {
+							success: true,
+							value: [deferredValue, branchResult$1.value],
+							...branchResult$1.deferred ? {
+								deferred: true,
+								...branchResult$1.deferredKeys ? { deferredKeys: new Map([[1, branchResult$1.deferredKeys]]) } : branchResult$1.value == null || typeof branchResult$1.value !== "object" ? { deferredKeys: new Map([[1, null]]) } : {}
+							} : {}
+						};
+						if (options?.errors?.branchError) return {
+							success: false,
+							error: options.errors.branchError(deferredValue, branchResult$1.error)
+						};
+						return branchResult$1;
+					}
+					if (syncDefaultBranch === void 0) return {
+						success: false,
+						error: getNoMatchError$1()
+					};
+				} else if (syncDefaultBranch === void 0) return deferredDiscriminatorResult;
+			}
 			if (syncDefaultBranch !== void 0) {
 				const branchState = getAnnotatedChildState(state, state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch);
 				const defaultResult = unwrapCompleteResult(syncDefaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
@@ -3765,7 +4081,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			dependencyRuntime: runtime,
 			dependencyRegistry: runtime.registry
 		};
-		const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator"));
+		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
+		const discriminatorCompleteResult = needsDiscriminatorCompletion ? syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator")) : void 0;
 		const branchResult = unwrapCompleteResult(branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
@@ -3776,6 +4093,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key) discriminatorValue = state.discriminatorValue;
 		else {
 			const completedDiscriminator = unwrapCompleteResult(discriminatorCompleteResult);
 			discriminatorValue = completedDiscriminator.success ? completedDiscriminator.value : state.selectedBranch.key;
@@ -3791,6 +4109,46 @@ function conditional(discriminator, branches, defaultBranch, options) {
 	};
 	const completeAsync = async (state, exec) => {
 		if (state.selectedBranch === void 0) {
+			if (exec?.phase !== "parse" && exec?.phase !== "suggest") {
+				const annotatedDiscriminatorStateForDeferred = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+				const deferredDiscriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
+				if (deferredDiscriminatorResult.success) {
+					const deferredValue = deferredDiscriminatorResult.value;
+					const deferredBranch = branches[deferredValue];
+					if (deferredBranch) {
+						const emptyCtx = {
+							buffer: [],
+							optionsTerminated: false,
+							usage: []
+						};
+						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
+						const replayResult = await deferredBranch.parse({
+							...emptyCtx,
+							state: annotatedInitial
+						});
+						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
+						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
+						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, withChildExecPath(exec, "_branch")));
+						if (branchResult$1.success) return {
+							success: true,
+							value: [deferredValue, branchResult$1.value],
+							...branchResult$1.deferred ? {
+								deferred: true,
+								...branchResult$1.deferredKeys ? { deferredKeys: new Map([[1, branchResult$1.deferredKeys]]) } : branchResult$1.value == null || typeof branchResult$1.value !== "object" ? { deferredKeys: new Map([[1, null]]) } : {}
+							} : {}
+						};
+						if (options?.errors?.branchError) return {
+							success: false,
+							error: options.errors.branchError(deferredValue, branchResult$1.error)
+						};
+						return branchResult$1;
+					}
+					if (defaultBranch === void 0) return {
+						success: false,
+						error: getNoMatchError$1()
+					};
+				} else if (defaultBranch === void 0) return deferredDiscriminatorResult;
+			}
 			if (defaultBranch !== void 0) {
 				const branchState = getAnnotatedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
 				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
@@ -3829,7 +4187,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			dependencyRuntime: runtime,
 			dependencyRegistry: runtime.registry
 		};
-		const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator"));
+		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
+		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator")) : void 0;
 		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
@@ -3840,6 +4199,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key) discriminatorValue = state.discriminatorValue;
 		else {
 			const completedDiscriminator = unwrapCompleteResult(discriminatorCompleteResult);
 			discriminatorValue = completedDiscriminator.success ? completedDiscriminator.value : state.selectedBranch.key;
@@ -3877,7 +4237,15 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} } : {}
 			};
 			yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
-			if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+			const annotatedDiscState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
+			const discComplete = syncDiscriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
+				...suggestContext.exec,
+				phase: "suggest"
+			} : void 0, "_discriminator"));
+			if (discComplete.success && syncBranches[discComplete.value] !== void 0) {
+				const resolvedBranch = syncBranches[discComplete.value];
+				yield* resolvedBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
+			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
@@ -3921,7 +4289,22 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				} } : {}
 			};
 			yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
-			if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+			let discResolved = false;
+			if (discriminator.$mode === "sync") {
+				const annotatedDiscState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
+				const discComplete = discriminator.complete(annotatedDiscState, withChildExecPath(suggestContext.exec ? {
+					...suggestContext.exec,
+					phase: "suggest"
+				} : void 0, "_discriminator"));
+				if (discComplete.success && branches[discComplete.value] !== void 0) {
+					const resolvedBranch = branches[discComplete.value];
+					yield* resolvedBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
+					discResolved = true;
+				}
+			}
+			if (!discResolved) {
+				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
 			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());