@pisell/private-materials 6.12.166 → 6.12.167

package/es/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/es/components/HDLKiosk/kernel/workflow/selectors.js

@@ -0,0 +1,9 @@
+//#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
+export { canNavigateBack, canReopenWorkflowStep };

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

@@ -1,6 +1,7 @@
 import { _asyncToGenerator } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import { useHDLKioskCustomerController } from "./controllers/useHDLKioskCustomerController.js";
 import { useHDLKioskScreenData } from "./controllers/useHDLKioskScreenData.js";
+import { canReopenWorkflowStep } from "../kernel/workflow/selectors.js";
 import { EndOrderDialog } from "../components/overlays/EndOrderDialog/index.js";
 import { HDLKioskHeader } from "../components/shell/HDLKioskHeader/index.js";
 import { CartDrawer } from "../components/overlays/CartDrawer/index.js";
@@ -65,7 +66,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 = useCallback(_asyncToGenerator(function* () {
 		if (resetInFlight.current) return;
@@ -143,8 +144,8 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 	]);
 	const { catalog, customization, payment } = useHDLKioskScreenData({
 		host,
-		currentScreenId,
-		activity: screenDataActivity,
+		currentScreenId: screenDataNode.screenId,
+		activity: screenDataNode.activity,
 		isActive,
 		primaryWeightedProductId: config.primaryWeightedProductId
 	});
@@ -161,7 +162,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 = createWorkflowEvent(action, activeNode.activity, snapshot.nodeId, intentId);
 			if (event) session.actor.send(event);
 			return;
@@ -191,9 +192,9 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 	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,
@@ -271,7 +272,7 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 		memberAction,
 		send,
 		renderCartContent,
-		onEditPrimaryProduct: customizationStepId && config.primaryWeightedProductId ? editPrimaryProduct : void 0
+		onEditPrimaryProduct: customizationStepId && config.primaryWeightedProductId && canReopenWorkflowStep(snapshot, customizationStepId) ? editPrimaryProduct : void 0
 	}), endOrderConfirmationOpen ? /* @__PURE__ */ React.createElement(EndOrderDialog, {
 		onCancel: cancelEndOrder,
 		onConfirm: confirmEndOrder

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

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

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

@@ -2,7 +2,7 @@ import { _asyncToGenerator } from "../../../_virtual/_@oxc-project_runtime@0.122
 import { createOperationCoordinator } from "../app/operations/coordinator.js";
 import { createHDLKioskOperationRegistry } from "../app/manifest.js";
 import { defaultActivityRegistry, getBuiltInWorkflowDefinition } from "../app/workflow/registry.js";
-import { defaultGuardRegistry } from "../app/workflow/guards.js";
+import { defaultPredicateRegistry } from "../app/workflow/predicates.js";
 import { createHDLKioskBeforeEachGuard, defaultNavigationGuardRegistry } from "../app/workflow/navigationGuards.js";
 import { validateHDLKioskWorkflowPolicy } from "../app/workflow/policy.js";
 import { HDL_WORKFLOW_IDS } from "../app/constants.js";
@@ -26,7 +26,7 @@ function createHDLKioskWorkflowSession(entry, host, options = {}) {
 	const structuralCompilation = compileWorkflowStructure(getBuiltInWorkflowDefinition(entry), {
 		operations,
 		activities: defaultActivityRegistry,
-		guards: defaultGuardRegistry,
+		predicates: defaultPredicateRegistry,
 		navigationGuards: defaultNavigationGuardRegistry,
 		workflowIds: HDL_WORKFLOW_IDS
 	});
@@ -54,7 +54,7 @@ function createHDLKioskWorkflowSession(entry, host, options = {}) {
 	const transitionRunner = createHDLKioskTransitionRunner({
 		host,
 		coordinator,
-		guards: defaultGuardRegistry
+		predicates: defaultPredicateRegistry
 	});
 	const workflowActor = createWorkflowActor({
 		definition,

package/es/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 = _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/es/components/HDLKiosk/runtime/workflowEvent.js

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

package/es/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/es/components/HDLKiosk/slices/catalog/PrimaryProductPromptDialog/index.js

@@ -4,8 +4,7 @@ import { locales } from "@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() {

package/es/components/HDLKiosk/slices/catalog/Screen/index.js

@@ -3,7 +3,6 @@ import ProductCard from "../../../../../plus/productSelect/ProductCard/index.js"
 import List_default from "../../../../list/List.js";
 import KioskCategorySidebar from "../../../../bigSale/components/KioskCategorySidebar/index.js";
 import { useHDLKioskBottomBar, useHDLKioskBottomBarController } from "../../../components/shell/HDLKioskBottomBarHost/index.js";
-import { PrimaryProductPromptDialog } from "../PrimaryProductPromptDialog/index.js";
 import { HDLKioskOrderSummary } from "../../../components/shell/HDLKioskOrderSummary/index.js";
 import { KIOSK_CATALOG_PRODUCT_CARD_CLASS_NAME, createKioskCatalogProductCardConfig } from "../../../../../plus/productSelect/ProductCard/presets/kioskCatalog.js";
 import { createHDLCatalogCategories, filterHDLCatalogProducts } from "./model.js";
@@ -13,7 +12,7 @@ import { locales } from "@pisell/utils";
 /**
 * 文件角色：呈现 retail 风格补充商品目录、分类、搜索和加购反馈。
 * 运行机制：只消费已由 Host 筛选/报价的 Catalog Projection；加购走 Screen Command，
-* Back/Checkout 产生 Activity Outcome，购物车开合仅为局部 UI。
+* Checkout 产生 Activity Intent，Back 产生 Navigation，购物车开合仅为局部 UI。
 * 边界：不调用 loadCatalog/queryProducts，不本地追加订单行，也不计算促销价。
 */
 /**
@@ -72,14 +71,13 @@ function PlusIcon() {
 		"aria-hidden": "true"
 	}, /* @__PURE__ */ React.createElement("path", { d: "M12 5v14M5 12h14" }));
 }
-function CatalogScreen({ products, loading, errorReference, errorMessage, busy, canReview, canGoBack, promptForPrimaryProduct = false, primaryAction = "checkout", orderBar, send }) {
+function CatalogScreen({ products, loading, errorReference, errorMessage, busy, canReview, canGoBack, orderBar, send }) {
 	var _categoryById$get;
 	const categories = useMemo(() => createHDLCatalogCategories(products, locales.getText("pisell2.hdl-kiosk.catalog-other")), [locales.getText("pisell2.hdl-kiosk.catalog-other"), products]);
 	const categoryMenuDataSource = useMemo(() => createCatalogCategoryMenuDataSource(categories), [categories]);
 	const [activeCategoryPath, setActiveCategoryPath] = useState([]);
 	const [query, setQuery] = useState("");
 	const [sidebarSearchOpen, setSidebarSearchOpen] = useState(false);
-	const [primaryProductPromptOpen, setPrimaryProductPromptOpen] = useState(false);
 	const catalogMainRef = useRef(null);
 	const categoryPathBeforeSearchRef = useRef([]);
 	const categoryById = useMemo(() => indexCatalogCategories(categories), [categories]);
@@ -107,35 +105,28 @@ function CatalogScreen({ products, loading, errorReference, errorMessage, busy,
 	const productListItems = useMemo(() => visibleProducts.map(createCatalogProductListItem), [visibleProducts]);
 	const title = normalizedQuery ? locales.getText("pisell2.hdl-kiosk.catalog-search-results") : (activeCategory === null || activeCategory === void 0 ? void 0 : activeCategory.name) || locales.getText("pisell2.hdl-kiosk.catalog-title");
 	const completeCatalog = useCallback(() => {
-		if (!busy && canReview) {
-			if (promptForPrimaryProduct) {
-				setPrimaryProductPromptOpen(true);
-				return;
-			}
-			send({
-				kind: "outcome",
-				outcome: "completed"
-			});
-		}
+		if (!busy && canReview) send({
+			kind: "intent",
+			intent: "complete"
+		});
 	}, [
 		busy,
 		canReview,
-		promptForPrimaryProduct,
 		send
 	]);
-	const primaryActionLabel = primaryAction === "checkout" ? locales.getText("pisell2.hdl-kiosk.checkout") : locales.getText("pisell2.hdl-kiosk.cart-drawer-next");
+	const primaryActionLabel = locales.getText("pisell2.hdl-kiosk.checkout");
 	const { openCart } = useHDLKioskBottomBarController();
 	useHDLKioskBottomBar(useMemo(() => ({
 		ariaLabel: locales.getText("pisell2.hdl-kiosk.catalog-actions-label"),
 		cartEnabled: canReview,
-		overlayActive: primaryProductPromptOpen || sidebarSearchOpen,
+		overlayActive: sidebarSearchOpen,
 		leading: canGoBack ? /* @__PURE__ */ React.createElement("button", {
 			type: "button",
 			className: "hdl-floating-bar__button",
 			disabled: busy,
 			onClick: () => send({
-				kind: "outcome",
-				outcome: "back"
+				kind: "navigation",
+				direction: "back"
 			})
 		}, /* @__PURE__ */ React.createElement(BackIcon, null), /* @__PURE__ */ React.createElement("span", null, locales.getText("pisell2.hdl-kiosk.back"))) : void 0,
 		summary: /* @__PURE__ */ React.createElement(HDLKioskOrderSummary, {
@@ -176,10 +167,8 @@ function CatalogScreen({ products, loading, errorReference, errorMessage, busy,
 		canReview,
 		openCart,
 		orderBar,
-		primaryProductPromptOpen,
 		sidebarSearchOpen,
 		primaryActionLabel,
-		primaryAction,
 		completeCatalog,
 		send
 	]));
@@ -270,23 +259,7 @@ function CatalogScreen({ products, loading, errorReference, errorMessage, busy,
 				})
 			});
 		}
-	}))))), primaryProductPromptOpen ? /* @__PURE__ */ React.createElement(PrimaryProductPromptDialog, {
-		busy,
-		onDecline: () => {
-			setPrimaryProductPromptOpen(false);
-			send({
-				kind: "outcome",
-				outcome: "completed"
-			});
-		},
-		onAccept: () => {
-			setPrimaryProductPromptOpen(false);
-			send({
-				kind: "outcome",
-				outcome: "primaryProductRequested"
-			});
-		}
-	}) : null);
+	}))))));
 }
 //#endregion
 export { CatalogScreen };

