@pisell/private-materials 6.12.166 → 6.12.167

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

@@ -4,8 +4,7 @@ const require_index = require("../../../../../plus/productSelect/ProductCard/ind
 const require_List = require("../../../../list/List.js");
 const require_index$1 = require("../../../../bigSale/components/KioskCategorySidebar/index.js");
 const require_index$2 = require("../../../components/shell/HDLKioskBottomBarHost/index.js");
-const require_index$3 = require("../PrimaryProductPromptDialog/index.js");
-const require_index$4 = require("../../../components/shell/HDLKioskOrderSummary/index.js");
+const require_index$3 = require("../../../components/shell/HDLKioskOrderSummary/index.js");
 const require_kioskCatalog = require("../../../../../plus/productSelect/ProductCard/presets/kioskCatalog.js");
 const require_model = require("./model.js");
 let react = require("react");
@@ -15,7 +14,7 @@ let _pisell_utils = require("@pisell/utils");
 /**
 * 文件角色：呈现 retail 风格补充商品目录、分类、搜索和加购反馈。
 * 运行机制：只消费已由 Host 筛选/报价的 Catalog Projection；加购走 Screen Command，
-* Back/Checkout 产生 Activity Outcome，购物车开合仅为局部 UI。
+* Checkout 产生 Activity Intent，Back 产生 Navigation，购物车开合仅为局部 UI。
 * 边界：不调用 loadCatalog/queryProducts，不本地追加订单行，也不计算促销价。
 */
 /**
@@ -74,14 +73,13 @@ function PlusIcon() {
 		"aria-hidden": "true"
 	}, /* @__PURE__ */ react.default.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 = (0, react.useMemo)(() => require_model.createHDLCatalogCategories(products, _pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-other")), [_pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-other"), products]);
 	const categoryMenuDataSource = (0, react.useMemo)(() => createCatalogCategoryMenuDataSource(categories), [categories]);
 	const [activeCategoryPath, setActiveCategoryPath] = (0, react.useState)([]);
 	const [query, setQuery] = (0, react.useState)("");
 	const [sidebarSearchOpen, setSidebarSearchOpen] = (0, react.useState)(false);
-	const [primaryProductPromptOpen, setPrimaryProductPromptOpen] = (0, react.useState)(false);
 	const catalogMainRef = (0, react.useRef)(null);
 	const categoryPathBeforeSearchRef = (0, react.useRef)([]);
 	const categoryById = (0, react.useMemo)(() => indexCatalogCategories(categories), [categories]);
