@pisell/private-materials 6.12.166 → 6.12.168

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

@@ -1,15 +1,16 @@
-import { catalogSlice, catalogWithPrimaryProductPromptSlice } from "./catalog/slice.js";
+import { catalogSlice } from "./catalog/slice.js";
 import { customizationSlice } from "./customization/slice.js";
 import { fulfillmentSlice } from "./fulfillment/slice.js";
 import { identitySlice } from "./identity/slice.js";
 import { paymentCompletedSlice, paymentMethodSlice } from "./payment/slice.js";
+import { primaryProductPromptSlice } from "./primaryProductPrompt/slice.js";
 //#region src/components/HDLKiosk/slices/index.ts
 const hdlKioskSlices = Object.freeze([
 	identitySlice,
 	fulfillmentSlice,
 	customizationSlice,
 	catalogSlice,
-	catalogWithPrimaryProductPromptSlice,
+	primaryProductPromptSlice,
 	paymentMethodSlice,
 	paymentCompletedSlice
 ]);

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

@@ -42,8 +42,8 @@ function PaymentMethodIcon({ code, type }) {
 function CheckoutScreen({ model, orderBar, send }) {
 	var _model$paymentFeedbac;
 	const goBack = useCallback(() => send({
-		kind: "outcome",
-		outcome: "back"
+		kind: "navigation",
+		direction: "back"
 	}), [send]);
 	const hasOrder = Boolean(orderBar && orderBar.cartLineCount > 0);
 	const cartMutable = hasOrder && model.canLeavePayment;
@@ -174,9 +174,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/es/components/HDLKiosk/slices/payment/slice.js

@@ -1,22 +1,21 @@
-import { back, defineSlice, effect, guard } from "../../kernel/application/defineSlice.js";
+import { defineSlice, intentPrecondition } from "../../kernel/application/defineSlice.js";
 import { checkoutPayEftposOperation, checkoutRequestStaffPaymentApprovalOperation } from "../../app/operations/checkout.js";
 //#region src/components/HDLKiosk/slices/payment/slice.ts
 /** Payment Slice：声明卡/现金选择、支付派发与 Host 成功确认；支付不确定不作成功处理。 */
 const paymentMethodSlice = defineSlice({
 	id: "paymentMethod",
 	screen: { id: "checkout" },
-	commands: { requestStaffPaymentApproval: checkoutRequestStaffPaymentApprovalOperation },
-	outcomes: {
-		eftposSelected: effect(checkoutPayEftposOperation),
-		confirmed: guard("payment.succeeded", { navigate: "next" }),
-		back: back()
-	}
+	commands: {
+		payEftpos: checkoutPayEftposOperation,
+		requestStaffPaymentApproval: checkoutRequestStaffPaymentApprovalOperation
+	},
+	intents: { complete: intentPrecondition("payment.succeeded", { navigate: "next" }) }
 });
 /** 支付完成仍复用 Checkout Screen，仅作为 Workflow 的成功终态。 */
 const paymentCompletedSlice = defineSlice({
 	id: "paymentCompleted",
 	screen: { id: "checkout" },
-	outcomes: {}
+	intents: {}
 });
 //#endregion
 export { paymentCompletedSlice, paymentMethodSlice };

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

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

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

@@ -0,0 +1,23 @@
+import { PrimaryProductPromptDialog } from "../catalog/PrimaryProductPromptDialog/index.js";
+import React from "react";
+//#region src/components/HDLKiosk/slices/primaryProductPrompt/view.tsx
+/** 主商品询问展示：将用户选择转换为标准 complete/omit 结果。 */
+function PrimaryProductPromptView({ busy, send }) {
+	return /* @__PURE__ */ React.createElement(PrimaryProductPromptDialog, {
+		busy,
+		onDecline: () => send({
+			kind: "intent",
+			intent: "omit"
+		}),
+		onAccept: () => send({
+			kind: "intent",
+			intent: "complete"
+		})
+	});
+}
+const renderPrimaryProductPrompt = ({ viewSnapshot, bindActivity }) => /* @__PURE__ */ React.createElement(PrimaryProductPromptView, {
+	busy: viewSnapshot.status === "running",
+	send: bindActivity("primaryProductPrompt")
+});
+//#endregion
+export { renderPrimaryProductPrompt };

package/es/components/HDLKiosk/utils.js

@@ -1,3 +1,4 @@
+import { canNavigateBack } from "./kernel/workflow/selectors.js";
 import { formatAmount, locales } from "@pisell/utils";
 //#region src/components/HDLKiosk/utils.ts
 function fallbackErrorMessage(surface) {
@@ -94,8 +95,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" && canNavigateBack(snapshot),
 		placeholder,
 		placeholderBlocked,
 		errorMessage: error === null || error === void 0 ? void 0 : error.message,

package/es/components/bigSale/templates/HDLKiosk/auth/HDLKioskIdentityAuthPanel.js

@@ -3,7 +3,7 @@ import { _asyncToGenerator } from "../../../../../_virtual/_@oxc-project_runtime
 import useEngineContext from "../../../../../hooks/useEngineContext.js";
 import Login2 from "../../../../../pro/Login2.0/Login2.js";
 import Register2 from "../../../../../pro/Login2.0/Register2.js";
-import React, { useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 //#region src/components/bigSale/templates/HDLKiosk/auth/HDLKioskIdentityAuthPanel.tsx
 /**
 * 文件角色：把 BigSale 的 Login2/Register2 表单适配为 HDLKiosk Identity 认证 UI。
@@ -136,12 +136,25 @@ function _resolveCustomerFromAuthResult() {
 	});
 	return _resolveCustomerFromAuthResult.apply(this, arguments);
 }
-function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabled, onAuthenticated, onAuthError, onCustomerResolved }) {
+function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabled, onAuthenticated, onAuthError, onBusyChange, onCustomerResolved }) {
 	const engineContext = useEngineContext();
 	const [view, setView] = useState("login");
 	const [submitting, setSubmitting] = useState(false);
+	const [authLoading, setAuthLoading] = useState(false);
 	const loginConfig = useMemo(buildLoginConfig, []);
 	const registerConfig = useMemo(buildRegisterConfig, []);
+	useEffect(() => {
+		onBusyChange === null || onBusyChange === void 0 || onBusyChange(submitting || authLoading);
+	}, [
+		authLoading,
+		onBusyChange,
+		submitting
+	]);
+	useEffect(() => {
+		return () => {
+			onBusyChange === null || onBusyChange === void 0 || onBusyChange(false);
+		};
+	}, [onBusyChange]);
 	const completeWithCustomer = function() {
 		var _ref11 = _asyncToGenerator(function* (originResult, _method, authFormData) {
 			if (submitting || disabled || !registerAndLoginModuleName) return;
@@ -175,6 +188,7 @@ function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabl
 		config: loginConfig,
 		visible: true,
 		registerAndLoginModuleName,
+		onLoadingChange: setAuthLoading,
 		onSwitchToRegister: () => setView("register"),
 		onLogin: completeWithCustomer,
 		onError: onAuthError
@@ -182,6 +196,7 @@ function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabl
 		config: registerConfig,
 		visible: true,
 		registerAndLoginModuleName,
+		onLoadingChange: setAuthLoading,
 		onGoToLogin: () => setView("login"),
 		onRegister: completeWithCustomer,
 		onError: onAuthError

package/es/pro/Login2.0/Login2.d.ts

@@ -24,6 +24,8 @@ interface Login2Config {
 }
 /** 登录组件事件 */
 interface Login2Events {
+  /** 内部异步认证任务的执行状态 */
+  onLoadingChange?: (loading: boolean) => void;
   /** 登录回调 */
   onLogin?: (originResult: any, method: AuthMethodType, data: LoginFormData, channel?: string) => Promise<void> | void;
   /** 三方登录回调 */

package/es/pro/Login2.0/Login2.js

@@ -24,7 +24,7 @@ import "./index.less";
 * 支持邮箱、手机、三方登录
 * 组件宽度固定 360px
 */
-const Login2 = ({ config, visible = true, onClose, className, style, onLogin, onOAuthLogin, onSendVerificationCode, onForgotPassword, onSwitchToRegister, onError, registerAndLoginModule, registerAndLoginModuleName }) => {
+const Login2 = ({ config, visible = true, onClose, className, style, onLogin, onOAuthLogin, onSendVerificationCode, onForgotPassword, onSwitchToRegister, onError, onLoadingChange, registerAndLoginModule, registerAndLoginModuleName }) => {
 	var _context$appHelper, _config$ui, _config$emailLinkVeri, _config$emailLinkVeri2, _config$emailLinkVeri4;
 	const [form] = Form.useForm();
 	const [loading, setLoading] = useState(false);
@@ -34,6 +34,14 @@ const Login2 = ({ config, visible = true, onClose, className, style, onLogin, on
 	const registerAndLogin = registerAndLoginModule !== null && registerAndLoginModule !== void 0 ? registerAndLoginModule : pisellOS === null || pisellOS === void 0 ? void 0 : pisellOS.getModule(registerAndLoginModuleName || "registerAndLogin");
 	const context = useEngineContext();
 	const storage = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.storage;
+	useEffect(() => {
+		onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(loading);
+	}, [loading, onLoadingChange]);
+	useEffect(() => {
+		return () => {
+			onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(false);
+		};
+	}, [onLoadingChange]);
 	const rememberMeWatch = Form.useWatch("remember_me", form);
 	useEffect(() => {
 		if (typeof rememberMeWatch === "boolean" && !rememberMeWatch) {

package/es/pro/Login2.0/Register2.d.ts

@@ -27,6 +27,8 @@ interface Register2Config {
 }
 /** 注册组件事件 */
 interface Register2Events {
+  /** 内部异步认证任务的执行状态 */
+  onLoadingChange?: (loading: boolean) => void;
   /** 注册回调 */
   onRegister?: (originResult: any, method: AuthMethodType, data: RegisterFormData, channel?: string) => Promise<void> | void;
   /** 三方登录回调 */

package/es/pro/Login2.0/Register2.js

@@ -33,7 +33,7 @@ import "./steps/steps.less";
 * 支持邮箱、手机、三方注册
 * 组件宽度固定 360px
 */
-const Register2 = ({ config, visible = true, onClose, className, style, onRegister, onOAuthLogin, onSendVerificationCode, onEmailLinkExpired, onGoToLogin, onError, registerAndLoginModule, registerAndLoginModuleName }) => {
+const Register2 = ({ config, visible = true, onClose, className, style, onRegister, onOAuthLogin, onSendVerificationCode, onEmailLinkExpired, onGoToLogin, onError, onLoadingChange, registerAndLoginModule, registerAndLoginModuleName }) => {
 	var _context$appHelper, _utils$getStore, _utils$getStore$getSt, _config$ui, _config$emailLinkVeri3, _config$ui4, _config$ui5, _config$ui6, _config$ui7, _config$ui8, _config$ui9;
 	const [form] = Form.useForm();
 	const [loading, setLoading] = useState(false);
@@ -42,6 +42,14 @@ const Register2 = ({ config, visible = true, onClose, className, style, onRegist
 	const [codeError, setCodeError] = useState("");
 	const pisellOS = usePisellOS();
 	const registerAndLogin = registerAndLoginModule !== null && registerAndLoginModule !== void 0 ? registerAndLoginModule : pisellOS === null || pisellOS === void 0 ? void 0 : pisellOS.getModule(registerAndLoginModuleName || "registerAndLogin");
+	useEffect(() => {
+		onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(loading);
+	}, [loading, onLoadingChange]);
+	useEffect(() => {
+		return () => {
+			onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(false);
+		};
+	}, [onLoadingChange]);
 	const context = useEngineContext();
 	const utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
 	const shopId = ((_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 || (_utils$getStore$getSt = _utils$getStore.getState) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.call(_utils$getStore)) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id) || 9;

package/lib/components/HDLKiosk/app/ScreenRenderer.js

@@ -8,8 +8,8 @@ let _pisell_utils = require("@pisell/utils");
 //#region src/components/HDLKiosk/app/ScreenRenderer.tsx
 /**
 * 文件角色：把当前 Workflow Node 交给其 Slice 自有 View 渲染。
-* 运行机制：从应用 View 注册表按 Activity 读取同步组件；Modal 节点先渲染 base
-* Slice，再叠加当前 Slice View。
+* 运行机制：从应用 View 注册表按 Activity 读取同步组件；先渲染 Actor
+* Surface 保留的 Page，再按顺序叠加 Modal Slice View。
 * 边界：只组装 View Context，不调用 Host、不创建 ViewModel、不决定下一节点。
 */
 function ScreenRenderer({ definition, snapshot, sales, send, commandState = { busy: false }, resetting, capabilities, businessMode = "prototype", scaleMinimumWeightKg = .01, renderIdentityAuth, memberAction = {
@@ -24,12 +24,12 @@ function ScreenRenderer({ definition, snapshot, sales, send, commandState = { bu
 	methods: [],
 	loading: false
 } }) {
-	var _activeNode$presentat, _commandState$error;
+	var _definition$nodes$sna, _commandState$error;
 	const activeNode = definition.nodes[snapshot.nodeId];
-	const modalBaseNodeId = ((_activeNode$presentat = activeNode.presentation) === null || _activeNode$presentat === void 0 ? void 0 : _activeNode$presentat.mode) === "modal" ? activeNode.presentation.base : void 0;
-	const renderedNode = definition.nodes[modalBaseNodeId !== null && modalBaseNodeId !== void 0 ? modalBaseNodeId : snapshot.nodeId];
+	const pageNode = (_definition$nodes$sna = definition.nodes[snapshot.surface.pageStepId]) !== null && _definition$nodes$sna !== void 0 ? _definition$nodes$sna : activeNode;
+	const overlayNodes = snapshot.surface.overlays.map((stepId) => definition.nodes[stepId]).filter((node) => Boolean(node));
 	const bindActivity = (activityId) => (action) => {
-		send(action.kind === "outcome" ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, action), {}, { activityId }) : action);
+		send(action.kind === "intent" || action.kind === "navigation" ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, action), {}, { activityId }) : action);
 	};
 	const viewSnapshot = commandState.busy || commandState.error ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, snapshot), {}, {
 		status: commandState.busy ? "running" : snapshot.status,
@@ -66,7 +66,7 @@ function ScreenRenderer({ definition, snapshot, sales, send, commandState = { bu
 		};
 		return /* @__PURE__ */ react.default.createElement(SliceView, context);
 	};
-	return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, renderNode(renderedNode), modalBaseNodeId ? renderNode(activeNode) : null);
+	return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, renderNode(pageNode), overlayNodes.map((node) => /* @__PURE__ */ react.default.createElement(react.default.Fragment, { key: node.id }, renderNode(node))));
 }
 //#endregion
 exports.ScreenRenderer = ScreenRenderer;

package/lib/components/HDLKiosk/app/views.js

@@ -3,13 +3,14 @@ const require_view$1 = require("../slices/customization/view.js");
 const require_view$2 = require("../slices/fulfillment/view.js");
 const require_view$3 = require("../slices/identity/view.js");
 const require_view$4 = require("../slices/payment/view.js");
+const require_view$5 = require("../slices/primaryProductPrompt/view.js");
 //#region src/components/HDLKiosk/app/views.ts
 const hdlKioskViews = Object.freeze({
 	identity: require_view$3.renderIdentity,
 	fulfillment: require_view$2.renderFulfillment,
 	customization: require_view$1.renderCustomization,
 	catalog: require_view.renderCatalog,
-	catalogWithPrimaryProductPrompt: require_view.renderCatalog,
+	primaryProductPrompt: require_view$5.renderPrimaryProductPrompt,
 	paymentMethod: require_view$4.renderPayment,
 	paymentCompleted: require_view$4.renderPayment
 });

package/lib/components/HDLKiosk/app/workflow/barcode.js

@@ -3,52 +3,29 @@ const require_slice = require("../../slices/catalog/slice.js");
 const require_slice$1 = require("../../slices/customization/slice.js");
 const require_slice$2 = require("../../slices/fulfillment/slice.js");
 const require_slice$3 = require("../../slices/payment/slice.js");
+const require_slice$4 = require("../../slices/primaryProductPrompt/slice.js");
 //#region src/components/HDLKiosk/app/workflow/barcode.ts
 /**
 * 文件角色：声明 Barcode 入口的有序业务步骤。
 * 运行机制：Workflow 从 Catalog 开始；首码在 Session readyForCommands 后由全局 Scanner
-* Controller 消费。Catalog 先询问是否需要麻辣烫，需要时进入 Customization；
-* 最终统一在 Payment 前确认 Fulfillment。
+* Controller 消费。Catalog 完成补充购物后进入独立的主商品询问 Modal，需要时进入
+* Customization；无论选择或拒绝，最终都直接进入 Fulfillment。
 * 边界：设备扫码属于 Session 输入，不是可前进/后退的 Activity；支付 prepare 由支付
 * Operation 在 dispatch 前统一保证，不绑定 Catalog transition。
 */
 const barcodeWorkflow = require_defineApplication.defineWorkflow({
 	id: "hdl.barcode",
 	steps: [
+		require_slice.catalogSlice,
 		{
-			slice: require_slice.catalogWithPrimaryProductPromptSlice,
-			on: {
-				completed: "fulfillment",
-				primaryProductRequested: "customization"
-			}
-		},
-		{
-			slice: require_slice$1.customizationSlice,
-			on: {
-				completed: {
-					target: "catalogWithPrimaryProductPrompt",
-					repeat: {
-						max: 1,
-						exceeded: "blocked"
-					}
-				},
-				skipped: {
-					target: "catalogWithPrimaryProductPrompt",
-					repeat: {
-						max: 1,
-						exceeded: "blocked"
-					}
-				}
-			}
-		},
-		{
-			slice: require_slice$2.fulfillmentSlice,
-			on: { back: "catalogWithPrimaryProductPrompt" }
-		},
-		{
-			slice: require_slice$3.paymentMethodSlice,
-			on: { eftposSelected: "paymentCompleted" }
+			slice: require_slice$4.primaryProductPromptSlice,
+			presentation: { mode: "modal" },
+			visitPolicy: "once",
+			on: { omit: "fulfillment" }
 		},
+		require_slice$1.customizationSlice,
+		require_slice$2.fulfillmentSlice,
+		require_slice$3.paymentMethodSlice,
 		{
 			slice: require_slice$3.paymentCompletedSlice,
 			end: "success"

package/lib/components/HDLKiosk/app/workflow/{guards.js → predicates.js}

@@ -1,6 +1,6 @@
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
-//#region src/components/HDLKiosk/app/workflow/guards.ts
-const DEFAULT_GUARDS = Object.freeze({
+//#region src/components/HDLKiosk/app/workflow/predicates.ts
+const DEFAULT_PREDICATES = Object.freeze({
 	"cart.notEmpty": ({ sales }) => sales.cart.lineCount > 0,
 	"cart.noPendingMutation": ({ sales }) => !sales.cart.consistencyPending,
 	"identity.satisfied": ({ sales }) => sales.customer !== void 0,
@@ -9,15 +9,15 @@ const DEFAULT_GUARDS = Object.freeze({
 	"payment.notPending": ({ sales }) => sales.payment.status !== "pending" && sales.payment.status !== "unknown",
 	"payment.succeeded": ({ sales }) => sales.payment.status === "succeeded"
 });
-function createGuardRegistry(overrides = {}) {
-	const guards = Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, DEFAULT_GUARDS), overrides));
-	const ids = Object.freeze(Object.keys(guards));
+function createPredicateRegistry(overrides = {}) {
+	const predicates = Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, DEFAULT_PREDICATES), overrides));
+	const ids = Object.freeze(Object.keys(predicates));
 	return Object.freeze({
 		ids,
-		has: (id) => Object.prototype.hasOwnProperty.call(guards, id),
-		evaluate: (id, context) => guards[id](context)
+		has: (id) => Object.prototype.hasOwnProperty.call(predicates, id),
+		evaluate: (id, context) => predicates[id](context)
 	});
 }
-const defaultGuardRegistry = createGuardRegistry();
+const defaultPredicateRegistry = createPredicateRegistry();
 //#endregion
-exports.defaultGuardRegistry = defaultGuardRegistry;
+exports.defaultPredicateRegistry = defaultPredicateRegistry;

package/lib/components/HDLKiosk/app/workflow/quick.js

@@ -8,22 +8,19 @@ const require_slice$4 = require("../../slices/payment/slice.js");
 /**
 * 文件角色：声明 Quick 入口的有序业务步骤。
 * 运行机制：数组顺序就是主路径；这里只保留偏离相邻前进/返回的特殊分支。
-* 边界：Guard、Command、Screen 与失败策略均由本地 Activity Contract 提供。
+* 边界：Predicate、Command、Screen 与失败策略均由本地 Activity Contract 提供。
 */
 const quickOrderWorkflow = require_defineApplication.defineWorkflow({
 	id: "hdl.quick",
 	steps: [
 		{
 			slice: require_slice$3.identitySlice,
-			useGuards: ["beforeEnter"]
+			visitPolicy: "once"
 		},
 		require_slice$1.customizationSlice,
 		require_slice.catalogSlice,
 		require_slice$2.fulfillmentSlice,
-		{
-			slice: require_slice$4.paymentMethodSlice,
-			on: { eftposSelected: "paymentCompleted" }
-		},
+		require_slice$4.paymentMethodSlice,
 		{
 			slice: require_slice$4.paymentCompletedSlice,
 			end: "success"

package/lib/components/HDLKiosk/app/workflow/registry.js

@@ -7,7 +7,7 @@ const defaultActivityRegistry = Object.freeze({
 	has: (id) => manifestRegistry.has(id),
 	get: (id) => manifestRegistry.has(id) ? manifestRegistry.require(id) : void 0,
 	require: (id) => manifestRegistry.require(id),
-	accepts: (id, outcome) => manifestRegistry.require(id).outcomes.includes(outcome)
+	accepts: (id, intent) => manifestRegistry.require(id).intents.some((availableIntent) => availableIntent === intent)
 });
 const BUILT_IN_WORKFLOW_DEFINITIONS = Object.freeze({
 	quick: require_defineApplication.normalizeKioskWorkflow(require_manifest.hdlKioskApplication.workflows.quick),

package/lib/components/HDLKiosk/app/workflow/scale.js

@@ -14,19 +14,10 @@ const require_slice$3 = require("../../slices/payment/slice.js");
 const scaleWorkflow = require_defineApplication.defineWorkflow({
 	id: "hdl.scale",
 	steps: [
-		{
-			slice: require_slice$1.customizationSlice,
-			on: { skipped: "$next" }
-		},
-		{
-			slice: require_slice.catalogSlice,
-			on: { back: "customization" }
-		},
+		require_slice$1.customizationSlice,
+		require_slice.catalogSlice,
 		require_slice$2.fulfillmentSlice,
-		{
-			slice: require_slice$3.paymentMethodSlice,
-			on: { eftposSelected: "paymentCompleted" }
-		},
+		require_slice$3.paymentMethodSlice,
 		{
 			slice: require_slice$3.paymentCompletedSlice,
 			end: "success"

package/lib/components/HDLKiosk/components/shell/HDLKioskBottomBarHost/index.js

@@ -1,6 +1,5 @@
 const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
-const require_objectWithoutProperties = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js");
 const require_index = require("../HDLKioskFloatingBar/index.js");
 const require_index$1 = require("../HDLKioskCartBarActions/index.js");
 let react = require("react");
@@ -12,11 +11,6 @@ react = require_runtime.__toESM(react);
 * 并区分 Modal 下可见的 masked 状态与不可导航时的 hidden 状态。
 * 边界：不计算购物车/金额；声明数据必须来自 ViewModel/Projection。
 */
-const _excluded = [
-	"overlayActive",
-	"cartEnabled",
-	"cartOpenBar"
-];
 const HDLKioskBottomBarContext = (0, react.createContext)(null);
 const HDLKioskCartDrawerContext = (0, react.createContext)(null);
 const noop = () => void 0;
@@ -42,6 +36,17 @@ function useHDLKioskBottomBar(declaration) {
 	}, [context, declaration]);
 	(0, react.useLayoutEffect)(() => () => context === null || context === void 0 ? void 0 : context.unregister(owner.current), [context]);
 }
+function toFloatingBarProps(declaration) {
+	const { ariaLabel, className, leading, summary, trailing, variant } = declaration;
+	return {
+		ariaLabel,
+		className,
+		leading,
+		summary,
+		trailing,
+		variant
+	};
+}
 function resolveHDLKioskBottomBarState(mode, screenOverlayActive = false) {
 	const effectiveMode = mode === "hidden" ? "hidden" : mode === "masked" || screenOverlayActive ? "masked" : "visible";
 	return {
@@ -113,10 +118,7 @@ function HDLKioskBottomBarHost({ children, mode = "visible", fallback, cartOverl
 		}),
 		className: `hdl-floating-bar--cart-open${cartBarDeclaration.className ? ` ${cartBarDeclaration.className}` : ""}`
 	}) : renderedDeclaration;
-	const floatingBarDeclaration = activeBarDeclaration ? (() => {
-		const { overlayActive: _overlayActive, cartEnabled: _cartEnabled, cartOpenBar: _cartOpenBar } = activeBarDeclaration;
-		return require_objectWithoutProperties._objectWithoutProperties(activeBarDeclaration, _excluded);
-	})() : void 0;
+	const floatingBarDeclaration = activeBarDeclaration ? toFloatingBarProps(activeBarDeclaration) : void 0;
 	(0, react.useEffect)(() => {
 		if (presentation.drawerBlocked || !drawerAvailable) setCartOpen(false);
 	}, [drawerAvailable, presentation.drawerBlocked]);

package/lib/components/HDLKiosk/components/shell/HDLKioskShell/index.js

@@ -14,6 +14,7 @@ const INLINE_SCREEN_OPERATIONS = new Set([
 	"cart.updateQuantity",
 	"cart.removeLine",
 	"product.syncPrimaryWeightedProduct",
+	"product.removePrimaryProduct",
 	"checkout.requestStaffPaymentApproval",
 	"checkout.payEftpos"
 ]);

package/lib/components/HDLKiosk/docs/00-/346/226/207/344/273/266/345/257/274/350/210/252.md

@@ -46,7 +46,7 @@ HDLKiosk/
 | --- | --- |
 | `manifest.ts` | 唯一应用清单；收集 Slice 提供的 Activity/Operation，并绑定三条 Workflow |
 | `constants.ts` | `HDL_WORKFLOW_IDS` 等应用常量 |
-| `events.ts` | HDLKiosk Activity Outcome 的强类型事件联合 |
+| `events.ts` | HDLKiosk Activity Intent 与 Back Navigation 的强类型事件联合 |
 | `operations.ts` | 共享 Operation 的唯一公共导入入口 |
 | `operations/` | `operations.ts` 背后的私有实现、Coordinator 策略和测试；外部代码不要逐文件跨层引用 |
 | `views.ts` | 应用层 Activity → React View 的完整同步注册表；不进入 Slice/Workflow/Kernel |
@@ -54,7 +54,7 @@ HDLKiosk/
 | `workflow/barcode.ts` | Barcode 的有序 Activity 列表与特殊转移 |
 | `workflow/scale.ts` | Scale 的有序 Activity 列表与特殊转移 |
 | `workflow/registry.ts` | 从 Manifest 派生 Activity Registry，并提供内置流程查询 |
-| `workflow/guards.ts` | HDLKiosk 本地 Guard Registry |
+| `workflow/predicates.ts` | HDLKiosk 本地 Predicate Registry |
 | `workflow/policy.ts` | 支付门禁等商家应用策略校验；结构编译仍属于 Kernel |
 | `ScreenRenderer.tsx` | 按当前 Activity 从 `views.ts` 取 View；处理 modal base 叠加和缺失 View 的阻断呈现 |
 | `entry/model.ts` | 派生 Workflow 之外三个入口的可用性和展示模型 |
@@ -75,7 +75,7 @@ slices/<name>/
 └── model.ts         # 仅本 Slice 使用的纯模型；按需存在
 ```
 
-当前 Slice：`identity`、`fulfillment`、`customization`、`catalog`、`paymentMethod`、`paymentCompleted`。`paymentCompleted` 只是支付成功终态，与 `paymentMethod` 共用 Checkout Screen/View，不存在独立 Result Screen。
+当前 Slice：`identity`、`fulfillment`、`customization`、`catalog`、`primaryProductPrompt`、`paymentMethod`、`paymentCompleted`。`primaryProductPrompt` 是以 Catalog 为 base 的 Modal；`paymentCompleted` 是支付成功终态，与 `paymentMethod` 共用 Checkout Screen/View。
 
 - `slices/index.ts` 只汇总各目录导出的 `defineSlice` 结果，并统一约束 `screen.id` 必须是 HDLKiosk `ScreenId`；
 - 每个 `slice.ts` 只通过 `screen: { id }` 声明页面类别；实际 View 在 `app/views.ts` 中按 Activity 单独、完整地注册，使用同步本地组件引用；
@@ -84,7 +84,7 @@ slices/<name>/
 
 `Slice` 是作者侧唯一业务能力概念：`defineSlice` 定义能力，`application.slices` 收集能力，Workflow 的 `slice` 字段引用能力；运行期再编译为 Activity Contract。
 
-命名关系必须保持单向：Slice `id` 是业务 Activity；`screen.id` 是页面类别；`app/views.ts` 按 Activity 注册实际 UI。`catalog` 和 `catalogWithPrimaryProductPrompt` 可以共享 Catalog Screen 与 View，但仍是不同的业务 Slice。非 EFTPOS 店员支付授权是 `paymentMethod` 页面内 Command，不创建 Kiosk 等待 Activity 或弹窗。
+命名关系必须保持单向：Slice `id` 是业务 Activity；`screen.id` 是页面类别；`app/views.ts` 按 Activity 注册实际 UI。`catalog` 负责商品浏览，`primaryProductPrompt` 负责主商品询问；Prompt 以 Modal 覆盖 Actor Surface 中当前实际 Page，不引用固定背景 Step。支付派发和店员支付授权是 `paymentMethod` 页面内 Command，不创建流程 Intent。
 
 ## 5. `components/`：共享展示能力
 
@@ -103,7 +103,7 @@ slices/<name>/
 | `createWorkflowSession.ts` | 读取内置 Definition，直接编译、校验并创建 Actor/Coordinator |
 | `HDLKioskWorkflowView.tsx` | 活跃会话的 React 组合层；连接 Shell、Renderer 和 Controllers |
 | `domainTransitionRunner.ts` | 将 Actor 的 exit effect 交给 Operation Coordinator |
-| `workflowContext.ts` | 只归并经过 Activity Outcome 确认的流程上下文 |
+| `workflowContext.ts` | 只归并经过 Activity Intent 成功提交的流程上下文 |
 | `workflowLifecycle.ts` | Actor blocked/finished 的 Host 遥测与生命周期钩子 |
 | `useHostSnapshot.ts` | 订阅 Host Projection |
 | `useWorkflowSnapshot.ts` | 订阅 Actor Snapshot |
@@ -126,7 +126,7 @@ BigSale 专用 H5 登录实现位于 `bigSale/templates/HDLKiosk/auth/`。独立
 | 位置 | 角色 |
 | --- | --- |
 | `application/` | `defineSlice`、`defineKioskApplication`、Slice 收集和 authoring normalization |
-| `workflow/compiler.ts` | 编译有序 Step 数组，校验 ID、Outcome、可达性、modal base 和有界循环 |
+| `workflow/compiler.ts` | 编译有序 Step 数组，校验 ID、Intent、可达性、modal base 和有界循环 |
 | `workflow/actor.ts` | 单会话串行状态机，拒绝迟到 Activity/Step 事件 |
 | `workflow/transition.ts` | advance/stay/blocked 等转移结果原语 |
 | `operations/coordinator.ts` | 通用排队、去重、timeout、dispose 和 epoch 协调 |
@@ -164,7 +164,7 @@ import {
 - `host.ts`：Host 总入口和 capabilities；
 - `sales.ts`：标准 ProductData、OS 加购流、购物车、客户、履约、支付和 Projection；
 - `devices.ts`：scanner/scale port；
-- `workflow*.ts`：Activity、Definition 和 Guard 协议；
+- `workflow*.ts`：Activity、Definition、Predicate 和 Navigation Guard 协议；
 - `operations.ts`：允许请求的 Operation ID 与输入映射；
 - `results.ts` / `errors.ts` / `telemetry.ts`：结果、错误与观测。