@wix/himalaya-cli 0.982.0 → 0.984.0

package/templates/branded-lite/dev/index.ts

@@ -10164,7 +10164,8 @@ const SCREENS = runtimeSetting({
                           "action": {
                             "actionId": "himi.open",
                             "params": {
-                              "screenId": "himi_account"
+                              "screenId": "himi_account",
+                              "returnScreenId": "himi_orders"
                             }
                           }
                         }
@@ -15312,7 +15313,8 @@ const SCREENS = runtimeSetting({
                                   "action": {
                                     "actionId": "himi.open",
                                     "params": {
-                                      "screenId": "himi_account"
+                                      "screenId": "himi_account",
+                                      "returnScreenId": "himi_bookings"
                                     }
                                   }
                                 }
@@ -74098,6 +74100,29 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                 },
                 "hiddenPath": "$service:himiBrandedOrder.noEmpty"
               }
+            },
+            {
+              "id": "himi_order.signin",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "Sign in",
+                  "style": "primary",
+                  "fullWidth": true,
+                  "action": {
+                    "actionId": "himi.open",
+                    "params": {
+                      "screenId": "himi_account",
+                      "returnScreenId": "himi_order",
+                      "returnId": "$service:himiBrandedOrder.id"
+                    }
+                  }
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedOrder.noSignIn"
+              }
             }
           ]
         }

package/templates/branded-lite/tier5-src/himi-branded-lite-notifsettings/index.ts

@@ -13,11 +13,20 @@ import {
   getMyNotificationPreferences,
   upsertMyNotificationPreferences,
   muteStatusFor,
-  type NotificationTopic,
+  readTopics,
+  readPreferences,
+  isDeliveredNow,
+  isLocked,
+  preferenceFor,
+  type NotificationTopicDefinition,
   type PreferenceInfo,
 } from "@himalaya/wix-notification-preferences";
 