@@ -109,38 +107,31 @@ function CatalogScreen({ products, loading, errorReference, errorMessage, busy,
 	const productListItems = (0, react.useMemo)(() => visibleProducts.map(createCatalogProductListItem), [visibleProducts]);
 	const title = normalizedQuery ? _pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-search-results") : (activeCategory === null || activeCategory === void 0 ? void 0 : activeCategory.name) || _pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-title");
 	const completeCatalog = (0, react.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" ? _pisell_utils.locales.getText("pisell2.hdl-kiosk.checkout") : _pisell_utils.locales.getText("pisell2.hdl-kiosk.cart-drawer-next");
+	const primaryActionLabel = _pisell_utils.locales.getText("pisell2.hdl-kiosk.checkout");
 	const { openCart } = require_index$2.useHDLKioskBottomBarController();
 	require_index$2.useHDLKioskBottomBar((0, react.useMemo)(() => ({
 		ariaLabel: _pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-actions-label"),
 		cartEnabled: canReview,
-		overlayActive: primaryProductPromptOpen || sidebarSearchOpen,
+		overlayActive: sidebarSearchOpen,
 		leading: canGoBack ? /* @__PURE__ */ react.default.createElement("button", {
 			type: "button",
 			className: "hdl-floating-bar__button",
 			disabled: busy,
 			onClick: () => send({
-				kind: "outcome",
-				outcome: "back"
+				kind: "navigation",
+				direction: "back"
 			})
 		}, /* @__PURE__ */ react.default.createElement(BackIcon, null), /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.back"))) : void 0,
-		summary: /* @__PURE__ */ react.default.createElement(require_index$4.HDLKioskOrderSummary, {
+		summary: /* @__PURE__ */ react.default.createElement(require_index$3.HDLKioskOrderSummary, {
 			lineCount: orderBar.cartLineCount,
 			totalText: orderBar.totalText,
 			detailText: orderBar.totalText ? _pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-cart-hint") : orderBar.totalLabel,
@@ -178,10 +169,8 @@ function CatalogScreen({ products, loading, errorReference, errorMessage, busy,
 		canReview,
 		openCart,
 		orderBar,
-		primaryProductPromptOpen,
 		sidebarSearchOpen,
 		primaryActionLabel,
-		primaryAction,
 		completeCatalog,
 		send
 	]));
@@ -272,23 +261,7 @@ function CatalogScreen({ products, loading, errorReference, errorMessage, busy,
 				})
 			});
 		}
-	}))))), primaryProductPromptOpen ? /* @__PURE__ */ react.default.createElement(require_index$3.PrimaryProductPromptDialog, {
-		busy,
-		onDecline: () => {
-			setPrimaryProductPromptOpen(false);
-			send({
-				kind: "outcome",
-				outcome: "completed"
-			});
-		},
-		onAccept: () => {
-			setPrimaryProductPromptOpen(false);
-			send({
-				kind: "outcome",
-				outcome: "primaryProductRequested"
-			});
-		}
-	}) : null);
+	}))))));
 }
 //#endregion
 exports.CatalogScreen = CatalogScreen;

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

@@ -1,10 +1,6 @@
 const require_objectSpread2 = require("../../../../../_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);
 }
