@optique/core 1.3.0-dev.2381 → 1.3.0-dev.2383

package/dist/constructs.cjs

@@ -130,7 +130,8 @@ function isDeferredCompletionResult(result) {
 function settledPreCompletedKeys(preCompleted) {
 	const keys = /* @__PURE__ */ new Set();
 	for (const [key, result] of preCompleted) {
-		if (isDeferredCompletionResult(result)) continue;
+		const completion = require_internal_dependency.isDependencySourceState(result) ? result.result : result;
+		if (isDeferredCompletionResult(completion)) continue;
 		keys.add(key);
 	}
 	return keys;
@@ -145,7 +146,10 @@ function settledPreCompletedKeys(preCompleted) {
 * immediately.
 */
 function firstPreCompletedFailure(preCompleted) {
-	for (const result of preCompleted.values()) if (typeof result === "object" && result !== null && "success" in result && result.success === false && "error" in result) return result.error;
+	for (const result of preCompleted.values()) {
+		const completion = require_internal_dependency.isDependencySourceState(result) ? result.result : result;
+		if (typeof completion === "object" && completion !== null && "success" in completion && completion.success === false && "error" in completion) return completion.error;
+	}
 	return void 0;
 }
 async function scheduleEffectfulSourceCompletions(nodes, state, runtime, exec, preCompleted, demandNodes) {

package/dist/constructs.js

@@ -130,7 +130,8 @@ function isDeferredCompletionResult(result) {
 function settledPreCompletedKeys(preCompleted) {
 	const keys = /* @__PURE__ */ new Set();
 	for (const [key, result] of preCompleted) {
-		if (isDeferredCompletionResult(result)) continue;
+		const completion = isDependencySourceState(result) ? result.result : result;
+		if (isDeferredCompletionResult(completion)) continue;
 		keys.add(key);
 	}
 	return keys;
@@ -145,7 +146,10 @@ function settledPreCompletedKeys(preCompleted) {
 * immediately.
 */
 function firstPreCompletedFailure(preCompleted) {
-	for (const result of preCompleted.values()) if (typeof result === "object" && result !== null && "success" in result && result.success === false && "error" in result) return result.error;
+	for (const result of preCompleted.values()) {
+		const completion = isDependencySourceState(result) ? result.result : result;
+		if (typeof completion === "object" && completion !== null && "success" in completion && completion.success === false && "error" in completion) return completion.error;
+	}
 	return void 0;
 }
 async function scheduleEffectfulSourceCompletions(nodes, state, runtime, exec, preCompleted, demandNodes) {

package/dist/dependency-runtime.cjs

@@ -679,15 +679,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 * length-prefixed segments so no separator escaping is needed.
 */
 function serializeSchedulingPath(path) {
-	return path.map((segment) => {
-		if (typeof segment === "symbol") {
-			const key = stableSymbolKey(segment);
-			return `y${key.length}:${key}`;
-		}
-		const tag = typeof segment === "number" ? "n" : "s";
-		const text = String(segment);
-		return `${tag}${text.length}:${text}`;
-	}).join("");
+	return path.map(serializePathSegment).join("");
 }
 /**
 * Checks if a value is a plain object (not a class instance) for the

package/dist/dependency-runtime.js

@@ -679,15 +679,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 * length-prefixed segments so no separator escaping is needed.
 */
 function serializeSchedulingPath(path) {
-	return path.map((segment) => {
-		if (typeof segment === "symbol") {
-			const key = stableSymbolKey(segment);
-			return `y${key.length}:${key}`;
-		}
-		const tag = typeof segment === "number" ? "n" : "s";
-		const text = String(segment);
-		return `${tag}${text.length}:${text}`;
-	}).join("");
+	return path.map(serializePathSegment).join("");
 }
 /**
 * Checks if a value is a plain object (not a class instance) for the

package/dist/facade.cjs

@@ -126,6 +126,31 @@ function withEffectfulSessionOption(options, session) {
 		[effectfulSessionOptionsKey]: session
 	};
 }
+/**
+* Creates the run-scoped effectful completion sessions shared by a
+* `runWith()` two-phase run, so an effectful source (e.g., a prompt)
+* runs at most once per invocation.  The seed pass uses the demand-only
+* policy: an effectful source completes there only when a phase-one
+* consumer demands its value; others defer to the final pass.  The
+* final pass shares the run-scoped results cache and demand set, but
+* recomputes structural precedence from scratch: phase-two annotations
+* may introduce environment/configuration values that must win over a
+* cached seed prompt answer, so the effectful-source markers do not
+* carry over.
+*/
+function createRunWithSessions() {
+	const seedSession = require_internal_parser.createEffectfulCompletionSession("demand-only");
+	const finalSession = {
+		...seedSession,
+		policy: "eager",
+		effectfulSources: /* @__PURE__ */ new Set(),
+		completedByPath: /* @__PURE__ */ new Map()
+	};
+	return {
+		seedSession,
+		finalSession
+	};
+}
 function createCompleteExec(exec, context, session) {
 	const runtime = require_dependency_runtime.createDependencyRuntimeContext();
 	return {
@@ -1615,13 +1640,7 @@ async function runWithBody(parser, programName, contexts, args, options) {
 		if (parser.mode === "async") return runParser(augmentedParser1, programName, args, options);
 		return Promise.resolve(runParser(augmentedParser1, programName, args, options));
 	}
-	const seedSession = require_internal_parser.createEffectfulCompletionSession("demand-only");
-	const finalSession = {
-		...seedSession,
-		policy: "eager",
-		effectfulSources: /* @__PURE__ */ new Set(),
-		completedByPath: /* @__PURE__ */ new Map()
-	};
+	const { seedSession, finalSession } = createRunWithSessions();
 	const sessionOptions = withEffectfulSessionOption(options, finalSession);
 	const firstPassSeed = await require_mode_dispatch.dispatchByMode(parser.mode, () => extractPhase2SeedSync(augmentedParser1, args, seedSession), () => extractPhase2SeedAsync(augmentedParser1, args, seedSession));
 	if (firstPassSeed == null) {
@@ -1738,13 +1757,7 @@ function runWithSyncBody(parser, programName, contexts, args, options) {
 	}
 	const augmentedParser1 = injectAnnotationsIntoParser(parser, phase1Annotations);
 	if (!needsTwoPhase) return runParser(augmentedParser1, programName, args, options);
-	const seedSession = require_internal_parser.createEffectfulCompletionSession("demand-only");
-	const finalSession = {
-		...seedSession,
-		policy: "eager",
-		effectfulSources: /* @__PURE__ */ new Set(),
-		completedByPath: /* @__PURE__ */ new Map()
-	};
+	const { seedSession, finalSession } = createRunWithSessions();
 	const sessionOptions = withEffectfulSessionOption(options, finalSession);
 	const firstPassSeed = extractPhase2SeedSync(augmentedParser1, args, seedSession);
 	if (firstPassSeed == null) {

package/dist/facade.js

@@ -126,6 +126,31 @@ function withEffectfulSessionOption(options, session) {
 		[effectfulSessionOptionsKey]: session
 	};
 }
+/**
+* Creates the run-scoped effectful completion sessions shared by a
+* `runWith()` two-phase run, so an effectful source (e.g., a prompt)
+* runs at most once per invocation.  The seed pass uses the demand-only
+* policy: an effectful source completes there only when a phase-one
+* consumer demands its value; others defer to the final pass.  The
+* final pass shares the run-scoped results cache and demand set, but
+* recomputes structural precedence from scratch: phase-two annotations
+* may introduce environment/configuration values that must win over a
+* cached seed prompt answer, so the effectful-source markers do not
+* carry over.
+*/
+function createRunWithSessions() {
+	const seedSession = createEffectfulCompletionSession("demand-only");
+	const finalSession = {
+		...seedSession,
+		policy: "eager",
+		effectfulSources: /* @__PURE__ */ new Set(),
+		completedByPath: /* @__PURE__ */ new Map()
+	};
+	return {
+		seedSession,
+		finalSession
+	};
+}
 function createCompleteExec(exec, context, session) {
 	const runtime = createDependencyRuntimeContext();
 	return {
@@ -1615,13 +1640,7 @@ async function runWithBody(parser, programName, contexts, args, options) {
 		if (parser.mode === "async") return runParser(augmentedParser1, programName, args, options);
 		return Promise.resolve(runParser(augmentedParser1, programName, args, options));
 	}
-	const seedSession = createEffectfulCompletionSession("demand-only");
-	const finalSession = {
-		...seedSession,
-		policy: "eager",
-		effectfulSources: /* @__PURE__ */ new Set(),
-		completedByPath: /* @__PURE__ */ new Map()
-	};
+	const { seedSession, finalSession } = createRunWithSessions();
 	const sessionOptions = withEffectfulSessionOption(options, finalSession);
 	const firstPassSeed = await dispatchByMode(parser.mode, () => extractPhase2SeedSync(augmentedParser1, args, seedSession), () => extractPhase2SeedAsync(augmentedParser1, args, seedSession));
 	if (firstPassSeed == null) {
@@ -1738,13 +1757,7 @@ function runWithSyncBody(parser, programName, contexts, args, options) {
 	}
 	const augmentedParser1 = injectAnnotationsIntoParser(parser, phase1Annotations);
 	if (!needsTwoPhase) return runParser(augmentedParser1, programName, args, options);
-	const seedSession = createEffectfulCompletionSession("demand-only");
-	const finalSession = {
-		...seedSession,
-		policy: "eager",
-		effectfulSources: /* @__PURE__ */ new Set(),
-		completedByPath: /* @__PURE__ */ new Map()
-	};
+	const { seedSession, finalSession } = createRunWithSessions();
 	const sessionOptions = withEffectfulSessionOption(options, finalSession);
 	const firstPassSeed = extractPhase2SeedSync(augmentedParser1, args, seedSession);
 	if (firstPassSeed == null) {

package/dist/internal/parser.d.cts

@@ -419,9 +419,9 @@ type ExecutionPhase = "parse" | "precomplete" | "resolve" | "complete" | "sugges
  * run, shared by the phase-two seed pass and the final pass) and threaded
  * through {@link ExecutionContext}.  It guarantees that an effectful source
  * completion runs at most once per run: the completion result is cached by
- * dependency source ID, and a cache hit is returned without repeating the
- * effect.  Results never leak between runs because the session is discarded
- * when the run ends.
+ * completion occurrence (see {@link EffectfulCompletionSession.results}),
+ * and a cache hit is returned without repeating the effect.  Results never
+ * leak between runs because the session is discarded when the run ends.
  *
  * @internal
  * @since 1.3.0

package/dist/internal/parser.d.ts

@@ -419,9 +419,9 @@ type ExecutionPhase = "parse" | "precomplete" | "resolve" | "complete" | "sugges
  * run, shared by the phase-two seed pass and the final pass) and threaded
  * through {@link ExecutionContext}.  It guarantees that an effectful source
  * completion runs at most once per run: the completion result is cached by
- * dependency source ID, and a cache hit is returned without repeating the
- * effect.  Results never leak between runs because the session is discarded
- * when the run ends.
+ * completion occurrence (see {@link EffectfulCompletionSession.results}),
+ * and a cache hit is returned without repeating the effect.  Results never
+ * leak between runs because the session is discarded when the run ends.
  *
  * @internal
  * @since 1.3.0

package/package.json

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