@optique/core 1.3.0-dev.2441 → 1.3.0-dev.2442

package/dist/constructs.cjs

@@ -39,6 +39,13 @@ function withDependencyRuntimeExec(usage, exec, runtime) {
 		dependencyRegistry: runtime.registry
 	};
 }
+function withoutRepublishInstruction(exec) {
+	if (exec?.republishCachedCompletions == null) return exec;
+	return {
+		...exec,
+		republishCachedCompletions: void 0
+	};
+}
 function withChildContext$1(context, segment, state, parser, usage) {
 	const childState = parser == null ? state : require_annotation_state.getWrappedChildParseState(context.state, state, parser);
 	return require_execution_context.withChildContext(context, segment, childState, usage);
@@ -430,10 +437,12 @@ async function scheduleEffectfulSourceCompletions(nodes, state, runtime, exec, p
 			if (optedIn || expandedNode === node) collected.add(expandedNode);
 		}
 	}
+	const republish = exec?.republishCachedCompletions === true;
 	const effectful = await require_dependency_runtime.completeEffectfulSourcesAsync(expandedNodes, state, runtime, exec, {
 		...demandNodes != null ? { demandNodes: expandEffectfulRuntimeNodes(demandNodes) } : {},
 		isReusable: (node) => direct.has(node),
-		isCollected: (node) => collected.has(node)
+		isCollected: republish ? () => true : (node) => collected.has(node),
+		...republish ? { includeStructural: true } : {}
 	});
 	if (!effectful.success) return {
 		success: false,
@@ -2690,7 +2699,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = preCompleteAndRegisterDependencies(state, typedParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -2743,7 +2753,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, asyncParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -2826,7 +2837,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = preCompleteAndRegisterDependencies(state, typedParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -2869,7 +2881,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, asyncParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -3264,7 +3277,8 @@ function createSeqComplete(parsers, combinedMode) {
 		require_dependency_runtime.collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = require_dependency_runtime.resolveStateWithRuntime(stateArray, runtime);
 		const result = [];
@@ -3308,7 +3322,8 @@ function createSeqComplete(parsers, combinedMode) {
 		if (effectfulFailure != null) return effectfulFailure;
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = await require_dependency_runtime.resolveStateWithRuntimeAsync(stateArray, runtime);
 		const result = [];
@@ -3752,7 +3767,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				require_dependency_runtime.collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = require_dependency_runtime.resolveStateWithRuntime(stateArray, runtime);
 				const result = [];
@@ -3803,7 +3819,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				if (effectfulFailure != null) return effectfulFailure;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await require_dependency_runtime.resolveStateWithRuntimeAsync(stateArray, runtime);
 				const result = [];
@@ -3850,7 +3867,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				require_dependency_runtime.collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = require_dependency_runtime.resolveStateWithRuntime(stateArray, runtime);
 				const result = [];
@@ -3891,7 +3909,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await require_dependency_runtime.resolveStateWithRuntimeAsync(stateArray, runtime);
 				const result = [];
@@ -4116,7 +4135,8 @@ function seq(...rawArgs) {
 				require_dependency_runtime.collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = require_dependency_runtime.resolveStateWithRuntime(stateArray, runtime);
 				const result = [];
@@ -4157,7 +4177,8 @@ function seq(...rawArgs) {
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await require_dependency_runtime.resolveStateWithRuntimeAsync(stateArray, runtime);
 				const result = [];
@@ -4846,7 +4867,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
 					const { cache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: cache
@@ -4938,7 +4959,7 @@ function merge(...args) {
 					const parser = parsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
 					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: asyncCache
@@ -5021,7 +5042,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractMergeCompleteState(parser, resolvedState, i);
 					const { cache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: cache
@@ -5106,7 +5127,7 @@ function merge(...args) {
 					const parser = parsers[i];
 					const parserState = extractMergeCompleteState(parser, resolvedState, i);
 					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = require_execution_context.withChildExecPath(childExec, i);
+					const childCompleteExec = require_execution_context.withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: asyncCache
@@ -5685,7 +5706,8 @@ function concat(...parsers) {
 		require_dependency_runtime.collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = require_dependency_runtime.resolveStateWithRuntime(stateArray, runtime);
 		const results = [];
@@ -5739,7 +5761,8 @@ function concat(...parsers) {
 		if (effectfulFailure != null) return effectfulFailure;
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = await require_dependency_runtime.resolveStateWithRuntimeAsync(stateArray, runtime);
 		const results = [];
@@ -5809,7 +5832,8 @@ function concat(...parsers) {
 				require_dependency_runtime.collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(require_dependency_runtime.buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = require_dependency_runtime.resolveStateWithRuntime(stateArray, runtime);
 				const results = [];
@@ -5847,7 +5871,8 @@ function concat(...parsers) {
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await require_dependency_runtime.resolveStateWithRuntimeAsync(stateArray, runtime);
 				const results = [];
@@ -6848,7 +6873,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (discriminatorResult == null && innerCompleteSource == null) {
 					const discriminatorExec = ctx.exec == null ? void 0 : {
 						...ctx.exec,
-						path: [...parentPath ?? [], "_discriminator"]
+						path: [...parentPath ?? [], "_discriminator"],
+						republishCachedCompletions: void 0
 					};
 					discriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorState, discriminatorExec));
 				}
@@ -6859,7 +6885,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (branchParser != null) {
 					const branchExec = ctx.exec == null ? void 0 : {
 						...ctx.exec,
-						path: [...parentPath ?? [], "_branch"]
+						path: [...parentPath ?? [], "_branch"],
+						republishCachedCompletions: void 0
 					};
 					const annotatedInitial = require_annotation_state.getWrappedChildState(conditionalState, branchParser.initialState, branchParser);
 					const replayResult = await branchParser.parse({
@@ -6947,12 +6974,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					prepared = exec.effectfulCompletionSession.preparedByPath.get(preparedKeyFor(exec.path));
 				}
 				const annotatedDiscriminatorStateForDeferred = require_annotation_state.getWrappedChildState(state, state.discriminatorState, discriminator);
-				const deferredDiscriminatorResult = prepared != null ? prepared.discriminatorResult : unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, require_execution_context.withChildExecPath(exec, "_discriminator")));
+				const childExec = withoutRepublishInstruction(exec);
+				const deferredDiscriminatorResult = prepared != null ? prepared.discriminatorResult : unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, require_execution_context.withChildExecPath(childExec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = branches[deferredValue];
 					if (deferredBranch) {
-						const branchExec = require_execution_context.withChildExecPath(exec, "_branch");
+						const branchExec = require_execution_context.withChildExecPath(childExec, "_branch");
 						let branchState;
 						if (prepared != null && prepared.branchKey === deferredValue) branchState = prepared.branchState;
 						else {
@@ -6998,7 +7026,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			if (defaultBranch !== void 0) {
 				const branchState = require_annotation_state.getWrappedChildState(state, (prepared != null && prepared.branchKey == null ? prepared.branchState : void 0) ?? state.branchState ?? defaultBranch.initialState, defaultBranch);
-				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, require_execution_context.withChildExecPath(exec, "_branch")));
+				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, require_execution_context.withChildExecPath(withoutRepublishInstruction(exec), "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
 					success: true,
@@ -7039,15 +7067,16 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			const schedulingFailure = await scheduleEffectfulSourceCompletions(schedulingNodes, combinedState, runtime, completionExec, /* @__PURE__ */ new Map());
 			if (schedulingFailure != null) return schedulingFailure;
 		}
+		const childCompletionExec = withoutRepublishInstruction(completionExec);
 		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
-		let discriminatorCompletionExec = completionExec;
+		let discriminatorCompletionExec = childCompletionExec;
 		if (wasSpeculative && needsDiscriminatorCompletion) {
 			const discOnlyState = { _discriminator: annotatedDiscriminatorState };
 			const discOnlyRuntime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 			await require_dependency_runtime.collectExplicitSourceValuesAsync(expandSourceCollectionNodes(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator]], discOnlyState, exec?.path)), discOnlyRuntime);
 			require_dependency_runtime.collectSourcesFromState(discOnlyState, discOnlyRuntime);
 			discriminatorCompletionExec = {
-				...completionExec,
+				...childCompletionExec,
 				dependencyRuntime: discOnlyRuntime,
 				dependencyRegistry: discOnlyRuntime.registry
 			};
@@ -7063,8 +7092,27 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			else discriminatorValue = state.selectedBranch.key;
 		}
 		if (wasSpeculative && state.selectedBranch.kind === "branch" && discriminatorValue !== state.selectedBranch.key) return branchMismatchFailure(discriminatorValue, state.selectedBranch.key);
+		const branchCompletionExec = {
+			...childCompletionExec,
+			path: [...childCompletionExec.path, "_branch"],
+			...wasSpeculative ? { republishCachedCompletions: true } : {}
+		};
+		if (wasSpeculative) {
+			const replayFailure = await scheduleEffectfulSourceCompletions(buildConditionalSchedulingNodes(state, exec?.path).slice(1), combinedState, runtime, {
+				...completionExec,
+				republishCachedCompletions: true
+			}, /* @__PURE__ */ new Map());
+			if (replayFailure != null) {
+				const branchError = options?.errors?.branchError;
+				if (branchError == null || discriminatorValue === void 0 || require_dependency_runtime.replaceCachedBarrierFailure(completionExec.effectfulCompletionSession, replayFailure, replayFailure)) return replayFailure;
+				return {
+					success: false,
+					error: branchError(discriminatorValue, replayFailure.error)
+				};
+			}
+		}
 		const resolvedBranchState = require_annotation_state.getWrappedChildState(state, await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
-		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, require_execution_context.withChildExecPath(completionExec, "_branch")));
+		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, branchCompletionExec));
 		if (!branchResult.success) {
 			if (discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,

package/dist/constructs.js

@@ -39,6 +39,13 @@ function withDependencyRuntimeExec(usage, exec, runtime) {
 		dependencyRegistry: runtime.registry
 	};
 }
+function withoutRepublishInstruction(exec) {
+	if (exec?.republishCachedCompletions == null) return exec;
+	return {
+		...exec,
+		republishCachedCompletions: void 0
+	};
+}
 function withChildContext$1(context, segment, state, parser, usage) {
 	const childState = parser == null ? state : getWrappedChildParseState(context.state, state, parser);
 	return withChildContext(context, segment, childState, usage);
@@ -430,10 +437,12 @@ async function scheduleEffectfulSourceCompletions(nodes, state, runtime, exec, p
 			if (optedIn || expandedNode === node) collected.add(expandedNode);
 		}
 	}
+	const republish = exec?.republishCachedCompletions === true;
 	const effectful = await completeEffectfulSourcesAsync(expandedNodes, state, runtime, exec, {
 		...demandNodes != null ? { demandNodes: expandEffectfulRuntimeNodes(demandNodes) } : {},
 		isReusable: (node) => direct.has(node),
-		isCollected: (node) => collected.has(node)
+		isCollected: republish ? () => true : (node) => collected.has(node),
+		...republish ? { includeStructural: true } : {}
 	});
 	if (!effectful.success) return {
 		success: false,
@@ -2690,7 +2699,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = preCompleteAndRegisterDependencies(state, typedParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -2743,7 +2753,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, asyncParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -2826,7 +2837,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = preCompleteAndRegisterDependencies(state, typedParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -2869,7 +2881,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				const preCompleted = await preCompleteAndRegisterDependenciesAsync(state, asyncParserPairs, runtime.registry, childExec);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const getFieldState = createFieldStateGetter(state);
 				const annotatedState = {};
@@ -3264,7 +3277,8 @@ function createSeqComplete(parsers, combinedMode) {
 		collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = resolveStateWithRuntime(stateArray, runtime);
 		const result = [];
@@ -3308,7 +3322,8 @@ function createSeqComplete(parsers, combinedMode) {
 		if (effectfulFailure != null) return effectfulFailure;
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = await resolveStateWithRuntimeAsync(stateArray, runtime);
 		const result = [];
@@ -3752,7 +3767,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = resolveStateWithRuntime(stateArray, runtime);
 				const result = [];
@@ -3803,7 +3819,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				if (effectfulFailure != null) return effectfulFailure;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await resolveStateWithRuntimeAsync(stateArray, runtime);
 				const result = [];
@@ -3850,7 +3867,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = resolveStateWithRuntime(stateArray, runtime);
 				const result = [];
@@ -3891,7 +3909,8 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await resolveStateWithRuntimeAsync(stateArray, runtime);
 				const result = [];
@@ -4116,7 +4135,8 @@ function seq(...rawArgs) {
 				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = resolveStateWithRuntime(stateArray, runtime);
 				const result = [];
@@ -4157,7 +4177,8 @@ function seq(...rawArgs) {
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await resolveStateWithRuntimeAsync(stateArray, runtime);
 				const result = [];
@@ -4846,7 +4867,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
 					const { cache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: cache
@@ -4938,7 +4959,7 @@ function merge(...args) {
 					const parser = parsers[i];
 					const parserState = extractCompleteState(parser, resolvedState, i);
 					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: asyncCache
@@ -5021,7 +5042,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractMergeCompleteState(parser, resolvedState, i);
 					const { cache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: cache
@@ -5106,7 +5127,7 @@ function merge(...args) {
 					const parser = parsers[i];
 					const parserState = extractMergeCompleteState(parser, resolvedState, i);
 					const { cache: asyncCache, excludedSourceFields } = perChildPhase1[i];
-					const childCompleteExec = withChildExecPath(childExec, i);
+					const childCompleteExec = withChildExecPath(withoutRepublishInstruction(childExec), i);
 					const completeExec = excludedSourceFields == null ? {
 						...childCompleteExec,
 						preCompletedByParser: asyncCache
@@ -5685,7 +5706,8 @@ function concat(...parsers) {
 		collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = resolveStateWithRuntime(stateArray, runtime);
 		const results = [];
@@ -5739,7 +5761,8 @@ function concat(...parsers) {
 		if (effectfulFailure != null) return effectfulFailure;
 		const phase3Exec = {
 			...childExec,
-			preCompletedByParser: void 0
+			preCompletedByParser: void 0,
+			republishCachedCompletions: void 0
 		};
 		const resolvedArray = await resolveStateWithRuntimeAsync(stateArray, runtime);
 		const results = [];
@@ -5809,7 +5832,8 @@ function concat(...parsers) {
 				collectExplicitSourceValues(expandSourceCollectionNodes(filterPreCompletedRuntimeNodes(buildRuntimeNodesFromArray(syncParsers, stateArray, exec?.path), new Set(preCompleted.keys()))), runtime);
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = resolveStateWithRuntime(stateArray, runtime);
 				const results = [];
@@ -5847,7 +5871,8 @@ function concat(...parsers) {
 				if (effectfulFailure != null) return null;
 				const phase3Exec = {
 					...childExec,
-					preCompletedByParser: void 0
+					preCompletedByParser: void 0,
+					republishCachedCompletions: void 0
 				};
 				const resolvedArray = await resolveStateWithRuntimeAsync(stateArray, runtime);
 				const results = [];
@@ -6848,7 +6873,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (discriminatorResult == null && innerCompleteSource == null) {
 					const discriminatorExec = ctx.exec == null ? void 0 : {
 						...ctx.exec,
-						path: [...parentPath ?? [], "_discriminator"]
+						path: [...parentPath ?? [], "_discriminator"],
+						republishCachedCompletions: void 0
 					};
 					discriminatorResult = unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorState, discriminatorExec));
 				}
@@ -6859,7 +6885,8 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				if (branchParser != null) {
 					const branchExec = ctx.exec == null ? void 0 : {
 						...ctx.exec,
-						path: [...parentPath ?? [], "_branch"]
+						path: [...parentPath ?? [], "_branch"],
+						republishCachedCompletions: void 0
 					};
 					const annotatedInitial = getWrappedChildState(conditionalState, branchParser.initialState, branchParser);
 					const replayResult = await branchParser.parse({
@@ -6947,12 +6974,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					prepared = exec.effectfulCompletionSession.preparedByPath.get(preparedKeyFor(exec.path));
 				}
 				const annotatedDiscriminatorStateForDeferred = getWrappedChildState(state, state.discriminatorState, discriminator);
-				const deferredDiscriminatorResult = prepared != null ? prepared.discriminatorResult : unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(exec, "_discriminator")));
+				const childExec = withoutRepublishInstruction(exec);
+				const deferredDiscriminatorResult = prepared != null ? prepared.discriminatorResult : unwrapCompleteResult(await discriminator.complete(annotatedDiscriminatorStateForDeferred, withChildExecPath(childExec, "_discriminator")));
 				if (deferredDiscriminatorResult.success) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = branches[deferredValue];
 					if (deferredBranch) {
-						const branchExec = withChildExecPath(exec, "_branch");
+						const branchExec = withChildExecPath(childExec, "_branch");
 						let branchState;
 						if (prepared != null && prepared.branchKey === deferredValue) branchState = prepared.branchState;
 						else {
@@ -6998,7 +7026,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			if (defaultBranch !== void 0) {
 				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")));
+				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(withoutRepublishInstruction(exec), "_branch")));
 				if (!defaultResult.success) return defaultResult;
 				return {
 					success: true,
@@ -7039,15 +7067,16 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			const schedulingFailure = await scheduleEffectfulSourceCompletions(schedulingNodes, combinedState, runtime, completionExec, /* @__PURE__ */ new Map());
 			if (schedulingFailure != null) return schedulingFailure;
 		}
+		const childCompletionExec = withoutRepublishInstruction(completionExec);
 		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
-		let discriminatorCompletionExec = completionExec;
+		let discriminatorCompletionExec = childCompletionExec;
 		if (wasSpeculative && needsDiscriminatorCompletion) {
 			const discOnlyState = { _discriminator: annotatedDiscriminatorState };
 			const discOnlyRuntime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 			await collectExplicitSourceValuesAsync(expandSourceCollectionNodes(buildRuntimeNodesFromPairs([["_discriminator", discriminator]], discOnlyState, exec?.path)), discOnlyRuntime);
 			collectSourcesFromState(discOnlyState, discOnlyRuntime);
 			discriminatorCompletionExec = {
-				...completionExec,
+				...childCompletionExec,
 				dependencyRuntime: discOnlyRuntime,
 				dependencyRegistry: discOnlyRuntime.registry
 			};
@@ -7063,8 +7092,27 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			else discriminatorValue = state.selectedBranch.key;
 		}
 		if (wasSpeculative && state.selectedBranch.kind === "branch" && discriminatorValue !== state.selectedBranch.key) return branchMismatchFailure(discriminatorValue, state.selectedBranch.key);
+		const branchCompletionExec = {
+			...childCompletionExec,
+			path: [...childCompletionExec.path, "_branch"],
+			...wasSpeculative ? { republishCachedCompletions: true } : {}
+		};
+		if (wasSpeculative) {
+			const replayFailure = await scheduleEffectfulSourceCompletions(buildConditionalSchedulingNodes(state, exec?.path).slice(1), combinedState, runtime, {
+				...completionExec,
+				republishCachedCompletions: true
+			}, /* @__PURE__ */ new Map());
+			if (replayFailure != null) {
+				const branchError = options?.errors?.branchError;
+				if (branchError == null || discriminatorValue === void 0 || replaceCachedBarrierFailure(completionExec.effectfulCompletionSession, replayFailure, replayFailure)) return replayFailure;
+				return {
+					success: false,
+					error: branchError(discriminatorValue, replayFailure.error)
+				};
+			}
+		}
 		const resolvedBranchState = getWrappedChildState(state, await resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
-		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
+		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, branchCompletionExec));
 		if (!branchResult.success) {
 			if (discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,

package/dist/dependency-runtime.cjs

@@ -1525,13 +1525,15 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 				key: node.path[node.path.length - 1],
 				result: priorResult
 			});
+			if (exec.republishCachedCompletions === true && priorResult.success && priorResult.value !== void 0) publishFromNode(node, source.sourceId, priorResult.value);
 			continue;
 		}
 		const reusable = source.preservesSourceValue && (options?.isReusable?.(node) ?? true);
 		if (!reusable && session == null) continue;
 		const childExec = {
 			...exec,
-			path: node.path
+			path: node.path,
+			republishCachedCompletions: void 0
 		};
 		const result = await source.completeSource(node.state, childExec);
 		if (result == null) continue;

package/dist/dependency-runtime.js

@@ -1525,13 +1525,15 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 				key: node.path[node.path.length - 1],
 				result: priorResult
 			});
+			if (exec.republishCachedCompletions === true && priorResult.success && priorResult.value !== void 0) publishFromNode(node, source.sourceId, priorResult.value);
 			continue;
 		}
 		const reusable = source.preservesSourceValue && (options?.isReusable?.(node) ?? true);
 		if (!reusable && session == null) continue;
 		const childExec = {
 			...exec,
-			path: node.path
+			path: node.path,
+			republishCachedCompletions: void 0
 		};
 		const result = await source.completeSource(node.state, childExec);
 		if (result == null) continue;

package/dist/internal/parser.d.cts

@@ -467,7 +467,9 @@ interface EffectfulCompletionSession {
    * owning nested construct's own scheduling pass reuses it instead of
    * completing the same node again—keeping lazy wrapper defaults at one
    * evaluation per pass and the registered dependency value identical to
-   * the field's final value.
+   * the field's final value.  A pass whose execution context carries
+   * {@link ExecutionContext.republishCachedCompletions} re-registers a
+   * reused result's value at the node's declaration position.
    */
   readonly completedByPath: Map<string, ValueParserResult<unknown>>;
   /**
@@ -576,6 +578,29 @@ interface ExecutionContext {
    * @internal
    */
   readonly preCompletedByParser?: ReadonlyMap<string | symbol, unknown>;
+  /**
+   * Re-registers effectful completion results already cached in the
+   * run-scoped session at their declaration positions during the
+   * receiving construct's own effectful scheduling pass.  A
+   * `conditional()` sets this for the completion of a branch it selected
+   * during completion: the branch completes against a fresh runtime
+   * cloned after the enclosing pass restored later-declared occurrences,
+   * and the branch's cached publishes have no structural carrier, so
+   * without this the branch's deferred derived consumers would read the
+   * outer occurrence instead of the branch's own publish.  No effect
+   * re-runs; only the cached value is re-registered.
+   *
+   * Path-transparent wrappers (`command()`, `or()`, modifiers) forward
+   * it unchanged.  A construct that runs the scheduling pass consumes it
+   * there and must drop it from the execution contexts of its own
+   * children, exactly as it drops {@link preCompletedByParser}, so nested
+   * passes keep skipping cached completions instead of re-asserting them
+   * over a later sibling occurrence.
+   *
+   * @see https://github.com/dahlia/optique/issues/929
+   * @internal
+   */
+  readonly republishCachedCompletions?: boolean;
   /**
    * Field names that should be ignored when a construct seeds dependency
    * sources from child state during completion.

package/dist/internal/parser.d.ts

@@ -467,7 +467,9 @@ interface EffectfulCompletionSession {
    * owning nested construct's own scheduling pass reuses it instead of
    * completing the same node again—keeping lazy wrapper defaults at one
    * evaluation per pass and the registered dependency value identical to
-   * the field's final value.
+   * the field's final value.  A pass whose execution context carries
+   * {@link ExecutionContext.republishCachedCompletions} re-registers a
+   * reused result's value at the node's declaration position.
    */
   readonly completedByPath: Map<string, ValueParserResult<unknown>>;
   /**
@@ -576,6 +578,29 @@ interface ExecutionContext {
    * @internal
    */
   readonly preCompletedByParser?: ReadonlyMap<string | symbol, unknown>;
+  /**
+   * Re-registers effectful completion results already cached in the
+   * run-scoped session at their declaration positions during the
+   * receiving construct's own effectful scheduling pass.  A
+   * `conditional()` sets this for the completion of a branch it selected
+   * during completion: the branch completes against a fresh runtime
+   * cloned after the enclosing pass restored later-declared occurrences,
+   * and the branch's cached publishes have no structural carrier, so
+   * without this the branch's deferred derived consumers would read the
+   * outer occurrence instead of the branch's own publish.  No effect
+   * re-runs; only the cached value is re-registered.
+   *
+   * Path-transparent wrappers (`command()`, `or()`, modifiers) forward
+   * it unchanged.  A construct that runs the scheduling pass consumes it
+   * there and must drop it from the execution contexts of its own
+   * children, exactly as it drops {@link preCompletedByParser}, so nested
+   * passes keep skipping cached completions instead of re-asserting them
+   * over a later sibling occurrence.
+   *
+   * @see https://github.com/dahlia/optique/issues/929
+   * @internal
+   */
+  readonly republishCachedCompletions?: boolean;
   /**
    * Field names that should be ignored when a construct seeds dependency
    * sources from child state during completion.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.0-dev.2441",
+  "version": "1.3.0-dev.2442",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -221,7 +221,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2441+5735b624",
+    "@optique/env": "1.3.0-dev.2442+622c6577",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",