@wix/himalaya-cli 0.1397.0 → 0.1399.0

package/templates/gym-fitness-owner/tier5-src/_shared/aria-widget-view.ts

@@ -12,10 +12,11 @@
 // every collapsible element carries its own `*Hidden` boolean — the same shape
 // the transcript bubbles already use for their three link slots.
 
-import type { NormalizedWidget, WidgetKind, WidgetOption } from "./aria-widget-model.js";
+import type { NormalizedWidget, WidgetBenefit, WidgetKind, WidgetOption } from "./aria-widget-model.js";
 import { SELECTED_TOKEN, VALUES_TOKEN, isWebUrl, stripMarkdown } from "./aria-widget-model.js";
 import { oauthView } from "./aria-widget-oauth.js";
 import { composeGenericCard } from "./aria-generic-widget.js";
+import { formatNumber } from "./engine-intl.js";
 import { normalizeWidget } from "./aria-widget-kinds.js";
 import { scanEnvelopes, widgetsOfParts } from "./aria-widgets.js";
 
@@ -90,9 +91,12 @@ export interface WidgetOptionRow {
   /** The per-option button's label, already host-disclosed. */
   buttonLabel: string;
   buttonHidden: boolean;
-  /** PLANS' benefit list, joined — an array cannot ride on a templated row. */
+  /** PLANS benefit prose plus nested repeater rows carrying each icon. */
   listText: string;
+  benefits: WidgetBenefit[];
   listHidden: boolean;
+  badge: string;
+  badgeHidden: boolean;
   selected: boolean;
   /** This option's own button `respondText`, before substitution. Carried on
    *  the row because the row is what a tap identifies. */
@@ -114,6 +118,7 @@ export interface WidgetOptionRow {
 export interface WidgetSlice {
   label: string;
   value: number;
+  color: string;
 }
 
 /** One step of a TODO_PLAN, shaped for `Timeline`. */
@@ -218,6 +223,9 @@ export interface WidgetView {
    *  negation: an EMPTY chart is neither, so hiding each component on the
    *  other's flag left both on screen as blank boxes. */
   chartPieHidden: boolean;
+  chartRingHidden: boolean;
+  chartPlainPieHidden: boolean;
+  chartLegend: { label: string; color: string; marker: "dot"; value: string }[];
   chartSeriesHidden: boolean;
   chartEmptyHidden: boolean;
   /** Hide the async spinner. `asyncUntracked` is not the right flag: a TRACKED
@@ -526,7 +534,7 @@ export const NO_WIDGET: WidgetView = {
   optionsGridHidden: true, optionsListHidden: false,
   footerRowHidden: false, footerColumnHidden: true,
   slices: [], values: [], chartIsPie: false, chartIsSeries: false, chartKind: "",
-  chartPieHidden: true, chartSeriesHidden: true, chartEmptyHidden: true,
+  chartPieHidden: true, chartRingHidden: true, chartPlainPieHidden: true, chartLegend: [], chartSeriesHidden: true, chartEmptyHidden: true,
   asyncSpinnerHidden: true, itemsLoadingHidden: true,
   chartEmpty: true, description: "", descriptionHidden: true,
   steps: [], stepsEmpty: true, progress: 0, progressText: "",
@@ -574,11 +582,20 @@ function webOnly(url: string | undefined): string {
 /** One option, flattened. `selected` is passed in because it is worker state
  *  rather than anything the payload said — except on the first build, where the
  *  service's `isPreselected` seeds it. */
+/** An option that would draw nothing — every line stripped to empty, no picture, badge,
+ *  benefit or usable button — is dropped rather than rendered as a blank card or an
+ *  unlabeled row, and does not count toward `renderable`. */
+function hasVisibleContent(row: WidgetOptionRow): boolean {
+  return !!(row.title || row.subtitle || row.text || row.pictureUrl || row.badge
+    || row.benefits.length || !row.buttonHidden);
+}
+
 function optionRow(
   o: {
     value: string; title: string; subtitle: string; text: string;
     pictureUrl: string; buttonLabel: string; actionUrl: string; listText: string;
-    respondText: string; actionScreenId?: string; notSupportedText?: string;
+    respondText: string; actionScreenId?: string; notSupportedText?: string; badge?: string;
+    benefits?: WidgetBenefit[];
   },
   i: number,
   selected: boolean,
@@ -629,22 +646,33 @@ function optionRow(
   // RADIO_BUTTON option, which may carry `text` and no `title` at all, renders
   // as an empty row. So fold here rather than in each case's composition: the
   // raw `text` is still exported below for anything that wants both.
-  const hasTitle = !!o.title;
-  const rowTitle = hasTitle ? o.title : (o.text || o.subtitle);
+  // "Has a title" is judged on the STRIPPED title: a title of pure markup (`***`) falls back
+  // to the option's other prose exactly as a missing one does.
+  const strippedTitle = stripMarkdown(o.title);
+  const hasTitle = !!strippedTitle;
+  const rowTitle = hasTitle ? strippedTitle : stripMarkdown(o.text || o.subtitle);
   const rowSubtitle = hasTitle
-    ? (o.subtitle || o.text)
-    : (o.text && o.subtitle ? o.subtitle : "");
+    ? stripMarkdown(o.subtitle || o.text)
+    : stripMarkdown(o.text && o.subtitle ? o.subtitle : "");
+  // Every `*Hidden` flag follows the STRIPPED value: prose that is only markup
+  // (`---`, `***`, an image with empty alt) strips to "" and must not paint an
+  // empty node.
+  const text = stripMarkdown(o.text);
+  const listText = stripMarkdown(o.listText);
+  const benefits = (o.benefits ?? []).filter((b) => b.text);
+  const badge = stripMarkdown(o.badge || "");
   return {
     id: `o${i}`,
     value: o.value,
     title: rowTitle,
     subtitle: rowSubtitle, subtitleHidden: !rowSubtitle,
-    text: o.text, textHidden: !o.text,
+    text, textHidden: !text,
     pictureUrl, pictureHidden: !pictureUrl,
     // A label is not enough: the button has to be able to DO something — say
     // its text, go to its url, or explain why its screen is not here.
     buttonLabel, buttonHidden: !(buttonLabel && (respondText || actionUrl || actionScreenId)),
-    listText: o.listText, listHidden: !o.listText,
+    listText, benefits, listHidden: !listText && !benefits.length,
+    badge, badgeHidden: !badge,
     selected,
     respondText,
     actionUrl,
@@ -757,22 +785,27 @@ export function viewOf(
         // or screen destination, so that row must be removed.
         return !rawUrl || isWebUrl(rawUrl);
       })
-    : mappedOptions;
+        .filter(hasVisibleContent)
+    : mappedOptions.filter(hasVisibleContent);
 
   // CHART. `pieSlices` is the only shape the catalogue sends, but `chartType`
   // decides the component: a pie is a `DonutChart` at zero thickness, anything
   // else a `Chart` over the same magnitudes.
   const rawSlices = Array.isArray(extra.slices) ? (extra.slices as { label?: unknown; value?: unknown }[]) : [];
-  const slices: WidgetSlice[] = rawSlices.map((sl) => ({
-    label: typeof sl.label === "string" ? sl.label : "",
+  // The first-party chart cycles the same palette for sectors and legend dots.
+  const chartColors = ["ariaChartBlue", "ariaChartGreen", "ariaChartPurple", "ariaChartGray"];
+  const slices: WidgetSlice[] = rawSlices.map((sl, i) => ({
+    label: typeof sl.label === "string" ? stripMarkdown(sl.label) : "Other",
     value: typeof sl.value === "number" && Number.isFinite(sl.value) ? sl.value : 0,
+    color: chartColors[i % chartColors.length],
   }));
   const chartKind = typeof extra.chartType === "string" ? extra.chartType : "";
   // "doughnut" is the spelling the reference catalogue uses; "donut" is the
   // component's. Accepting only the component's spelling classified the real
   // payload as a SERIES and drew it as bars.
   const isPie = !chartKind || chartKind === "pie" || chartKind === "donut" || chartKind === "doughnut";
-  const description = typeof extra.description === "string" ? extra.description : "";
+  const isRing = chartKind === "donut" || chartKind === "doughnut";
+  const description = typeof extra.description === "string" ? stripMarkdown(extra.description) : "";
 
   // TODO_PLAN. `status` is the service's word; `done` is what `Timeline` draws.
   const rawItems = Array.isArray(extra.items) ? (extra.items as { label?: unknown; status?: unknown }[]) : [];
@@ -811,11 +844,16 @@ export function viewOf(
     // A single-select starts with at most ONE preselected choice, whatever the
     // payload marked — a radio group showing two ticks is a state the control
     // cannot otherwise reach.
+    // A choice with nothing to show (a markup-only title and no prose) is dropped like any
+    // other empty option; the preselection seed counts only choices that are drawn, and each
+    // keeps its original index so its id is stable.
     let seeded = false;
-    const choices = raw.map((o, j) => {
+    const choices: WidgetOptionRow[] = [];
+    raw.forEach((o, j) => {
+      if (!hasVisibleContent(optionRow(o, j, false, disclose, allowPicture))) return;
       const pre = !!o.preselected && (type !== "single-select" || !seeded);
       if (pre) seeded = true;
-      return optionRow(o, j, pre, disclose, allowPicture);
+      choices.push(optionRow(o, j, pre, disclose, allowPicture));
     });
     // A question with no choices and no free-text option of its own can still
     // be answered — text is the only thing it can take — so it gets the field.
@@ -947,6 +985,15 @@ export function viewOf(
     chartIsPie: w.kind === "CHART" && isPie && slices.length > 0,
     chartIsSeries: w.kind === "CHART" && !isPie && slices.length > 0,
     chartPieHidden: !(w.kind === "CHART" && isPie && slices.length > 0),
+    chartRingHidden: !(w.kind === "CHART" && isRing && slices.length > 0),
+    chartPlainPieHidden: !(w.kind === "CHART" && isPie && !isRing && slices.length > 0),
+    // Name AND value per row: the legend is the only place a slice's magnitude
+    // is spelled out, and the a11y contract reads both. The worker formats it,
+    // not each renderer, through the shared cross-engine formatter.
+    // Only the wedges the donut actually draws: every renderer drops a slice
+    // whose value is not positive, so its legend row would name nothing.
+    chartLegend: slices.filter((s) => s.value > 0).map(({ label, color, value }) => ({ label, color, marker: "dot" as const,
+      value: formatNumber(value) })),
     chartSeriesHidden: !(w.kind === "CHART" && !isPie && slices.length > 0),
     chartKind,
     chartEmpty: w.kind === "CHART" && slices.length === 0,

package/templates/nonprofit-cause/dev/index.ts

@@ -2259,6 +2259,16 @@ const SCREENS = runtimeSetting({
                         "props": {
                           "placeholder": "Email",
                           "keyboard": "email",
+                          "validation": {
+                            "required": true,
+                            "type": "email",
+                            "mode": "on_blur"
+                          },
+                          "errorPath": "$service:himiStoreAccount.emailError",
+                          "submitLabel": "go",
+                          "onSubmit": {
+                            "actionId": "tier5.himiStoreAccount.submit"
+                          },
                           "autoCapitalization": "none",
                           "focusPath": "$service:himiStoreAccount.emailFocus",
                           "onChange": {
@@ -2274,8 +2284,19 @@ const SCREENS = runtimeSetting({
                         "type": "TextField",
                         "props": {
                           "placeholder": "Password",
-                          "valuePath": "$service:himiStoreAccount.password",
                           "secure": true,
+                          "visibilityToggle": true,
+                          "validation": {
+                            "required": true,
+                            "mode": "on_blur",
+                            "message": "Enter your password."
+                          },
+                          "errorPath": "$service:himiStoreAccount.passwordError",
+                          "focusPath": "$service:himiStoreAccount.passwordFocus",
+                          "submitLabel": "go",
+                          "onSubmit": {
+                            "actionId": "tier5.himiStoreAccount.submit"
+                          },
                           "autoCapitalization": "none",
                           "onChange": {
                             "actionId": "tier5.himiStoreAccount.setPassword"
@@ -2286,6 +2307,18 @@ const SCREENS = runtimeSetting({
                         "hiddenPath": "$service:himiStoreAccount.isRecovering"
                       }
                     },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiStoreAccount.busyMessage",
+                          "style": "footnote",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
                     {
                       "id": "himi_account.message",
                       "body": {
@@ -2308,6 +2341,7 @@ const SCREENS = runtimeSetting({
                           "title": "Sign in",
                           "style": "primary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.signIn"
                           }
@@ -2326,6 +2360,7 @@ const SCREENS = runtimeSetting({
                           "title": "Create account",
                           "style": "primary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.register"
                           }
@@ -2344,6 +2379,7 @@ const SCREENS = runtimeSetting({
                           "title": "Send reset link",
                           "style": "primary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.resetPassword"
                           }
@@ -2362,6 +2398,7 @@ const SCREENS = runtimeSetting({
                           "title": "Forgot password?",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showRecovery"
                           }
@@ -2380,6 +2417,7 @@ const SCREENS = runtimeSetting({
                           "title": "Register",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showRegister"
                           }
@@ -2398,6 +2436,7 @@ const SCREENS = runtimeSetting({
                           "title": "Sign in instead",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showSignIn"
                           }
@@ -2416,6 +2455,7 @@ const SCREENS = runtimeSetting({
                           "title": "Back to sign in",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showSignIn"
                           }

package/templates/nonprofit-cause/tier5-src/himi-store-account/index.ts

@@ -1,3 +1,4 @@
+import { authFailure, authMessage, identityErrors, type AuthOperation } from "@himalaya/auth";
 // Tier-5 bundle: himi-store — visitor/member account state.
 //
 // SINGLE-SITE BY DESIGN. A Branded Lite build talks to exactly one Wix site, and the
@@ -75,23 +76,50 @@ function resumeAfterAuth(next: S): S {
 // Actions are not serialized: two quick Sign in taps both run against the pre-tap
 // state, so without this both would submit credentials and both would resume.
 let authInFlight = false;
+// Never projected or persisted. The renderer retains its own masked draft for retry.
+let passwordDraft = "";
+let editRevision = 0;
+// Descriptor configuration belongs to the worker session. Keep it even when a
+// delayed profile probe is discarded because the user edited the form.
+let memberAccountLinksRequested = false;
+const translated = (key: string) => copyParam(key, authMessage(key));
 
-async function authenticate(s: S, submit: () => Promise<unknown>, notMemberMessage: string, failedMessage: string): Promise<S | undefined> {
+function validateAuth(s: S, operation: AuthOperation): S {
+  const errors = identityErrors({ email: s.email, password: passwordDraft }, operation);
+  return derive({ ...s, emailError: errors.email ? translated(errors.email) : "",
+    passwordError: errors.password ? translated(errors.password) : "",
+    emailFocus: errors.email ? bumpToken(s.emailFocus) : s.emailFocus,
+    passwordFocus: !errors.email && errors.password ? bumpToken(s.passwordFocus) : s.passwordFocus,
+    message: "" });
+}
+function rejectResult(raw: unknown, operation: AuthOperation) {
+  const value = raw as { status?: string; error?: unknown; payload?: { error?: unknown } } | null;
+  if (value?.status === "error" || value?.error || value?.payload?.error) throw authFailure(raw, operation, translated);
+}
+async function authenticate(s: S, operation: "signIn" | "register"): Promise<S | undefined> {
   if (authInFlight) return undefined;
+  const checked = validateAuth(s, operation);
+  if (checked.emailError || checked.passwordError) return checked;
   authInFlight = true;
+  const revision = editRevision;
+  const password = passwordDraft;
   try {
-    await submit();
-    const next = await probe(optimisticMember(s, s.email));
-    if (!next.isMember) return derive({ ...next, message: notMemberMessage });
-    return resumeAfterAuth(derive({ ...next, message: "" }));
-  } catch {
-    // Clear the password: service state is snapshotted to disk (the worker-state
-    // store), so a failed attempt must not leave it there in cleartext. The Password
-    // field binds `valuePath` to it, so the field empties too and a retry re-types.
-    return derive({ ...s, password: "", message: failedMessage });
-  } finally {
-    authInFlight = false;
-  }
+    await svc.beginAuth(); // publish busy before waiting for the network
+    const raw = await dispatch(operation === "signIn" ? "himi.wix.signInDirect" : "himi.wix.registerDirect", {
+      email: s.email.trim(), password,
+      ...(operation === "register" ? { firstName: s.firstName, lastName: s.lastName } : {}),
+    });
+    rejectResult(raw, operation);
+    if (revision !== editRevision) return derive({ ...svc.getState(), authBusy: false });
+    const next = await probe(svc.getState());
+    if (revision !== editRevision) return derive({ ...svc.getState(), authBusy: false });
+    if (!next.isMember) throw { code: "unknown" };
+    passwordDraft = "";
+    return resumeAfterAuth(completedAuth(next));
+  } catch (error) {
+    return derive({ ...svc.getState(), authBusy: false,
+      message: revision === editRevision ? authFailure(error, operation, translated).reason : "" });
+  } finally { authInFlight = false; }
 }
 
 // Next value of a focus token: monotonic, and never empty once requested. A counter
@@ -180,10 +208,14 @@ interface S extends IapRestoreFields {
   noReturnPath: boolean;
   returnCta: string;
   email: string;
-  /** Held only from typing to the submit. Service state is persisted, so every
-   *  submitted sign-in/register clears it (success, not-a-member, and failure), as
-   *  do recovery and sign-out. Sign-in <-> register keeps it: the field stays up. */
+  /** Legacy snapshot slot, always empty. The active form keeps its password in
+   *  transient memory for retry; hydration never restores a persisted secret. */
   password: string;
+  authBusy: boolean;
+  busyMessage?: string;
+  emailError: string;
+  passwordError: string;
+  passwordFocus: string;
   firstName: string;
   lastName: string;
   // Focus TOKENS (`TextFieldProps.focus_path`), not flags: the bound field focuses
@@ -247,6 +279,8 @@ function derive(s: S): S {
   const hasReturnPath = !!s.isMember && !!s.returnScreenId;
   return {
     ...s,
+    password: "",
+    busyMessage: s.authBusy ? translated("auth.feedback.busy") : "",
     isLoading: s.status === "loading",
     notLoading: s.status !== "loading",
     notMember: !s.isMember,
@@ -309,9 +343,10 @@ async function orderRows(memberEmail: string): Promise<AccountActivityRow[]> {
 }
 
 async function probe(s: S, arg?: unknown): Promise<S> {
+  memberAccountLinksRequested ||= s.memberAccountLinks || strField(arg, "memberAccountLinks") === "1";
   const intent = authIntentFromArg(arg, s);
   const profile = await loadMemberProfile(copyParam("storeAccount.guestDetail", "Sign in to keep your cart and orders connected."));
-  const memberAccountLinks = s.memberAccountLinks || strField(arg, "memberAccountLinks") === "1";
+  const memberAccountLinks = memberAccountLinksRequested;
   const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
   if (restorePurchases) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
@@ -353,21 +388,11 @@ async function probe(s: S, arg?: unknown): Promise<S> {
   });
 }
 
-function optimisticMember(s: S, email: string): S {
+function completedAuth(s: S): S {
   return derive({
     ...s,
-    status: "ready",
-    isMember: true,
-    identityLine: copyParam("storeAccount.signedIn", "Signed in"),
-    detailLine: email,
-    memberName: email,
-    memberEmail: email,
-    memberImage: "",
-    memberInitials: "M",
-    hasMemberImage: false,
-    noMemberImage: true,
-    email,
     password: "",
+    authBusy: false, emailError: "", passwordError: "", passwordFocus: "",
     firstName: "",
     lastName: "",
     isRegistering: false,
@@ -377,6 +402,8 @@ function optimisticMember(s: S, email: string): S {
 }
 
 const svc = defineService<S, {
+  beginAuth: (s: S) => S;
+  submit: (s: S) => Promise<S | undefined>;
   load: (s: S, arg?: unknown) => Promise<S>;
   refresh: (s: S, arg?: unknown) => Promise<S>;
   setEmail: (s: S, arg?: unknown) => S;
@@ -395,7 +422,7 @@ const svc = defineService<S, {
   restorePublish: (s: S) => S;
   iapRestore: (s: S) => Promise<undefined>;
 }>("himiStoreAccount", {
-  notHydrated: [...IAP_RESTORE_KEYS],
+  notHydrated: ["password", "authBusy", "emailError", "passwordError", "passwordFocus", ...IAP_RESTORE_KEYS],
   state: derive({
     status: "loading",
     isMember: false,
@@ -420,6 +447,7 @@ const svc = defineService<S, {
     returnCta: "Continue",
     email: "",
     password: "",
+    authBusy: false, emailError: "", passwordError: "", passwordFocus: "",
     firstName: "",
     lastName: "",
     lastNameFocus: "",
@@ -445,12 +473,14 @@ const svc = defineService<S, {
     ...NO_IAP_RESTORE,
   }),
   actions: {
-    load: (s, arg) => { stashCopy(arg); return probe(s, arg); },
-    refresh: (s, arg) => { stashCopy(arg); return probe(s, arg); },
-    setEmail: (s, arg) => derive({ ...s, email: strOf(arg), message: "" }),
-    setPassword: (s, arg) => derive({ ...s, password: strOf(arg), message: "" }),
-    setFirstName: (s, arg) => derive({ ...s, firstName: strOf(arg), message: "" }),
-    setLastName: (s, arg) => derive({ ...s, lastName: strOf(arg), message: "" }),
+    submit: (s): Promise<S | undefined> => s.isRecovering ? svc.resetPassword() : authenticate(s, s.isRegistering ? "register" : "signIn"),
+    beginAuth: (s) => derive({ ...s, authBusy: true, message: "", emailError: "", passwordError: "" }),
+    load: async (s, arg): Promise<S> => { stashCopy(arg); const revision = editRevision; const next = await probe(s, arg); return authInFlight || revision !== editRevision ? svc.getState() : next; },
+    refresh: async (s, arg): Promise<S> => { stashCopy(arg); const revision = editRevision; const next = await probe(s, arg); return authInFlight || revision !== editRevision ? svc.getState() : next; },
+    setEmail: (s, arg) => { editRevision++; const next = { ...s, email: strOf(arg).trim(), message: "" }; return derive({ ...next, emailError: s.emailError ? (identityErrors({ email: next.email }, "reset").email ? translated(identityErrors({ email: next.email }, "reset").email!) : "") : "" }); },
+    setPassword: (s, arg) => { editRevision++; passwordDraft = strOf(arg); return derive({ ...s, message: "", passwordError: s.passwordError && !passwordDraft ? translated("auth.validation.passwordRequired") : "" }); },
+    setFirstName: (s, arg) => { editRevision++; return derive({ ...s, firstName: strOf(arg), message: "" }); },
+    setLastName: (s, arg) => { editRevision++; return derive({ ...s, lastName: strOf(arg), message: "" }); },
     // The register form's Next keys. Only first/last name carry one: they share a
     // single visibility gate (notRegistering) so their target is always on screen.
     // Email deliberately does NOT chain to password — see the comment on the
@@ -463,48 +493,32 @@ const svc = defineService<S, {
     // register and coming back would open focused on Last name, skipping First name.
     // Only the tokens whose fields actually unmount here are cleared: see
     // NO_FOCUS_MODE_SWITCH for why Email's is deliberately NOT among them.
-    showRegister: (s) => derive({ ...s, isRegistering: true, isRecovering: false, message: "", ...NO_FOCUS_MODE_SWITCH }),
-    showSignIn: (s) => derive({ ...s, isRegistering: false, isRecovering: false, message: "", ...NO_FOCUS_MODE_SWITCH }),
-    showRecovery: (s) => derive({ ...s, isRegistering: false, isRecovering: true, password: "", message: "", ...NO_FOCUS_MODE_SWITCH }),
-    resetPassword: async (s) => {
-      const email = s.email.trim();
-      if (!email || !email.includes("@")) return derive({ ...s, message: copyParam("storeAccount.validationEmail", "Enter a valid email address.") });
+    showRegister: (s) => { if (authInFlight) return s; editRevision++; return derive({ ...s, isRegistering: true, isRecovering: false, message: "", emailError: "", passwordError: "", ...NO_FOCUS_MODE_SWITCH }) },
+    showSignIn: (s) => { if (authInFlight) return s; editRevision++; return derive({ ...s, isRegistering: false, isRecovering: false, message: "", emailError: "", passwordError: "", ...NO_FOCUS_MODE_SWITCH }) },
+    showRecovery: (s) => { if (authInFlight) return s; editRevision++; return derive({ ...s, isRegistering: false, isRecovering: true, password: "", message: "", emailError: "", passwordError: "", ...NO_FOCUS_MODE_SWITCH }) },
+    resetPassword: async (s): Promise<S> => {
+      if (authInFlight) return s;
+      const checked = validateAuth(s, "reset");
+      if (checked.emailError) return checked;
+      authInFlight = true;
+      const revision = editRevision;
       try {
-        await dispatch("himi.wix.resetPassword", { email });
-        return derive({
-          ...s,
-          email,
-          isRecovering: false,
-          message: copyParam("storeAccount.resetSent", "If that email is registered, a reset link is on its way."),
-        });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.resetFailed", "Reset email could not be sent. Try again.") });
-      }
-    },
-    signIn: async (s) => {
-      if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      return authenticate(
-        s,
-        () => dispatch("himi.wix.signInDirect", { email: s.email, password: s.password }),
-        copyParam("storeAccount.signInCheckDetails", "Sign in failed. Check your details."),
-        copyParam("storeAccount.signInFailed", "Sign in failed. Try again."),
-      );
-    },
-    register: async (s) => {
-      if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      return authenticate(
-        s,
-        () => dispatch("himi.wix.registerDirect", {
-          email: s.email,
-          password: s.password,
-          firstName: s.firstName,
-          lastName: s.lastName,
-        }),
-        copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in."),
-        copyParam("storeAccount.registerFailed", "Account creation failed. Try another email."),
-      );
+        await svc.beginAuth();
+        const raw = await dispatch("himi.wix.resetPassword", { email: s.email.trim() });
+        rejectResult(raw, "reset");
+        if (revision !== editRevision) return derive({ ...svc.getState(), authBusy: false });
+        return derive({ ...svc.getState(), authBusy: false, isRecovering: false,
+          message: copyParam("storeAccount.resetSent", "If that email is registered, a reset link is on its way.") });
+      } catch (error) {
+        return derive({ ...svc.getState(), authBusy: false,
+          message: revision === editRevision ? authFailure(error, "reset", translated).reason : "" });
+      } finally { authInFlight = false; }
     },
-    signOut: async (s) => {
+    signIn: (s) => authenticate(s, "signIn"),
+    register: (s) => authenticate(s, "register"),
+    signOut: async (s): Promise<S> => {
+      if (authInFlight) return svc.getState();
+      passwordDraft = ""; editRevision++;
       routeInputConsumed = true;
       try { await dispatch("himi.wix.signOut"); } catch { /* ignore */ }
       // Do NOT re-probe via getMyData after logout — visitor-scoped my-data can