package/es/components/HDLKiosk/slices/catalog/Screen/model.js

@@ -1,10 +1,6 @@
 import { _objectSpread2 } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 //#region src/components/HDLKiosk/slices/catalog/Screen/model.ts
 const HDL_CATALOG_OTHER_CATEGORY_ID = "__other__";
-/** 扫码目录仍需继续确认主商品；普通目录的商品选择完成后可直接 Checkout。 */
-function resolveCatalogPrimaryAction(activity) {
-	return activity === "catalogWithPrimaryProductPrompt" ? "next" : "checkout";
-}
 function bySortThenName(left, right) {
 	return right.sort - left.sort || left.name.localeCompare(right.name);
 }
@@ -75,4 +71,4 @@ function filterHDLCatalogProducts(products, input) {
 	return candidates;
 }
 //#endregion
-export { createHDLCatalogCategories, filterHDLCatalogProducts, resolveCatalogPrimaryAction };
+export { createHDLCatalogCategories, filterHDLCatalogProducts };

package/es/components/HDLKiosk/slices/catalog/slice.js

@@ -1,24 +1,12 @@
-import { back, defineSlice, guard } from "../../kernel/application/defineSlice.js";
+import { defineSlice, intentPrecondition } from "../../kernel/application/defineSlice.js";
 import { cartAddProductOperation } from "../../app/operations/cart.js";
 //#region src/components/HDLKiosk/slices/catalog/slice.ts