@@ -77,4 +73,3 @@ function filterHDLCatalogProducts(products, input) {
 //#endregion
 exports.createHDLCatalogCategories = createHDLCatalogCategories;
 exports.filterHDLCatalogProducts = filterHDLCatalogProducts;
-exports.resolveCatalogPrimaryAction = resolveCatalogPrimaryAction;

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

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

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

@@ -1,7 +1,7 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
+const require_selectors = require("../../kernel/workflow/selectors.js");
 const require_utils = require("../../utils.js");
-const require_model = require("./Screen/model.js");
 const require_index = require("./Screen/index.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
@@ -16,8 +16,8 @@ function createCatalogOrderBarModel(sales) {
 	}, {});
 	return Object.freeze(require_objectSpread2._objectSpread2(require_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 = require_utils.resolveHDLKioskErrorPresentation({
 		error: (_commandState$error = commandState.error) !== null && _commandState$error !== void 0 ? _commandState$error : snapshot.lastError,
 		reference: catalog.errorReference,
@@ -30,9 +30,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: require_model.resolveCatalogPrimaryAction(node.activity),
+		canGoBack: require_selectors.canNavigateBack(snapshot),
 		orderBar: createCatalogOrderBarModel(sales),
 		send
 	});

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

@@ -166,7 +166,6 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 	const skuOptionsRef = (0, react.useRef)(null);
 	const hydratedDraftKeyRef = (0, react.useRef)();
 	const [skuValue, setSkuValue] = (0, react.useState)(() => initialSkuValue(product));
-	console.log("xxxxxxxxx", product, skuValue);
 	const productFacts = (0, react.useMemo)(() => product ? require_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 : "",
@@ -215,8 +214,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,
@@ -247,11 +246,10 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 	]);
 	const skipPrimaryProduct = (0, react.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 } = require_index.useHDLKioskBottomBarController();
@@ -263,8 +261,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.default.createElement(BackIcon, null), /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.back"))) : void 0,
 		summary: /* @__PURE__ */ react.default.createElement(require_index$1.HDLKioskOrderSummary, {

package/lib/components/HDLKiosk/slices/customization/operation.js

@@ -13,6 +13,25 @@ decimal_js = require_runtime.__toESM(decimal_js);
 * SkuValue 和“新增或原行发生变化”的最小 receipt/Projection 事实。
 * 边界：页面输入变化不调用本 Operation；OS 内部的加购弹窗与业务判断不属于 HDLKiosk。
 */
+const productRemovePrimaryProductOperation = require_types.defineOperation({
+	id: "product.removePrimaryProduct",
+	conflictScope: "cart",
+	timeoutMs: 15e3,
+	retry: "explicit-user",
+	execute: function() {
+		var _ref = require_asyncToGenerator._asyncToGenerator(function* (context, input, signal) {
+			if (!input.lineId) return {
+				status: "succeeded",
+				data: {}
+			};
+			const mutation = yield context.host.sales.removeLine({ lineId: input.lineId }, signal);
+			return require_cartConsistency.finalizeCartMutation(context, mutation, signal, () => mutation.status === "succeeded" && mutation.data.removedLineId === input.lineId || !context.host.sales.getObservedSnapshot().cart.lines.some((item) => item.lineId === input.lineId));
+		});
+		return function execute(_x, _x2, _x3) {
+			return _ref.apply(this, arguments);
+		};
+	}()
+});
 function hasValidSkuValue(input) {
 	const canonical = require_canonicalSkuValue.canonicalizeSkuValue(input.skuValue);
 	return Boolean(input.productId && canonical && canonical.productId === input.productId);
@@ -31,7 +50,7 @@ const productSyncPrimaryWeightedProductOperation = require_types.defineOperation
 	conflictScope: "cart",
 	retry: "explicit-user",
 	execute: function() {
-		var _ref = require_asyncToGenerator._asyncToGenerator(function* (context, input, signal) {
+		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (context, input, signal) {
 			if (!hasValidSkuValue(input)) return require_errors.operationFailed("customizationInputInvalid", "back");
 			const beforeLines = new Map(context.host.sales.getObservedSnapshot().cart.lines.map((line) => [line.lineId, line.quantity]));
 			const before = context.host.sales.getObservedSnapshot();
@@ -54,10 +73,11 @@ const productSyncPrimaryWeightedProductOperation = require_types.defineOperation
 				return Boolean(confirmedLine && confirmedLine.productId === input.productId && (!(successfulOutcome === null || successfulOutcome === void 0 ? void 0 : successfulOutcome.affectedLineId) || confirmedLine.lineId === successfulOutcome.affectedLineId) && (!input.existingLineId || (successfulOutcome === null || successfulOutcome === void 0 ? void 0 : successfulOutcome.affectedLineId) === input.existingLineId && confirmedLine.lineId === input.existingLineId) && sameWeight(confirmedLine.quantity, input.measurement.netWeightKg) && sameSkuValue(input.skuValue, confirmedLine.skuValue) && (Boolean(input.existingLineId) || !beforeLines.has(confirmedLine.lineId) || beforeLines.get(confirmedLine.lineId) !== confirmedLine.quantity)) || projectionMatches;
 			});
 		});
-		return function execute(_x, _x2, _x3) {
-			return _ref.apply(this, arguments);
+		return function execute(_x4, _x5, _x6) {
+			return _ref2.apply(this, arguments);
 		};
 	}()
 });
 //#endregion
+exports.productRemovePrimaryProductOperation = productRemovePrimaryProductOperation;
 exports.productSyncPrimaryWeightedProductOperation = productSyncPrimaryWeightedProductOperation;

package/lib/components/HDLKiosk/slices/customization/slice.js

@@ -7,13 +7,9 @@ const customizationSlice = require_defineSlice.defineSlice({
 	id: "customization",
 	screen: { id: "customization" },
 	commands: { removePrimaryProduct: require_cart.cartRemoveLineOperation },
-	outcomes: {
-		completed: require_defineSlice.effect(require_operation.productSyncPrimaryWeightedProductOperation, { navigate: "next" }),
-		skipped: require_defineSlice.effect(require_cart.cartRemoveLineOperation, {
-			when: "inputPresent",
-			navigate: "next"
-		}),
-		back: require_defineSlice.back()
+	intents: {
+		complete: require_defineSlice.effect(require_operation.productSyncPrimaryWeightedProductOperation, { navigate: "next" }),
+		skip: require_defineSlice.effect(require_operation.productRemovePrimaryProductOperation, { navigate: "next" })
 	}
 });
 //#endregion

package/lib/components/HDLKiosk/slices/customization/view.js

@@ -1,4 +1,5 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
+const require_selectors = require("../../kernel/workflow/selectors.js");
 const require_utils = require("../../utils.js");
 const require_index = require("./Screen/index.js");
 let react = require("react");
@@ -18,7 +19,7 @@ function createCustomizationOrderBarModel(sales, primaryProductId) {
 		}))[0] : void 0
 	});
 }
