@wix/himalaya-cli 0.1396.0 → 0.1398.0

package/templates/events-meetups/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

package/templates/gym-fitness/dev/index.ts

@@ -2607,6 +2607,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": {
@@ -2622,8 +2632,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"
@@ -2634,6 +2655,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": {
@@ -2656,6 +2689,7 @@ const SCREENS = runtimeSetting({
                           "title": "Sign in",
                           "style": "primary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.signIn"
                           }
@@ -2674,6 +2708,7 @@ const SCREENS = runtimeSetting({
                           "title": "Create account",
                           "style": "primary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.register"
                           }
@@ -2692,6 +2727,7 @@ const SCREENS = runtimeSetting({
                           "title": "Send reset link",
                           "style": "primary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.resetPassword"
                           }
@@ -2710,6 +2746,7 @@ const SCREENS = runtimeSetting({
                           "title": "Forgot password?",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showRecovery"
                           }
@@ -2728,6 +2765,7 @@ const SCREENS = runtimeSetting({
                           "title": "Register",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showRegister"
                           }
@@ -2746,6 +2784,7 @@ const SCREENS = runtimeSetting({
                           "title": "Sign in instead",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showSignIn"
                           }
@@ -2764,6 +2803,7 @@ const SCREENS = runtimeSetting({
                           "title": "Back to sign in",
                           "style": "secondary",
                           "fullWidth": true,
+                          "disabledPath": "$service:himiStoreAccount.authBusy",
                           "action": {
                             "actionId": "tier5.himiStoreAccount.showSignIn"
                           }

package/templates/gym-fitness/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