-/** Catalog Slice：声明补充商品加购与主商品询问分支；商品浏览动作不进入 Workflow。 */
+/** Catalog Slice：声明补充商品加购；商品浏览动作不进入 Workflow。 */
 const catalogSlice = defineSlice({
 	id: "catalog",
 	screen: { id: "catalog" },
 	commands: { addProduct: cartAddProductOperation },
-	outcomes: {
-		completed: guard("cart.notEmpty", { navigate: "next" }),
-		back: back()
-	}
-});
-const catalogWithPrimaryProductPromptSlice = defineSlice({
-	id: "catalogWithPrimaryProductPrompt",
-	screen: { id: "catalog" },
-	commands: { addProduct: cartAddProductOperation },
-	outcomes: {
-		completed: guard("cart.notEmpty", { navigate: "next" }),
-		primaryProductRequested: guard("cart.notEmpty", { navigate: "next" })
-	}
+	intents: { complete: intentPrecondition("cart.notEmpty", { navigate: "next" }) }
 });
 //#endregion
-export { catalogSlice, catalogWithPrimaryProductPromptSlice };
+export { catalogSlice };

package/es/components/HDLKiosk/slices/catalog/view.js

@@ -1,6 +1,6 @@
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+import { canNavigateBack } from "../../kernel/workflow/selectors.js";
 import { createOrderBarModel, resolveHDLKioskErrorPresentation } from "../../utils.js";
-import { resolveCatalogPrimaryAction } from "./Screen/model.js";
 import { CatalogScreen } from "./Screen/index.js";
 import React from "react";
 //#region src/components/HDLKiosk/slices/catalog/view.tsx