-const renderCustomization = ({ node, snapshot, viewSnapshot, sales, commandState, customization, scaleMinimumWeightKg, send }) => {
+const renderCustomization = ({ snapshot, viewSnapshot, sales, commandState, customization, scaleMinimumWeightKg, send }) => {
 	var _snapshot$activeOpera, _commandState$error, _customization$produc;
 	const syncing = snapshot.status === "running" && ((_snapshot$activeOpera = snapshot.activeOperation) === null || _snapshot$activeOpera === void 0 ? void 0 : _snapshot$activeOpera.definitionId) === "product.syncPrimaryWeightedProduct";
 	const error = require_utils.resolveHDLKioskErrorPresentation({
@@ -33,7 +34,7 @@ const renderCustomization = ({ node, snapshot, viewSnapshot, sales, commandState
 		errorMessage: error === null || error === void 0 ? void 0 : error.message,
 		busy: viewSnapshot.status === "running" && !syncing,
 		syncing,
-		canGoBack: Boolean(node.on.back),
+		canGoBack: require_selectors.canNavigateBack(snapshot),
 		minimumWeightKg: scaleMinimumWeightKg,
 		orderBar: createCustomizationOrderBarModel(sales, ((_customization$produc = customization.product) === null || _customization$produc === void 0 ? void 0 : _customization$produc.id) == null ? void 0 : String(customization.product.id)),
 		send

package/lib/components/HDLKiosk/slices/fulfillment/Screen/index.js

@@ -188,8 +188,8 @@ function FulfillmentScreen({ model, orderBar, send }) {
 			className: "hdl-floating-bar__button",
 			disabled: model.busy,
 			onClick: () => send({
-				kind: "outcome",
-				outcome: "back"
+				kind: "navigation",
+				direction: "back"
 			})
 		}, /* @__PURE__ */ react.default.createElement(BackIcon, null), /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.back"))) : void 0,
 		summary: /* @__PURE__ */ react.default.createElement(require_index$1.HDLKioskOrderSummary, {
@@ -225,8 +225,8 @@ function FulfillmentScreen({ model, orderBar, send }) {
 		className: "hdl-fulfillment-card",
 		disabled: model.busy,
 		onClick: () => send({
-			kind: "outcome",
-			outcome: "completed",
+			kind: "intent",
+			intent: "complete",
 			contextPatch: { fulfillment: "dine_in" },
 			operationInput: { mode: "dine_in" }
 		})
@@ -235,8 +235,8 @@ function FulfillmentScreen({ model, orderBar, send }) {
 		className: "hdl-fulfillment-card",
 		disabled: model.busy,
 		onClick: () => send({
-			kind: "outcome",
-			outcome: "completed",
+			kind: "intent",
+			intent: "complete",
 			contextPatch: { fulfillment: "takeaway" },
 			operationInput: { mode: "takeaway" }
 		})

package/lib/components/HDLKiosk/slices/fulfillment/slice.js

@@ -5,13 +5,10 @@ const require_fulfillment = require("../../app/operations/fulfillment.js");
 const fulfillmentSlice = require_defineSlice.defineSlice({
 	id: "fulfillment",
 	screen: { id: "fulfillment" },
-	outcomes: {
-		completed: require_defineSlice.effect(require_fulfillment.setFulfillmentOperation, {
-			guard: "fulfillment.selected",
-			navigate: "next"
-		}),
-		back: require_defineSlice.back()
-	}
+	intents: { complete: require_defineSlice.effect(require_fulfillment.setFulfillmentOperation, {
+		precondition: "fulfillment.selected",
+		navigate: "next"
+	}) }
 });
 //#endregion
 exports.fulfillmentSlice = fulfillmentSlice;

package/lib/components/HDLKiosk/slices/identity/Screen/index.js

@@ -10,21 +10,26 @@ const QR_CELLS = Object.freeze(Array.from({ length: 49 }, (_, index) => index *
 * Quick Order 的前置会员提示页。
 *
 * 宿主可注入认证 UI；未注入时保留 QR / SMS 视觉 fallback。Skip 继续产生
-* identity.skipped Outcome，由本地 Exit Policy 同步访客后进入下一步。
+* identity.skip Intent，由本地 Exit Policy 同步访客后进入下一步。
 */
 function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
+	const [authBusy, setAuthBusy] = (0, react.useState)(false);
+	const busy = model.busy || authBusy;
+	const handleAuthBusyChange = (0, react.useCallback)((nextBusy) => {
+		setAuthBusy(nextBusy);
+	}, []);
 	const hasOrder = Boolean(orderBar && orderBar.cartLineCount > 0);
 	const { openCart } = require_index.useHDLKioskBottomBarController();
 	require_index.useHDLKioskBottomBar((0, react.useMemo)(() => ({
 		ariaLabel: _pisell_utils.locales.getText("pisell2.hdl-kiosk.identity-actions-label"),
-		cartEnabled: hasOrder && !model.busy,
+		cartEnabled: hasOrder && !busy,
 		variant: "composed",
 		summary: orderBar ? /* @__PURE__ */ react.default.createElement(require_index$1.HDLKioskOrderSummary, {
 			lineCount: orderBar.cartLineCount,
 			totalText: orderBar.totalText,
 			detailText: orderBar.totalText ? _pisell_utils.locales.getText("pisell2.hdl-kiosk.catalog-cart-hint") : orderBar.totalLabel,
 			cartAriaLabel: _pisell_utils.locales.getText("pisell2.hdl-kiosk.cart-drawer-title"),
-			disabled: model.busy || !hasOrder,
+			disabled: busy || !hasOrder,
 			onOpenCart: openCart
 		}) : void 0,
 		cartOpenBar: hasOrder ? (controller) => ({
@@ -32,7 +37,7 @@ function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 			leading: /* @__PURE__ */ react.default.createElement("button", {
 				type: "button",
 				className: "hdl-floating-bar__button",
-				disabled: model.busy,
+				disabled: busy,
 				onClick: controller.onClose
 			}, /* @__PURE__ */ react.default.createElement("svg", {
 				viewBox: "0 0 24 24",
@@ -40,17 +45,18 @@ function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 			}, /* @__PURE__ */ react.default.createElement("path", { d: "m15 5-7 7 7 7M8 12h10" })), /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.back")))
 		}) : void 0
 	}), [
+		busy,
 		hasOrder,
-		model.busy,
 		openCart,
 		orderBar
 	]));
 	const authContent = renderIdentityAuth === null || renderIdentityAuth === void 0 ? void 0 : renderIdentityAuth({
-		busy: model.busy,
+		busy,
 		disabled: model.busy,
+		onBusyChange: handleAuthBusyChange,
 		onAuthenticated: (customerId) => send({
-			kind: "outcome",
-			outcome: "memberRecognized",
+			kind: "intent",
+			intent: "complete",
 			operationInput: { customerId }
 		})
 	});
@@ -73,10 +79,10 @@ function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.login-via-sms"))), /* @__PURE__ */ react.default.createElement("button", {
 		type: "button",
 		className: "hdl-identity-screen__skip",
-		disabled: model.busy,
+		disabled: busy,
 		onClick: () => send({
-			kind: "outcome",
-			outcome: "skipped",
+			kind: "intent",
+			intent: "skip",
 			operationInput: {}
 		})
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.skip")), model.errorReference ? /* @__PURE__ */ react.default.createElement("div", {

package/lib/components/HDLKiosk/slices/identity/slice.js

@@ -1,20 +1,13 @@
 const require_defineSlice = require("../../kernel/application/defineSlice.js");
 const require_operation = require("./operation.js");
 //#region src/components/HDLKiosk/slices/identity/slice.ts
-/** Identity Slice：声明身份节点的 Outcome 与客户同步 Effect；不依赖 React 或 Host 实现。 */
+/** Identity Slice：声明身份节点的 Intent 与客户同步 Effect；不依赖 React 或 Host 实现。 */
 const identitySlice = require_defineSlice.defineSlice({
 	id: "identity",
 	screen: { id: "identity" },
-	guards: { beforeEnter: ({ to, completedStepIds, sales }) => {
-		var _sales$customer;
-		return !completedStepIds.includes(to.stepId) && ((_sales$customer = sales.customer) === null || _sales$customer === void 0 ? void 0 : _sales$customer.member) !== true ? { type: "allow" } : { type: "skip" };
-	} },
-	outcomes: {
-		memberRecognized: require_defineSlice.effect(require_operation.identitySyncOperation, {
-			when: "inputPresent",
-			navigate: "next"
-		}),
-		skipped: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" })
+	intents: {
+		complete: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" }),
+		skip: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" })
 	}
 });
 //#endregion

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

@@ -3,13 +3,14 @@ const require_slice$1 = require("./customization/slice.js");
 const require_slice$2 = require("./fulfillment/slice.js");
 const require_slice$3 = require("./identity/slice.js");
 const require_slice$4 = require("./payment/slice.js");
+const require_slice$5 = require("./primaryProductPrompt/slice.js");
 //#region src/components/HDLKiosk/slices/index.ts
 const hdlKioskSlices = Object.freeze([
 	require_slice$3.identitySlice,
 	require_slice$2.fulfillmentSlice,
 	require_slice$1.customizationSlice,
 	require_slice.catalogSlice,
-	require_slice.catalogWithPrimaryProductPromptSlice,
+	require_slice$5.primaryProductPromptSlice,
 	require_slice$4.paymentMethodSlice,
 	require_slice$4.paymentCompletedSlice
 ]);

package/lib/components/HDLKiosk/slices/payment/Screen/index.js

@@ -44,8 +44,8 @@ function PaymentMethodIcon({ code, type }) {
 function CheckoutScreen({ model, orderBar, send }) {
 	var _model$paymentFeedbac;
 	const goBack = (0, react.useCallback)(() => send({
-		kind: "outcome",
-		outcome: "back"
+		kind: "navigation",
+		direction: "back"
 	}), [send]);
 	const hasOrder = Boolean(orderBar && orderBar.cartLineCount > 0);
 	const cartMutable = hasOrder && model.canLeavePayment;
@@ -176,9 +176,9 @@ function CheckoutScreen({ model, orderBar, send }) {
 				dismissCurrentFeedback();
 				if (eftpos) {
 					send({
-						kind: "outcome",
-						outcome: "eftposSelected",
-						operationInput: { paymentMethodId: method.id }
+						kind: "command",
+						command: "checkout.payEftpos",
+						input: { paymentMethodId: method.id }
 					});
 					return;
 				}

package/lib/components/HDLKiosk/slices/payment/slice.js

@@ -5,18 +5,17 @@ const require_checkout = require("../../app/operations/checkout.js");
 const paymentMethodSlice = require_defineSlice.defineSlice({
 	id: "paymentMethod",
 	screen: { id: "checkout" },
-	commands: { requestStaffPaymentApproval: require_checkout.checkoutRequestStaffPaymentApprovalOperation },
-	outcomes: {
-		eftposSelected: require_defineSlice.effect(require_checkout.checkoutPayEftposOperation),
-		confirmed: require_defineSlice.guard("payment.succeeded", { navigate: "next" }),
-		back: require_defineSlice.back()
-	}
+	commands: {
+		payEftpos: require_checkout.checkoutPayEftposOperation,
+		requestStaffPaymentApproval: require_checkout.checkoutRequestStaffPaymentApprovalOperation
+	},
+	intents: { complete: require_defineSlice.intentPrecondition("payment.succeeded", { navigate: "next" }) }
 });
 /** 支付完成仍复用 Checkout Screen，仅作为 Workflow 的成功终态。 */
 const paymentCompletedSlice = require_defineSlice.defineSlice({
 	id: "paymentCompleted",
 	screen: { id: "checkout" },
-	outcomes: {}
+	intents: {}
 });
 //#endregion
 exports.paymentCompletedSlice = paymentCompletedSlice;

package/lib/components/HDLKiosk/slices/primaryProductPrompt/slice.js

@@ -0,0 +1,14 @@
+const require_defineSlice = require("../../kernel/application/defineSlice.js");
+//#region src/components/HDLKiosk/slices/primaryProductPrompt/slice.ts
+/** 主商品询问 Slice：只表达是否进入称重定制，不承担 Catalog 页面职责。 */
+const primaryProductPromptSlice = require_defineSlice.defineSlice({
+	id: "primaryProductPrompt",
+	screen: { id: "primaryProductPrompt" },
+	presentation: "modal",
+	intents: {
+		complete: require_defineSlice.intentPrecondition("cart.notEmpty", { navigate: "next" }),
+		skip: require_defineSlice.intentPrecondition("cart.notEmpty")
+	}
+});
+//#endregion
+exports.primaryProductPromptSlice = primaryProductPromptSlice;

package/lib/components/HDLKiosk/slices/primaryProductPrompt/view.js

@@ -0,0 +1,25 @@
+const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
+const require_index = require("../catalog/PrimaryProductPromptDialog/index.js");
+let react = require("react");
+react = require_runtime.__toESM(react);
+//#region src/components/HDLKiosk/slices/primaryProductPrompt/view.tsx
+/** 主商品询问展示：将用户选择转换为标准 completed/skipped 结果。 */
+function PrimaryProductPromptView({ busy, send }) {
+	return /* @__PURE__ */ react.default.createElement(require_index.PrimaryProductPromptDialog, {
+		busy,
+		onDecline: () => send({
+			kind: "intent",
+			intent: "skip"
+		}),
+		onAccept: () => send({
+			kind: "intent",
+			intent: "complete"
+		})
+	});
+}
+const renderPrimaryProductPrompt = ({ viewSnapshot, bindActivity }) => /* @__PURE__ */ react.default.createElement(PrimaryProductPromptView, {
+	busy: viewSnapshot.status === "running",
+	send: bindActivity("primaryProductPrompt")
+});
+//#endregion
+exports.renderPrimaryProductPrompt = renderPrimaryProductPrompt;

package/lib/components/HDLKiosk/utils.js

@@ -1,4 +1,5 @@
 require("../../_virtual/_rolldown/runtime.js");
+const require_selectors = require("./kernel/workflow/selectors.js");
 let _pisell_utils = require("@pisell/utils");
 //#region src/components/HDLKiosk/utils.ts
 function fallbackErrorMessage(surface) {
@@ -95,8 +96,8 @@ function createActivityScreenModel(screenId, snapshot, node, sales, businessMode
 		title,
 		description,
 		busy: snapshot.status === "running",
-		canContinue: snapshot.status === "idle" && canReviewCatalog && !placeholderBlocked && Boolean(node.on.completed || node.on.detected),
-		canGoBack: snapshot.status === "idle" && Boolean(node.on.back),
+		canContinue: snapshot.status === "idle" && canReviewCatalog && !placeholderBlocked && Boolean(node.on.complete),
+		canGoBack: snapshot.status === "idle" && require_selectors.canNavigateBack(snapshot),
 		placeholder,
 		placeholderBlocked,
 		errorMessage: error === null || error === void 0 ? void 0 : error.message,