@pisell/private-materials 6.12.166 → 6.12.167

package/lib/components/HDLKiosk/kernel/workflow/actor.js

@@ -24,6 +24,15 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 	let navigationTurnLocked = false;
 	const repeatCounts = /* @__PURE__ */ new Map();
 	const completedStepIds = /* @__PURE__ */ new Set();
+	const stepResolutions = /* @__PURE__ */ new Map();
+	let navigationHistory = [];
+	const readStepResolutions = () => {
+		const resolutions = {};
+		stepResolutions.forEach((resolution, stepId) => {
+			resolutions[stepId] = resolution;
+		});
+		return resolutions;
+	};
 	const configuredStartingNodeId = initialNodeId && definition.nodes[initialNodeId] ? initialNodeId : definition.initial;
 	const stepLocation = (stepId) => {
 		const node = definition.nodes[stepId];
@@ -34,6 +43,20 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			guardPhases: node.guardPhases
 		};
 	};
+	const resolveResumableTarget = (initialStepId) => {
+		let stepId = initialStepId;
+		const visited = /* @__PURE__ */ new Set();
+		while (!visited.has(stepId)) {
+			visited.add(stepId);
+			const node = definition.nodes[stepId];
+			const storedResolution = stepResolutions.get(stepId);
+			if (!node || !storedResolution || node.visitPolicy !== "reuseResolution" && node.visitPolicy !== "once") return stepId;
+			const transition = node.on[storedResolution];
+			if (!transition) return stepId;
+			stepId = transition.target;
+		}
+		throw new Error("Workflow resumable Step cycle");
+	};
 	const resolveNavigation = ({ target, fromNodeId, candidateContext, candidateCompletedStepIds, intentId, direction: requestedDirection }) => {
 		navigationSequence += 1;
 		const navigationId = `${definition.id}:${sessionEpoch}:navigation:${navigationSequence}`;
@@ -67,7 +90,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 					type: "external",
 					to: nextTarget
 				};