-interface Row { id: string; name: string; subtitle: string; on: boolean }
+/** The channel this surface delivers on — read for the row state, written on toggle.
+ *  One constant, so the read and the write cannot drift apart. */
+const CHANNEL = "MOBILE";
+
+interface Row { id: string; name: string; subtitle: string; on: boolean; locked: boolean }
 interface S {
   status: "loading" | "ready";
   topics: Row[]; emptyText: string;
@@ -28,11 +37,20 @@ interface S {
   notMockEmpty: boolean; notMockUnavailable: boolean;
 }
 
-/** A topic delivers unless an explicit MUTED preference silences it. The status
- *  is nested at stateData.state.muteStatus (PreferenceStateData → PreferenceState). */
+/** Whether this topic is actually being DELIVERED — not merely what the recipient
+ *  asked for. `isDeliveredNow` prefers the server's `granted` verdict, so a topic the
+ *  member unmuted under a channel-wide mute renders OFF instead of promising a
+ *  notification that will never arrive. No preference row at all ⇒ the topic's default,
+ *  which is delivery. */
 function isOn(topicId: string, prefs: PreferenceInfo[]): boolean {
-  const p = prefs.find((x) => x.topicId === topicId);
-  return p?.stateData?.state?.muteStatus !== "MUTED";
+  const p = preferenceFor(topicId, prefs, CHANNEL);
+  if (!p) return true;
+  return isDeliveredNow(p.stateData);
+}
+
+/** A row the server says cannot be changed here (a broader rule overrides it). */
+function locked(topicId: string, prefs: PreferenceInfo[]): boolean {
+  return isLocked(preferenceFor(topicId, prefs, CHANNEL)?.stateData);
 }
 
 /** Row subtitle doubles as an affordance: current state + how to change it. */
@@ -41,12 +59,17 @@ function subtitleFor(on: boolean): string {
 }
 
 function row(id: string, name: string, on: boolean): Row {
-  return { id, name, subtitle: subtitleFor(on), on };
+  return { id, name, subtitle: subtitleFor(on), on, locked: false };
 }
 
-function norm(t: NotificationTopic, prefs: PreferenceInfo[]): Row {
+function norm(t: NotificationTopicDefinition, prefs: PreferenceInfo[]): Row {
   const name = (t.displayName || "Notification").trim() || "Notification";
-  return row(t.id || name, name, isOn(t.id, prefs));
+  const id = t.topicId || name;
+  const r = row(id, name, isOn(id, prefs));
+  // An overridden row says so instead of offering a toggle that cannot take effect.
+  return locked(id, prefs)
+    ? { ...r, locked: true, subtitle: "Managed by your channel settings" }
+    : r;
 }
 
 const MOCK: Row[] = [
@@ -72,9 +95,9 @@ const svc = defineService<S, {
           getNotificationTopics(),
           getMyNotificationPreferences().catch(() => ({} as Awaited<ReturnType<typeof getMyNotificationPreferences>>)),
         ]);
-        const prefs = prefsRes.preferences?.preferencesInfo ?? [];
-        const topics = (topicsRes.topics ?? []).map((t) => norm(t, prefs));
-        if (topics.length) return { ...s, status: "ready", topics, emptyText: "", isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true};
+        const prefs = readPreferences(prefsRes);
+        const topics = readTopics(topicsRes).map((t) => norm(t, prefs));
+        if (topics.length) return { ...s, status: "ready", topics, emptyText: "", isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true };
         return mockState(s, "empty");
       } catch {
         return mockState(s, "unavailable");
@@ -84,7 +107,8 @@ const svc = defineService<S, {
     // upsert is best-effort and a no-op on sample rows.
     toggle: async (s, p) => {
       const id = p?.id;
-      if (!id) return s;
+      const target = s.topics.find((r) => r.id === id);
+      if (!id || !target || target.locked) return s;
       let nextOn = true;
       const topics = s.topics.map((r) => {
         if (r.id !== id) return r;
@@ -93,7 +117,11 @@ const svc = defineService<S, {
       });
       if (!s.isMock && !id.startsWith("sample-")) {
         try {
-          await upsertMyNotificationPreferences([{ topicId: id, channel: "MOBILE", stateData: { state: { muteStatus: muteStatusFor(nextOn) } } }]);
+          // `stateData.state` is a SCALAR enum — the old nested `{ muteStatus }` was a
+          // shape this service does not have, so every write was malformed.
+          await upsertMyNotificationPreferences([
+            { topicId: id, channel: CHANNEL, stateData: { state: muteStatusFor(nextOn) } },
+          ]);
         } catch { /* keep the optimistic state */ }
       }
       return { ...s, topics };

package/templates/branded-lite/tier5-src/himi-branded-lite-order/index.ts

@@ -63,6 +63,10 @@ interface State extends LiveSessionFields {
   cannotReorder: boolean;
   reorderMessage: string;
   emptyText: string;
+  /** No member session is what stands between the visitor and this order — drives the
+   *  sign-in CTA, which returns here with `id` once the member has signed in. */
+  needsSignIn: boolean;
+  noSignIn: boolean;
   isLoading: boolean;
   notLoading: boolean;
   isErrored: boolean;
@@ -180,6 +184,7 @@ function derive(state: State): State {
     isErrored: state.status === "error",
     notErrored: state.status !== "error",
     noEmpty: state.status !== "ready" || hasContent,
+    noSignIn: !state.needsSignIn,
     hideContent: !hasContent,
     hasShipping: !!state.shipping,
     noShipping: !state.shipping,
@@ -249,7 +254,7 @@ function orderState(order: WixOrder): Partial<State> {
 let loadVersion = 0;
 let loadedMember: OrderMember | undefined;
 function clearOrder(state: State): State {
-  return derive({ ...state, title: "", placedAt: "", fulfillmentStatus: "", paymentStatus: "", subtotal: "", shipping: "", tax: "", discount: "", total: "", rows: [], reorderRefs: [], reorderMessage: "", emptyText: "" });
+  return derive({ ...state, title: "", placedAt: "", fulfillmentStatus: "", paymentStatus: "", subtotal: "", shipping: "", tax: "", discount: "", total: "", rows: [], reorderRefs: [], reorderMessage: "", emptyText: "", needsSignIn: false });
 }
 async function load(state: State, arg?: unknown): Promise<State | undefined> {
   const version = ++loadVersion;
@@ -259,9 +264,10 @@ async function load(state: State, arg?: unknown): Promise<State | undefined> {
   const finish = (next: State) => version === loadVersion ? derive(next) : undefined;
   const id = inputId();
   const member = await orderMember();
-  if (!id || !member.email) {
-    return finish({ ...state, status: "ready", emptyText: member.email ? copyParam("order.notFoundEmptyText", "Order not found.") : copyParam("order.signInEmptyText", "Sign in to view this order.") });
-  }
+  const signInText = copyParam("order.signInEmptyText", "Sign in to view this order.");
+  if (!id) return finish({ ...state, status: "ready", emptyText: member.email ? copyParam("order.notFoundEmptyText", "Order not found.") : signInText });
+  const signInRequired = (status: State["status"]) => finish({ ...state, id, status, needsSignIn: true, emptyText: signInText });
+  if (!member.email) return signInRequired("ready");
   try {
     const order = await findOwnedOrder(id, member.email);
     await assertOrderMember(member);
@@ -272,11 +278,11 @@ async function load(state: State, arg?: unknown): Promise<State | undefined> {
   } catch (error) {
     if (version !== loadVersion) return undefined;
     try { await assertOrderMember(member); } catch {
-      return finish({ ...state, status: "error", emptyText: copyParam("order.signInEmptyText", "Sign in to view this order.") });
+      return signInRequired("error");
     }
     const cached = orderAccessDenied(error) ? null : await readCachedOrder(id, member);
     try { await assertOrderMember(member); } catch {
-      return finish({ ...state, status: "error", emptyText: copyParam("order.signInEmptyText", "Sign in to view this order.") });
+      return signInRequired("error");
     }
     if (cached) {
       return finish({ ...state, status: "ready", title: String(cached.title ?? "") || copyTemplate("order.orderTitle", "Order #{number}", { number: id }),
@@ -326,6 +332,8 @@ const svc = defineService<State, {
     cannotReorder: true,
     reorderMessage: "",
     emptyText: "",
+    needsSignIn: false,
+    noSignIn: true,
     isLoading: true,
     notLoading: false,
     isErrored: false,

package/templates/branded-lite/tier5-src/himi-store-account/index.ts

@@ -8,7 +8,7 @@
 // `wix-site-id` header and nothing else, so every read stayed on the baked site while the
 // UI claimed otherwise. Managing several businesses is Owner Lite's job (account auth, a
 // real Sites List, and per-call site scope via `site.forSite`).
-import { defineService } from "@himalaya/state";
+import { defineService, navigate, type NavDirective } from "@himalaya/state";
 import { dispatch } from "@himalaya/dispatch";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
@@ -21,6 +21,9 @@ interface AuthRouteInput {
   returnId?: string;
 }
 
+// The screen's boot input survives refresh; consuming it must survive too.
+let routeInputConsumed = false;
+
 /** Mid-flow open params land on `himalaya.input` (paramKeys on himi_account). */
 function routeInput(): AuthRouteInput {
   const input = (globalThis as { himalaya?: { input?: AuthRouteInput } }).himalaya?.input;
@@ -35,7 +38,7 @@ function strField(arg: unknown, key: string): string {
 
 /** Mid-flow auth (UX F3): intent + return path from himi.open / himalaya.input. */
 function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId">): Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId"> {
-  const route = routeInput();
+  const route = routeInputConsumed ? {} : routeInput();
   return {
     authIntent: strField(arg, "intent") || route.intent || prev.authIntent || "",
     authContextName: strField(arg, "contextName") || route.contextName || prev.authContextName || "",
@@ -44,6 +47,42 @@ function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authConte
   };
 }
 
+/** Where a successful sign-in returns to, or null. Never Account itself — that would
+ *  only push a second copy of the screen the member is already on. */
+function resumeTarget(s: Pick<S, "returnScreenId" | "returnId">): NavDirective | null {
+  if (!s.returnScreenId || s.returnScreenId === "himi_account") return null;
+  return s.returnId ? { screenId: s.returnScreenId, args: { id: s.returnId } } : { screenId: s.returnScreenId };
+}
+
+/** Resume the member-only screen that sent the visitor here, once. The return path is
+ *  consumed so a later refresh cannot fire it again; the host opens the target only if
+ *  it is linkable, the same check an authored `himi.open` gets. */
+function resumeAfterAuth(next: S): S {
+  const target = resumeTarget(next);
+  if (!next.isMember || !target) return next;
+  routeInputConsumed = true;
+  return navigate(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "" }), target);
+}
+
+// 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;
+
+async function authenticate(s: S, submit: () => Promise<unknown>, notMemberMessage: string, failedMessage: string): Promise<S | undefined> {
+  if (authInFlight) return undefined;
+  authInFlight = true;
+  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 {
+    return derive({ ...s, message: failedMessage });
+  } finally {
+    authInFlight = false;
+  }
+}
+
 // Next value of a focus token: monotonic, and never empty once requested. A counter
 // rather than Date.now() — deterministic under test, and immune to two focus
 // requests landing inside the same millisecond.
@@ -123,7 +162,8 @@ interface S {
   authContextName: string;
   returnScreenId: string;
   returnId: string;
-  /** Show Continue after a successful mid-flow sign-in. */
+  /** Show Continue when an already-signed-in member opens Account with a return path.
+   *  A sign-in made here resumes on its own (resumeAfterAuth). */
   hasReturnPath: boolean;
   noReturnPath: boolean;
   returnCta: string;
@@ -296,8 +336,8 @@ const svc = defineService<S, {
   showSignIn: (s: S) => S;
   showRecovery: (s: S) => S;
   resetPassword: (s: S) => Promise<S>;
-  signIn: (s: S) => Promise<S>;
-  register: (s: S) => Promise<S>;
+  signIn: (s: S) => Promise<S | undefined>;
+  register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
 }>("himiStoreAccount", {
   state: derive({
@@ -381,30 +421,29 @@ const svc = defineService<S, {
     },
     signIn: async (s) => {
       if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      try {
-        await dispatch("himi.wix.signInDirect", { email: s.email, password: s.password });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.signInCheckDetails", "Sign in failed. Check your details.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.signInFailed", "Sign in failed. Try again.") });
-      }
+      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.") });
-      try {
-        await dispatch("himi.wix.registerDirect", {
+      return authenticate(
+        s,
+        () => dispatch("himi.wix.registerDirect", {
           email: s.email,
           password: s.password,
           firstName: s.firstName,
           lastName: s.lastName,
-        });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.registerFailed", "Account creation failed. Try another email.") });
-      }
+        }),
+        copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in."),
+        copyParam("storeAccount.registerFailed", "Account creation failed. Try another email."),
+      );
     },
     signOut: async (s) => {
+      routeInputConsumed = true;
       try { await dispatch("himi.wix.signOut"); } catch { /* ignore */ }
       // Do NOT re-probe via getMyData after logout — visitor-scoped my-data can
       // still return a site nickname and resurrect isMember (BUG-3). Trust the

package/templates/community-club/tier5-src/himi-store-account/index.ts

@@ -8,7 +8,7 @@
 // `wix-site-id` header and nothing else, so every read stayed on the baked site while the
 // UI claimed otherwise. Managing several businesses is Owner Lite's job (account auth, a
 // real Sites List, and per-call site scope via `site.forSite`).
-import { defineService } from "@himalaya/state";
+import { defineService, navigate, type NavDirective } from "@himalaya/state";
 import { dispatch } from "@himalaya/dispatch";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
@@ -21,6 +21,9 @@ interface AuthRouteInput {
   returnId?: string;
 }
 
+// The screen's boot input survives refresh; consuming it must survive too.
+let routeInputConsumed = false;
+
 /** Mid-flow open params land on `himalaya.input` (paramKeys on himi_account). */
 function routeInput(): AuthRouteInput {
   const input = (globalThis as { himalaya?: { input?: AuthRouteInput } }).himalaya?.input;
@@ -35,7 +38,7 @@ function strField(arg: unknown, key: string): string {
 
 /** Mid-flow auth (UX F3): intent + return path from himi.open / himalaya.input. */
 function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId">): Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId"> {
-  const route = routeInput();
+  const route = routeInputConsumed ? {} : routeInput();
   return {
     authIntent: strField(arg, "intent") || route.intent || prev.authIntent || "",
     authContextName: strField(arg, "contextName") || route.contextName || prev.authContextName || "",
@@ -44,6 +47,42 @@ function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authConte
   };
 }
 
+/** Where a successful sign-in returns to, or null. Never Account itself — that would
+ *  only push a second copy of the screen the member is already on. */
+function resumeTarget(s: Pick<S, "returnScreenId" | "returnId">): NavDirective | null {
+  if (!s.returnScreenId || s.returnScreenId === "himi_account") return null;
+  return s.returnId ? { screenId: s.returnScreenId, args: { id: s.returnId } } : { screenId: s.returnScreenId };
+}
+
+/** Resume the member-only screen that sent the visitor here, once. The return path is
+ *  consumed so a later refresh cannot fire it again; the host opens the target only if
+ *  it is linkable, the same check an authored `himi.open` gets. */
+function resumeAfterAuth(next: S): S {
+  const target = resumeTarget(next);
+  if (!next.isMember || !target) return next;
+  routeInputConsumed = true;
+  return navigate(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "" }), target);
+}
+
+// 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;
+
+async function authenticate(s: S, submit: () => Promise<unknown>, notMemberMessage: string, failedMessage: string): Promise<S | undefined> {
+  if (authInFlight) return undefined;
+  authInFlight = true;
+  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 {
+    return derive({ ...s, message: failedMessage });
+  } finally {
+    authInFlight = false;
+  }
+}
+
 // Next value of a focus token: monotonic, and never empty once requested. A counter
 // rather than Date.now() — deterministic under test, and immune to two focus
 // requests landing inside the same millisecond.
@@ -123,7 +162,8 @@ interface S {
   authContextName: string;
   returnScreenId: string;
   returnId: string;
-  /** Show Continue after a successful mid-flow sign-in. */
+  /** Show Continue when an already-signed-in member opens Account with a return path.
+   *  A sign-in made here resumes on its own (resumeAfterAuth). */
   hasReturnPath: boolean;
   noReturnPath: boolean;
   returnCta: string;
@@ -296,8 +336,8 @@ const svc = defineService<S, {
   showSignIn: (s: S) => S;
   showRecovery: (s: S) => S;
   resetPassword: (s: S) => Promise<S>;
-  signIn: (s: S) => Promise<S>;
-  register: (s: S) => Promise<S>;
+  signIn: (s: S) => Promise<S | undefined>;
+  register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
 }>("himiStoreAccount", {
   state: derive({
@@ -381,30 +421,29 @@ const svc = defineService<S, {
     },
     signIn: async (s) => {
       if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      try {
-        await dispatch("himi.wix.signInDirect", { email: s.email, password: s.password });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.signInCheckDetails", "Sign in failed. Check your details.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.signInFailed", "Sign in failed. Try again.") });
-      }
+      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.") });
-      try {
-        await dispatch("himi.wix.registerDirect", {
+      return authenticate(
+        s,
+        () => dispatch("himi.wix.registerDirect", {
           email: s.email,
           password: s.password,
           firstName: s.firstName,
           lastName: s.lastName,
-        });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.registerFailed", "Account creation failed. Try another email.") });
-      }
+        }),
+        copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in."),
+        copyParam("storeAccount.registerFailed", "Account creation failed. Try another email."),
+      );
     },
     signOut: async (s) => {
+      routeInputConsumed = true;
       try { await dispatch("himi.wix.signOut"); } catch { /* ignore */ }
       // Do NOT re-probe via getMyData after logout — visitor-scoped my-data can
       // still return a site nickname and resurrect isMember (BUG-3). Trust the

package/templates/events-meetups/tier5-src/himi-store-account/index.ts

@@ -8,7 +8,7 @@
 // `wix-site-id` header and nothing else, so every read stayed on the baked site while the
 // UI claimed otherwise. Managing several businesses is Owner Lite's job (account auth, a
 // real Sites List, and per-call site scope via `site.forSite`).
-import { defineService } from "@himalaya/state";
+import { defineService, navigate, type NavDirective } from "@himalaya/state";
 import { dispatch } from "@himalaya/dispatch";
 import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
@@ -21,6 +21,9 @@ interface AuthRouteInput {
   returnId?: string;
 }
 
+// The screen's boot input survives refresh; consuming it must survive too.
+let routeInputConsumed = false;
+
 /** Mid-flow open params land on `himalaya.input` (paramKeys on himi_account). */
 function routeInput(): AuthRouteInput {
   const input = (globalThis as { himalaya?: { input?: AuthRouteInput } }).himalaya?.input;
@@ -35,7 +38,7 @@ function strField(arg: unknown, key: string): string {
 
 /** Mid-flow auth (UX F3): intent + return path from himi.open / himalaya.input. */
 function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId">): Pick<S, "authIntent" | "authContextName" | "returnScreenId" | "returnId"> {
-  const route = routeInput();
+  const route = routeInputConsumed ? {} : routeInput();
   return {
     authIntent: strField(arg, "intent") || route.intent || prev.authIntent || "",
     authContextName: strField(arg, "contextName") || route.contextName || prev.authContextName || "",
@@ -44,6 +47,42 @@ function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authConte
   };
 }
 
+/** Where a successful sign-in returns to, or null. Never Account itself — that would
+ *  only push a second copy of the screen the member is already on. */
+function resumeTarget(s: Pick<S, "returnScreenId" | "returnId">): NavDirective | null {
+  if (!s.returnScreenId || s.returnScreenId === "himi_account") return null;
+  return s.returnId ? { screenId: s.returnScreenId, args: { id: s.returnId } } : { screenId: s.returnScreenId };
+}
+
+/** Resume the member-only screen that sent the visitor here, once. The return path is
+ *  consumed so a later refresh cannot fire it again; the host opens the target only if
+ *  it is linkable, the same check an authored `himi.open` gets. */
+function resumeAfterAuth(next: S): S {
+  const target = resumeTarget(next);
+  if (!next.isMember || !target) return next;
+  routeInputConsumed = true;
+  return navigate(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "" }), target);
+}
+
+// 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;
+
+async function authenticate(s: S, submit: () => Promise<unknown>, notMemberMessage: string, failedMessage: string): Promise<S | undefined> {
+  if (authInFlight) return undefined;
+  authInFlight = true;
+  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 {
+    return derive({ ...s, message: failedMessage });
+  } finally {
+    authInFlight = false;
+  }
+}
+
 // Next value of a focus token: monotonic, and never empty once requested. A counter
 // rather than Date.now() — deterministic under test, and immune to two focus
 // requests landing inside the same millisecond.
@@ -123,7 +162,8 @@ interface S {
   authContextName: string;
   returnScreenId: string;
   returnId: string;
-  /** Show Continue after a successful mid-flow sign-in. */
+  /** Show Continue when an already-signed-in member opens Account with a return path.
+   *  A sign-in made here resumes on its own (resumeAfterAuth). */
   hasReturnPath: boolean;
   noReturnPath: boolean;
   returnCta: string;
@@ -296,8 +336,8 @@ const svc = defineService<S, {
   showSignIn: (s: S) => S;
   showRecovery: (s: S) => S;
   resetPassword: (s: S) => Promise<S>;
-  signIn: (s: S) => Promise<S>;
-  register: (s: S) => Promise<S>;
+  signIn: (s: S) => Promise<S | undefined>;
+  register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
 }>("himiStoreAccount", {
   state: derive({
@@ -381,30 +421,29 @@ const svc = defineService<S, {
     },
     signIn: async (s) => {
       if (!s.email || !s.password) return derive({ ...s, message: copyParam("storeAccount.validationEmailPassword", "Enter your email and password.") });
-      try {
-        await dispatch("himi.wix.signInDirect", { email: s.email, password: s.password });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.signInCheckDetails", "Sign in failed. Check your details.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.signInFailed", "Sign in failed. Try again.") });
-      }
+      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.") });
-      try {
-        await dispatch("himi.wix.registerDirect", {
+      return authenticate(
+        s,
+        () => dispatch("himi.wix.registerDirect", {
           email: s.email,
           password: s.password,
           firstName: s.firstName,
           lastName: s.lastName,
-        });
-        const next = await probe(optimisticMember(s, s.email));
-        return derive({ ...next, message: next.isMember ? "" : copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in.") });
-      } catch {
-        return derive({ ...s, message: copyParam("storeAccount.registerFailed", "Account creation failed. Try another email.") });
-      }
+        }),
+        copyParam("storeAccount.registerTrySignIn", "Account creation failed. Try signing in."),
+        copyParam("storeAccount.registerFailed", "Account creation failed. Try another email."),
+      );
     },
     signOut: async (s) => {
+      routeInputConsumed = true;
       try { await dispatch("himi.wix.signOut"); } catch { /* ignore */ }
       // Do NOT re-probe via getMyData after logout — visitor-scoped my-data can
       // still return a site nickname and resurrect isMember (BUG-3). Trust the