@@ -14,8 +14,8 @@ function createCatalogOrderBarModel(sales) {
 	}, {});
 	return Object.freeze(_objectSpread2(_objectSpread2({}, order), {}, { quantitiesByProduct: Object.freeze(quantitiesByProduct) }));
 }
-const renderCatalog = ({ node, snapshot, viewSnapshot, sales, commandState, catalog, send }) => {
-	var _commandState$error, _node$on$back;
+const renderCatalog = ({ snapshot, viewSnapshot, sales, commandState, catalog, send }) => {
+	var _commandState$error;
 	const error = resolveHDLKioskErrorPresentation({
 		error: (_commandState$error = commandState.error) !== null && _commandState$error !== void 0 ? _commandState$error : snapshot.lastError,
 		reference: catalog.errorReference,
@@ -28,9 +28,7 @@ const renderCatalog = ({ node, snapshot, viewSnapshot, sales, commandState, cata
 		errorMessage: error === null || error === void 0 ? void 0 : error.message,
 		busy: viewSnapshot.status === "running",
 		canReview: sales.cart.lineCount > 0,
-		canGoBack: Boolean(node.on.back) && ((_node$on$back = node.on.back) === null || _node$on$back === void 0 ? void 0 : _node$on$back.target) !== snapshot.nodeId,
-		promptForPrimaryProduct: node.activity === "catalogWithPrimaryProductPrompt" && !sales.cart.lines.some((line) => line.productId === snapshot.context.primaryWeightedProductId),
-		primaryAction: resolveCatalogPrimaryAction(node.activity),
+		canGoBack: canNavigateBack(snapshot),
 		orderBar: createCatalogOrderBarModel(sales),
 		send
 	});

package/es/components/HDLKiosk/slices/customization/Screen/index.js

@@ -163,7 +163,6 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 	const skuOptionsRef = useRef(null);
 	const hydratedDraftKeyRef = useRef();
 	const [skuValue, setSkuValue] = useState(() => initialSkuValue(product));
-	console.log("xxxxxxxxx", product, skuValue);
 	const productFacts = useMemo(() => product ? resolveHDLWeightedProduct(product) : void 0, [product]);
 	const draftHydrationKey = JSON.stringify([
 		(_productFacts$product = productFacts === null || productFacts === void 0 ? void 0 : productFacts.productId) !== null && _productFacts$product !== void 0 ? _productFacts$product : "",
@@ -212,8 +211,8 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 		}
 		const submittedSkuValue = (_skuOptionsRef$curren2 = (_skuOptionsRef$curren3 = skuOptionsRef.current) === null || _skuOptionsRef$curren3 === void 0 ? void 0 : _skuOptionsRef$curren3.getTransformValues()) !== null && _skuOptionsRef$curren2 !== void 0 ? _skuOptionsRef$curren2 : skuValue;
 		send({
-			kind: "outcome",
-			outcome: "completed",
+			kind: "intent",
+			intent: "complete",
 			operationInput: {
 				productId: productFacts.productId,
 				variantId: productFacts.variantId,
@@ -244,11 +243,10 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 	]);
 	const skipPrimaryProduct = useCallback(() => {
 		var _orderBar$primaryLine10;
-		const lineId = (_orderBar$primaryLine10 = orderBar.primaryLine) === null || _orderBar$primaryLine10 === void 0 ? void 0 : _orderBar$primaryLine10.lineId;
 		send({
-			kind: "outcome",
-			outcome: "skipped",
-			operationInput: lineId ? { lineId } : void 0
+			kind: "intent",
+			intent: "skip",
+			operationInput: { lineId: (_orderBar$primaryLine10 = orderBar.primaryLine) === null || _orderBar$primaryLine10 === void 0 ? void 0 : _orderBar$primaryLine10.lineId }
 		});
 	}, [(_orderBar$primaryLine11 = orderBar.primaryLine) === null || _orderBar$primaryLine11 === void 0 ? void 0 : _orderBar$primaryLine11.lineId, send]);
 	const { openCart } = useHDLKioskBottomBarController();
@@ -260,8 +258,8 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 			className: "hdl-floating-bar__button",
 			disabled: busy || syncing,
 			onClick: () => send({
-				kind: "outcome",
-				outcome: "back"
+				kind: "navigation",
+				direction: "back"
 			})
 		}, /* @__PURE__ */ React.createElement(BackIcon, null), /* @__PURE__ */ React.createElement("span", null, locales.getText("pisell2.hdl-kiosk.back"))) : void 0,
 		summary: /* @__PURE__ */ React.createElement(HDLKioskOrderSummary, {