-				if (decision.type === "cancel" || decision.type === "skip") return { type: "cancel" };
+				if (decision.type === "cancel" || decision.type === "bypass") return { type: "cancel" };
 				if (decision.type === "redirect") return resolveTarget(decision.to, redirectCount + 1, direction);
 				if (decision.type === "defer") return {
 					type: "defer",
@@ -93,6 +116,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			const direction = !fromNodeId ? "initial" : delta < 0 ? "backward" : "forward";
 			for (let candidateIndex = targetIndex; candidateIndex >= 0 && candidateIndex < definition.stepOrder.length; candidateIndex += delta) {
 				const candidateStepId = definition.stepOrder[candidateIndex];
+				if (definition.nodes[candidateStepId].visitPolicy === "once" && stepResolutions.has(candidateStepId)) continue;
 				const decision = beforeEach({
 					navigationId,
 					intentId,
@@ -151,12 +175,16 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 		status: initialError || initialResolutionError || startingNode.end === "blocked" ? "blocked" : startingNode.end === "success" ? "finished" : "idle",
 		context: Object.freeze(require_objectSpread2._objectSpread2({}, context)),
 		completedStepIds: Object.freeze([]),
+		stepResolutions: Object.freeze({}),
+		navigationHistory: Object.freeze([]),
 		lastError: (_ref2 = initialError !== null && initialError !== void 0 ? initialError : initialResolutionError) !== null && _ref2 !== void 0 ? _ref2 : startingNode.end === "blocked" ? createWorkflowError("workflowEndedBlocked", "staff") : void 0
 	});
 	const publish = (next) => {
 		snapshot = Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, next), {}, {
 			context: Object.freeze(require_objectSpread2._objectSpread2({}, next.context)),
 			completedStepIds: Object.freeze([...next.completedStepIds]),
+			stepResolutions: Object.freeze(require_objectSpread2._objectSpread2({}, next.stepResolutions)),
+			navigationHistory: Object.freeze([...next.navigationHistory]),
 			pendingNavigation: next.pendingNavigation ? Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, next.pendingNavigation), {}, {
 				to: Object.freeze(require_objectSpread2._objectSpread2({}, next.pendingNavigation.to)),
 				request: Object.freeze(require_objectSpread2._objectSpread2({}, next.pendingNavigation.request))
@@ -174,6 +202,8 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 				status: blocked || node.end === "blocked" ? "blocked" : node.end === "success" ? "finished" : "idle",
 				context: nextContext,
 				completedStepIds: Object.freeze([...completedStepIds]),
+				stepResolutions: Object.freeze(readStepResolutions()),
+				navigationHistory: Object.freeze([...navigationHistory]),
 				pendingNavigation: void 0,
 				confirmedCheckout: confirmedCheckout !== null && confirmedCheckout !== void 0 ? confirmedCheckout : snapshot.confirmedCheckout,
 				activeOperation: void 0,
@@ -194,7 +224,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			const workflowError = createWorkflowError(code, "staff", cause);
 			lifecycle.runtimeError({
 				stepId: fromNodeId,
-				outcome: event.outcome,
+				intent: event.intent,
 				error: workflowError
 			});
 			yield commit(fromNodeId, fromNodeId, event, snapshot.context, true, workflowError);
@@ -209,10 +239,22 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			if (disposed || snapshot.status === "finished" || snapshot.status === "blocked") return;
 			const fromNodeId = snapshot.nodeId;
 			const node = definition.nodes[fromNodeId];
-			if (event.type !== "ACTIVITY_OUTCOME" || event.stepId !== fromNodeId || event.activityId !== node.activity) return;
-			const transition = node.on[event.outcome];
-			if (!transition || !event.intentId.trim()) return;
-			const repeatKey = `${fromNodeId}:${event.outcome}:${transition.target}`;
+			if (event.stepId !== fromNodeId || event.activityId !== node.activity) return;
+			if (!event.intentId.trim()) return;
+			if (event.type === "NAVIGATE_BACK") {
+				const previousStepId = navigationHistory[navigationHistory.length - 1];
+				yield handleDirectNavigation(previousStepId ? {
+					kind: "step",
+					stepId: previousStepId
+				} : {
+					kind: "sessionExit",
+					reason: "workflowBoundary"
+				}, event.intentId);
+				return;
+			}
+			const transition = node.on[event.intent];
+			if (!transition) return;
+			const repeatKey = `${fromNodeId}:${event.intent}:${transition.target}`;
 			if (transition.repeat && ((_repeatCounts$get = repeatCounts.get(repeatKey)) !== null && _repeatCounts$get !== void 0 ? _repeatCounts$get : 0) >= transition.repeat.max) {
 				yield blockForRuntimeError(fromNodeId, event, "workflowRepeatLimitExceeded");
 				return;
@@ -222,16 +264,24 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 				if (!transition.repeat) return;
 				repeatCounts.set(repeatKey, ((_repeatCounts$get2 = repeatCounts.get(repeatKey)) !== null && _repeatCounts$get2 !== void 0 ? _repeatCounts$get2 : 0) + 1);
 			};
-			const nextContext = reduceContext(snapshot.context, event.contextPatch);
+			const previousContext = snapshot.context;
+			const nextContext = reduceContext(previousContext, event.contextPatch);
+			let requestedTarget = transition.target;
+			try {
+				requestedTarget = resolveResumableTarget(requestedTarget);
+			} catch (cause) {
+				yield blockForRuntimeError(fromNodeId, event, "workflowResumeCycle", cause);
+				return;
+			}
 			const fromIndex = definition.stepOrder.indexOf(fromNodeId);
-			const movesForward = definition.stepOrder.indexOf(transition.target) > fromIndex;
+			const movesForward = definition.stepOrder.indexOf(requestedTarget) > fromIndex;
 			const candidateCompletedStepIds = movesForward ? [...new Set([...completedStepIds, fromNodeId])] : [...completedStepIds];
 			let navigationResolution;
 			try {
 				navigationResolution = resolveNavigation({
 					target: {
 						kind: "step",
-						stepId: transition.target
+						stepId: requestedTarget
 					},
 					fromNodeId,
 					candidateContext: nextContext,
@@ -245,10 +295,10 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			if (navigationResolution.type === "block") {
 				lifecycle.runtimeError({
 					stepId: fromNodeId,
-					outcome: event.outcome,
+					intent: event.intent,
 					error: navigationResolution.error
 				});
-				yield commit(fromNodeId, fromNodeId, event, snapshot.context, true, navigationResolution.error);
+				yield commit(fromNodeId, fromNodeId, event, previousContext, true, navigationResolution.error);
 				return;
 			}
 			if (navigationResolution.type === "cancel") return;
@@ -268,9 +318,9 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 				return;
 			}
 			const resolvedTarget = navigationResolution.stepId;
-			const operationInput = "operationInput" in event ? event.operationInput : void 0;
+			"operationInput" in event && event.operationInput;
 			const command = (_transition$exitPolic = transition.exitPolicy) === null || _transition$exitPolic === void 0 ? void 0 : _transition$exitPolic.command;
-			const commandWillRun = Boolean(command && (command.when !== "inputPresent" || operationInput != null));
+			const commandWillRun = Boolean(command);
 			executionSequence += 1;
 			const executionId = `${definition.id}:${snapshot.sessionEpoch}:${executionSequence}`;
 			if (commandWillRun && command) publish(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, snapshot), {}, {
@@ -303,21 +353,29 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			if (result.status === "advance") {
 				recordRepeat();
 				if (movesForward) completedStepIds.add(fromNodeId);
+				stepResolutions.set(fromNodeId, event.intent);
+				if (event.intent === "complete" && node.presentation.mode === "page" && movesForward && node.visitPolicy !== "once") {
+					navigationHistory = navigationHistory.filter((stepId) => stepId !== fromNodeId);
+					navigationHistory.push(fromNodeId);
+				} else if (event.intent === "skip") navigationHistory = navigationHistory.filter((stepId) => stepId !== fromNodeId);
 				yield commit(fromNodeId, resolvedTarget, event, nextContext, false, void 0, result.confirmedCheckout);
 				return;
 			}
 			if (result.status === "blocked") {
-				yield commit(fromNodeId, fromNodeId, event, nextContext, true, result.lastError);
+				yield commit(fromNodeId, fromNodeId, event, previousContext, true, result.lastError);
 				return;
 			}
-			yield commit(fromNodeId, fromNodeId, event, nextContext, false, result.lastError);
+			yield commit(fromNodeId, fromNodeId, event, previousContext, false, result.lastError);
 		});
 		return function handleEvent(_x12) {
 			return _ref5.apply(this, arguments);
 		};
 	}();
-	const handleDirectNavigation = function() {
-		var _ref6 = require_asyncToGenerator._asyncToGenerator(function* (target, intentId) {
+	function handleDirectNavigation(_x13, _x14) {
+		return _handleDirectNavigation.apply(this, arguments);
+	}
+	function _handleDirectNavigation() {
+		_handleDirectNavigation = require_asyncToGenerator._asyncToGenerator(function* (target, intentId) {
 			if (!intentId.trim()) return;
 			const fromNodeId = snapshot.nodeId;
 			let resolution;
@@ -333,7 +391,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			} catch (cause) {
 				yield blockForRuntimeError(fromNodeId, {
 					intentId,
-					outcome: "directNavigation"
+					intent: "directNavigation"
 				}, "workflowBeforeEachGuardFailed", cause);
 				return;
 			}
@@ -341,19 +399,23 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			if (resolution.type === "block") {
 				lifecycle.runtimeError({
 					stepId: fromNodeId,
-					outcome: "directNavigation",
+					intent: "directNavigation",
 					error: resolution.error
 				});
 				yield commit(fromNodeId, fromNodeId, {
 					intentId,
-					outcome: "directNavigation"
+					intent: "directNavigation"
 				}, snapshot.context, true, resolution.error);
 				return;
 			}
 			if (resolution.type === "step") {
+				const fromIndex = definition.stepOrder.indexOf(fromNodeId);
+				if (definition.stepOrder.indexOf(resolution.stepId) < fromIndex) stepResolutions.delete(fromNodeId);
+				const historyIndex = navigationHistory.lastIndexOf(resolution.stepId);
+				if (historyIndex >= 0) navigationHistory = navigationHistory.slice(0, historyIndex);
 				yield commit(fromNodeId, resolution.stepId, {
 					intentId,
-					outcome: "directNavigation"
+					intent: "directNavigation"
 				}, snapshot.context, false);
 				return;
 			}
@@ -370,12 +432,10 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 				lastError: void 0
 			}));
 		});
-		return function handleDirectNavigation(_x13, _x14) {
-			return _ref6.apply(this, arguments);
-		};
-	}();
+		return _handleDirectNavigation.apply(this, arguments);
+	}
 	const drain = function() {
-		var _ref7 = require_asyncToGenerator._asyncToGenerator(function* () {
+		var _ref6 = require_asyncToGenerator._asyncToGenerator(function* () {
 			if (processing || disposed) return;
 			processing = true;
 			try {
@@ -388,7 +448,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			}
 		});
 		return function drain() {
-			return _ref7.apply(this, arguments);
+			return _ref6.apply(this, arguments);
 		};
 	}();
 	return {
@@ -430,7 +490,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			const fromNodeId = snapshot.nodeId;
 			commit(fromNodeId, fromNodeId, {
 				intentId,
-				outcome: "systemBlocked"
+				intent: "systemBlocked"
 			}, snapshot.context, true, error);
 		},
 		dispose: () => {

package/lib/components/HDLKiosk/kernel/workflow/compiler.js

@@ -65,7 +65,7 @@ function compileWorkflowStructure(input, options) {
 	var _options$maxSteps, _options$maxTransitio, _input$id, _stepIds$;
 	const issues = [];
 	const activities = options.activities;
-	const guards = options.guards;
+	const predicates = options.predicates;
 	const maxSteps = (_options$maxSteps = options.maxSteps) !== null && _options$maxSteps !== void 0 ? _options$maxSteps : 32;
 	const maxTransitions = (_options$maxTransitio = options.maxTransitions) !== null && _options$maxTransitio !== void 0 ? _options$maxTransitio : 96;
 	if (!isRecord(input)) return {
@@ -120,12 +120,14 @@ function compileWorkflowStructure(input, options) {
 			"activity",
 			"presentation",
 			"readiness",
+			"visitPolicy",
 			"useGuards",
 			"on",
 			"end",
 			"screen"
 		], stepPath, issues);
 		if (rawStep.screen !== void 0) addIssue(issues, "step.screen.forbidden", `${stepPath}.screen`, "Screen is resolved by the local Activity Contract");
+		if (rawStep.visitPolicy !== void 0 && rawStep.visitPolicy !== "always" && rawStep.visitPolicy !== "reuseResolution" && rawStep.visitPolicy !== "once") addIssue(issues, "step.visitPolicy.invalid", `${stepPath}.visitPolicy`, "Step visitPolicy must be always, reuseResolution or once");
 		const activityValue = rawStep.activity;
 		if (typeof activityValue !== "string" || !activities.has(activityValue)) addIssue(issues, "activity.unknown", `${stepPath}.activity`, `Unknown activity: ${String(activityValue)}`);
 		const fallbackActivityId = activities.ids[0];
@@ -140,11 +142,12 @@ function compileWorkflowStructure(input, options) {
 				addIssue(issues, "step.useGuards.phase.invalid", phasePath, `Unknown navigation guard phase: ${String(rawPhase)}`);
 				return;
 			}
-			if (guardPhases.includes(rawPhase)) {
+			const phase = rawPhase;
+			if (guardPhases.includes(phase)) {
 				addIssue(issues, "step.useGuards.phase.duplicate", phasePath, `Duplicate navigation guard phase: ${rawPhase}`);
 				return;
 			}
-			const guardId = (_activity$navigationG = activity.navigationGuards) === null || _activity$navigationG === void 0 ? void 0 : _activity$navigationG[rawPhase];
+			const guardId = (_activity$navigationG = activity.navigationGuards) === null || _activity$navigationG === void 0 ? void 0 : _activity$navigationG[phase];
 			if (!guardId) {
 				addIssue(issues, "step.useGuards.unavailable", phasePath, `Activity ${activity.id} does not define ${rawPhase}`);
 				return;
@@ -153,7 +156,7 @@ function compileWorkflowStructure(input, options) {
 				addIssue(issues, "step.useGuards.guard.unknown", phasePath, `Activity ${activity.id} uses unknown navigation guard ${guardId}`);
 				return;
 			}
-			guardPhases.push(rawPhase);
+			guardPhases.push(phase);
 		});
 		const rawPresentation = rawStep.presentation;
 		let presentation = { mode: "page" };
@@ -170,12 +173,12 @@ function compileWorkflowStructure(input, options) {
 		}
 		if (rawStep.readiness !== void 0 && rawStep.readiness !== "implemented" && rawStep.readiness !== "placeholder") addIssue(issues, "step.readiness.invalid", `${stepPath}.readiness`, "Step readiness must be implemented or placeholder");
 		if (rawStep.end !== void 0 && rawStep.end !== "success" && rawStep.end !== "blocked") addIssue(issues, "step.end.invalid", `${stepPath}.end`, "Step end must be success or blocked");
-		if (rawStep.on !== void 0 && !isRecord(rawStep.on)) addIssue(issues, "step.outcomes.invalid", `${stepPath}.on`, "Step outcomes must be an object");
+		if (rawStep.on !== void 0 && !isRecord(rawStep.on)) addIssue(issues, "step.intents.invalid", `${stepPath}.on`, "Step intents must be an object");
 		const transitions = {};
-		const addTransition = (outcome, rawTarget, path) => {
+		const addTransition = (intent, rawTarget, path) => {
 			var _activity$exitPolicie;
-			if (!activity.outcomes.includes(outcome)) {
-				addIssue(issues, "activity.outcome.unknown", path, `Activity ${activity.id} does not expose outcome ${outcome}`);
+			if (!activity.intents.some((availableIntent) => availableIntent === intent)) {
+				addIssue(issues, "activity.intent.unknown", path, `Activity ${activity.id} does not expose intent ${intent}`);
 				return;
 			}
 			let targetValue = rawTarget;
@@ -185,12 +188,12 @@ function compileWorkflowStructure(input, options) {
 					"target",
 					"repeat",
 					"operation",
-					"guard",
+					"precondition",
 					"failureTarget"
 				], path, issues);
 				[
 					"operation",
-					"guard",
+					"precondition",
 					"failureTarget"
 				].forEach((field) => {
 					if (rawTarget[field] !== void 0) addIssue(issues, "transition.untrustedField", `${path}.${field}`, `${field} belongs to the local Activity Contract`);
@@ -203,15 +206,15 @@ function compileWorkflowStructure(input, options) {
 				return;
 			}
 			const symbolicTarget = targetValue.trim();
-			const target = symbolicTarget === "$next" ? stepIds[index + 1] : symbolicTarget === "$prev" ? stepIds[index - 1] : symbolicTarget;
+			const target = symbolicTarget === "$next" ? stepIds[index + 1] : symbolicTarget;
 			if (!target) {
-				addIssue(issues, symbolicTarget === "$prev" ? "transition.prev.missing" : "transition.next.missing", path, `${symbolicTarget} does not exist for step ${stepId}`);
+				addIssue(issues, "transition.next.missing", path, `${symbolicTarget} does not exist for step ${stepId}`);
 				return;
 			}
-			const exitPolicy = (_activity$exitPolicie = activity.exitPolicies) === null || _activity$exitPolicie === void 0 ? void 0 : _activity$exitPolicie[outcome];
-			if ((exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.guard) && !guards.has(exitPolicy.guard)) addIssue(issues, "activity.guard.unknown", path, `Activity ${activity.id} uses unknown guard ${exitPolicy.guard}`);
+			const exitPolicy = (_activity$exitPolicie = activity.exitPolicies) === null || _activity$exitPolicie === void 0 ? void 0 : _activity$exitPolicie[intent];
+			if ((exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.precondition) && !predicates.has(exitPolicy.precondition)) addIssue(issues, "activity.precondition.unknown", path, `Activity ${activity.id} uses unknown precondition predicate ${exitPolicy.precondition}`);
 			if ((exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.command) && !options.operations.has(exitPolicy.command.id)) addIssue(issues, "activity.command.unknown", path, `Activity ${activity.id} uses unknown command ${exitPolicy.command.id}`);
-			transitions[outcome] = Object.freeze({
+			transitions[intent] = Object.freeze({
 				target,
 				exitPolicy,
 				repeat
@@ -219,15 +222,11 @@ function compileWorkflowStructure(input, options) {
 		};
 		if (index + 1 < rawSteps.length) {
 			var _activity$navigation;
-			(_activity$navigation = activity.navigation) === null || _activity$navigation === void 0 || (_activity$navigation = _activity$navigation.forward) === null || _activity$navigation === void 0 || _activity$navigation.forEach((outcome) => addTransition(outcome, "$next", `${stepPath}.navigation.${outcome}`));
-		}
-		if (index > 0) {
-			var _activity$navigation2;
-			(_activity$navigation2 = activity.navigation) === null || _activity$navigation2 === void 0 || (_activity$navigation2 = _activity$navigation2.backward) === null || _activity$navigation2 === void 0 || _activity$navigation2.forEach((outcome) => addTransition(outcome, "$prev", `${stepPath}.navigation.${outcome}`));
+			(_activity$navigation = activity.navigation) === null || _activity$navigation === void 0 || (_activity$navigation = _activity$navigation.forward) === null || _activity$navigation === void 0 || _activity$navigation.forEach((intent) => addTransition(intent, "$next", `${stepPath}.navigation.${intent}`));
 		}
 		const rawTransitions = isRecord(rawStep.on) ? rawStep.on : {};
-		Object.entries(rawTransitions).forEach(([outcome, transition]) => {
-			addTransition(outcome, transition, `${stepPath}.on.${outcome}`);
+		Object.entries(rawTransitions).forEach(([intent, transition]) => {
+			addTransition(intent, transition, `${stepPath}.on.${intent}`);
 		});
 		transitionCount += Object.keys(transitions).length;
 		nodes[stepId] = Object.freeze({
@@ -236,6 +235,7 @@ function compileWorkflowStructure(input, options) {
 			screenId: activity.screenId,
 			presentation,
 			readiness: rawStep.readiness === "placeholder" ? "placeholder" : void 0,
+			visitPolicy: rawStep.visitPolicy === "reuseResolution" || rawStep.visitPolicy === "once" ? rawStep.visitPolicy : "always",
 			guardPhases: Object.freeze([...guardPhases]),
 			on: Object.freeze(transitions),
 			end: rawStep.end === "success" || rawStep.end === "blocked" ? rawStep.end : void 0
@@ -255,18 +255,17 @@ function compileWorkflowStructure(input, options) {
 		const transitions = Object.entries(node.on).filter((entry) => entry[1]);
 		if (!node.end && transitions.length === 0) addIssue(issues, "step.deadEnd", path, "A step without outgoing transitions must declare its end state");
 		if (node.end && transitions.length > 0) addIssue(issues, "step.end.hasTransitions", path, "An end step cannot expose outgoing transitions");
-		transitions.forEach(([outcome, transition]) => {
-			var _stepIndex$get2, _stepIndex$get3, _activities$require$n;
+		transitions.forEach(([intent, transition]) => {
+			var _stepIndex$get2, _stepIndex$get3;
 			if (!transition) return;
 			if (!nodes[transition.target]) {
-				addIssue(issues, "transition.target.missing", `${path}.on.${outcome}`, `Target step does not exist: ${transition.target}`);
+				addIssue(issues, "transition.target.missing", `${path}.on.${intent}`, `Target step does not exist: ${transition.target}`);
 				return;
 			}
 			const sourceIndex = (_stepIndex$get2 = stepIndex.get(stepId)) !== null && _stepIndex$get2 !== void 0 ? _stepIndex$get2 : -1;
-			const targetIndex = (_stepIndex$get3 = stepIndex.get(transition.target)) !== null && _stepIndex$get3 !== void 0 ? _stepIndex$get3 : -1;
-			const needsBound = !((_activities$require$n = activities.require(node.activity).navigation) === null || _activities$require$n === void 0 || (_activities$require$n = _activities$require$n.backward) === null || _activities$require$n === void 0 ? void 0 : _activities$require$n.includes(outcome)) && targetIndex <= sourceIndex;
-			if (needsBound && !transition.repeat) addIssue(issues, "transition.cycle.unbounded", `${path}.on.${outcome}`, "A non-backward jump to the same or an earlier step requires a repeat limit");
-			if (!needsBound && transition.repeat) addIssue(issues, "transition.repeat.unnecessary", `${path}.on.${outcome}.repeat`, "Repeat limits are only valid on cyclic non-backward jumps");
+			const needsBound = ((_stepIndex$get3 = stepIndex.get(transition.target)) !== null && _stepIndex$get3 !== void 0 ? _stepIndex$get3 : -1) <= sourceIndex;
+			if (needsBound && !transition.repeat) addIssue(issues, "transition.cycle.unbounded", `${path}.on.${intent}`, "A jump to the same or an earlier step requires a repeat limit");
+			if (!needsBound && transition.repeat) addIssue(issues, "transition.repeat.unnecessary", `${path}.on.${intent}.repeat`, "Repeat limits are only valid on cyclic jumps");
 		});
 	});
 	const initial = (_stepIds$ = stepIds[0]) !== null && _stepIds$ !== void 0 ? _stepIds$ : "";

package/lib/components/HDLKiosk/kernel/workflow/selectors.js

@@ -0,0 +1,10 @@
+//#region src/components/HDLKiosk/kernel/workflow/selectors.ts
+function canReopenWorkflowStep(snapshot, stepId) {
+	return Boolean(stepId && snapshot.stepResolutions[stepId] === "complete");
+}
+function canNavigateBack(snapshot) {
+	return snapshot.navigationHistory.length > 0 || snapshot.stepResolutions[snapshot.nodeId] !== void 0;
+}
+//#endregion
+exports.canNavigateBack = canNavigateBack;
+exports.canReopenWorkflowStep = canReopenWorkflowStep;

package/lib/components/HDLKiosk/runtime/HDLKioskWorkflowView.js

@@ -2,6 +2,7 @@ const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
 const require_asyncToGenerator = require("../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_useHDLKioskCustomerController = require("./controllers/useHDLKioskCustomerController.js");
 const require_useHDLKioskScreenData = require("./controllers/useHDLKioskScreenData.js");
+const require_selectors = require("../kernel/workflow/selectors.js");
 const require_index = require("../components/overlays/EndOrderDialog/index.js");
 const require_index$1 = require("../components/shell/HDLKioskHeader/index.js");
 const require_index$2 = require("../components/overlays/CartDrawer/index.js");
@@ -67,7 +68,7 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 		var _session$definition$n;
 		return ((_session$definition$n = session.definition.nodes[stepId]) === null || _session$definition$n === void 0 ? void 0 : _session$definition$n.activity) === "customization";
 	});
-	const screenDataActivity = ((_activeNode$presentat = activeNode.presentation) === null || _activeNode$presentat === void 0 ? void 0 : _activeNode$presentat.mode) === "modal" ? session.definition.nodes[activeNode.presentation.base].activity : activeNode.activity;
+	const screenDataNode = ((_activeNode$presentat = activeNode.presentation) === null || _activeNode$presentat === void 0 ? void 0 : _activeNode$presentat.mode) === "modal" ? session.definition.nodes[activeNode.presentation.base] : activeNode;
 	const paymentSafeForReset = sales.payment.status === "idle" || sales.payment.status === "failed";
 	const resetSession = (0, react.useCallback)(require_asyncToGenerator._asyncToGenerator(function* () {
 		if (resetInFlight.current) return;
@@ -145,8 +146,8 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 	]);
 	const { catalog, customization, payment } = require_useHDLKioskScreenData.useHDLKioskScreenData({
 		host,
-		currentScreenId,
-		activity: screenDataActivity,
+		currentScreenId: screenDataNode.screenId,
+		activity: screenDataNode.activity,
 		isActive,
 		primaryWeightedProductId: config.primaryWeightedProductId
 	});
@@ -163,7 +164,7 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 		}
 		sequence.current += 1;
 		const intentId = `ui:${snapshot.sessionEpoch}:${sequence.current}`;
-		if (action.kind === "outcome") {
+		if (action.kind === "intent" || action.kind === "navigation") {
 			const event = require_workflowEvent.createWorkflowEvent(action, activeNode.activity, snapshot.nodeId, intentId);
 			if (event) session.actor.send(event);
 			return;
@@ -193,9 +194,9 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 	(0, react.useEffect)(() => {
 		if (activeNode.activity !== "paymentMethod" || snapshot.status !== "idle" || sales.payment.status !== "succeeded") return;
 		send({
-			kind: "outcome",
+			kind: "intent",
 			activityId: "paymentMethod",
-			outcome: "confirmed"
+			intent: "complete"
 		});
 	}, [
 		activeNode.activity,
@@ -273,7 +274,7 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 		memberAction,
 		send,
 		renderCartContent,
-		onEditPrimaryProduct: customizationStepId && config.primaryWeightedProductId ? editPrimaryProduct : void 0
+		onEditPrimaryProduct: customizationStepId && config.primaryWeightedProductId && require_selectors.canReopenWorkflowStep(snapshot, customizationStepId) ? editPrimaryProduct : void 0
 	}), endOrderConfirmationOpen ? /* @__PURE__ */ react.default.createElement(require_index.EndOrderDialog, {
 		onCancel: cancelEndOrder,
 		onConfirm: confirmEndOrder

package/lib/components/HDLKiosk/runtime/controllers/useHDLKioskCustomerController.js

@@ -12,7 +12,7 @@ const MEMBER_ACTION_ACTIVITIES = new Set([
 	"fulfillment",
 	"customization",
 	"catalog",
-	"catalogWithPrimaryProductPrompt",
+	"primaryProductPrompt",
 	"paymentMethod"
 ]);
 /**

package/lib/components/HDLKiosk/runtime/createWorkflowSession.js

@@ -3,7 +3,7 @@ const require_asyncToGenerator = require("../../../_virtual/_@oxc-project_runtim
 const require_coordinator = require("../app/operations/coordinator.js");
 const require_manifest = require("../app/manifest.js");
 const require_registry = require("../app/workflow/registry.js");
-const require_guards = require("../app/workflow/guards.js");
+const require_predicates = require("../app/workflow/predicates.js");
 const require_navigationGuards = require("../app/workflow/navigationGuards.js");
 const require_policy = require("../app/workflow/policy.js");
 const require_constants = require("../app/constants.js");
@@ -27,7 +27,7 @@ function createHDLKioskWorkflowSession(entry, host, options = {}) {
 	const structuralCompilation = require_compiler.compileWorkflowStructure(require_registry.getBuiltInWorkflowDefinition(entry), {
 		operations,
 		activities: require_registry.defaultActivityRegistry,
-		guards: require_guards.defaultGuardRegistry,
+		predicates: require_predicates.defaultPredicateRegistry,
 		navigationGuards: require_navigationGuards.defaultNavigationGuardRegistry,
 		workflowIds: require_constants.HDL_WORKFLOW_IDS
 	});
@@ -55,7 +55,7 @@ function createHDLKioskWorkflowSession(entry, host, options = {}) {
 	const transitionRunner = require_domainTransitionRunner.createHDLKioskTransitionRunner({
 		host,
 		coordinator,
-		guards: require_guards.defaultGuardRegistry
+		predicates: require_predicates.defaultPredicateRegistry
 	});
 	const workflowActor = require_actor.createWorkflowActor({
 		definition,

package/lib/components/HDLKiosk/runtime/domainTransitionRunner.js

@@ -13,8 +13,8 @@ function createDomainWorkflowError(code, recovery = "staff", cause) {
 		cause
 	};
 }
-function createHDLKioskTransitionRunner({ host, coordinator, guards, now = Date.now }) {
-	const emitError = (error, workflowId, stepId, outcome) => {
+function createHDLKioskTransitionRunner({ host, coordinator, predicates, now = Date.now }) {
+	const emitError = (error, workflowId, stepId, intent) => {
 		try {
 			host.telemetry.emit({
 				name: "hdlKiosk.error.reported",
@@ -26,7 +26,7 @@ function createHDLKioskTransitionRunner({ host, coordinator, guards, now = Date.
 					recovery: error.recovery,
 					workflowId,
 					nodeId: stepId,
-					outcome
+					intent
 				}
 			});
 		} catch (_unused) {}
@@ -35,14 +35,14 @@ function createHDLKioskTransitionRunner({ host, coordinator, guards, now = Date.
 		run: function() {
 			var _ref = require_asyncToGenerator._asyncToGenerator(function* ({ workflowId, sessionEpoch, stepId, context, event, transition, executionId }) {
 				const exitPolicy = transition.exitPolicy;
-				if (exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.guard) try {
-					if (!guards.evaluate(exitPolicy.guard, {
+				if (exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.precondition) try {
+					if (!predicates.evaluate(exitPolicy.precondition, {
 						workflow: context,
 						sales: host.sales.getObservedSnapshot()
 					})) return { status: "stay" };
 				} catch (cause) {
-					const error = createDomainWorkflowError("workflowGuardEvaluationFailed", "staff", cause);
-					emitError(error, workflowId, stepId, event.outcome);
+					const error = createDomainWorkflowError("workflowPredicateEvaluationFailed", "staff", cause);
+					emitError(error, workflowId, stepId, event.intent);
 					return {
 						status: "blocked",
 						lastError: error
@@ -50,7 +50,7 @@ function createHDLKioskTransitionRunner({ host, coordinator, guards, now = Date.
 				}
 				const operationInput = "operationInput" in event ? event.operationInput : void 0;
 				const command = exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.command;
-				if (!command || command.when === "inputPresent" && operationInput == null) return { status: "advance" };
+				if (!command) return { status: "advance" };
 				const result = yield coordinator.execute(command.id, {
 					operationId: executionId,
 					intentId: event.intentId,
@@ -59,7 +59,7 @@ function createHDLKioskTransitionRunner({ host, coordinator, guards, now = Date.
 				});
 				if (coordinator.currentSessionEpoch() !== sessionEpoch) {
 					const error = createDomainWorkflowError("workflowSessionStale");
-					emitError(error, workflowId, stepId, event.outcome);
+					emitError(error, workflowId, stepId, event.intent);
 					return {
 						status: "blocked",
 						lastError: error

package/lib/components/HDLKiosk/runtime/workflowEvent.js

@@ -4,11 +4,16 @@ const require_objectWithoutProperties = require("../../../_virtual/_@oxc-project
 const _excluded = ["kind"];
 function createWorkflowEvent(action, currentActivity, stepId, intentId) {
 	if (action.activityId !== currentActivity) return void 0;
-	const { kind: _kind } = action, outcome = require_objectWithoutProperties._objectWithoutProperties(action, _excluded);
-	return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
-		type: "ACTIVITY_OUTCOME",
+	const { kind: _kind } = action, payload = require_objectWithoutProperties._objectWithoutProperties(action, _excluded);
+	return action.kind === "navigation" ? {
+		type: "NAVIGATE_BACK",
+		stepId,
+		activityId: action.activityId,
+		intentId
+	} : require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
+		type: "ACTIVITY_INTENT",
 		stepId
-	}, outcome), {}, { intentId });
+	}, payload), {}, { intentId });
 }
 //#endregion
 exports.createWorkflowEvent = createWorkflowEvent;

package/lib/components/HDLKiosk/runtime/workflowLifecycle.js

@@ -13,7 +13,7 @@ function createHDLKioskWorkflowLifecycle(host, now = Date.now) {
 							workflowId: snapshot.workflowId,
 							from: fromStepId,
 							to: snapshot.nodeId,
-							outcome: event.outcome
+							intent: event.intent
 						}
 					});
 				} catch (_unused) {}
@@ -22,7 +22,7 @@ function createHDLKioskWorkflowLifecycle(host, now = Date.now) {
 				return _ref.apply(this, arguments);
 			};
 		}(),
-		runtimeError: ({ stepId, outcome, error }) => {
+		runtimeError: ({ stepId, intent, error }) => {
 			try {
 				host.telemetry.emit({
 					name: "hdlKiosk.error.reported",
@@ -33,7 +33,7 @@ function createHDLKioskWorkflowLifecycle(host, now = Date.now) {
 						source: error.source,
 						recovery: error.recovery,
 						nodeId: stepId,
-						outcome
+						intent
 					}
 				});
 			} catch (_unused2) {}

package/lib/components/HDLKiosk/slices/catalog/PrimaryProductPromptDialog/index.js

@@ -6,8 +6,7 @@ let _pisell_utils = require("@pisell/utils");
 //#region src/components/HDLKiosk/slices/catalog/PrimaryProductPromptDialog/index.tsx
 /**
 * 文件角色：在 Barcode 商品列表结账前询问是否需要称重麻辣烫主商品。
-* 运行机制：作为 Catalog Activity 的局部 Dialog，Yes/No 由 Catalog 转换为该
-* Activity 的最终 Outcome。
+* 运行机制：由独立 PrimaryProductPrompt Activity 作为 Modal 渲染在 Catalog 上层。
 * 边界：不判断购物车是否已有主商品，不直接接触 Workflow、查询商品或写购物车。
 */
 function BagIcon() {