@hexclave/next 1.0.51 → 1.0.53

package/src/lib/hexclave-app/apps/implementations/client-app-impl.cross-domain.test.ts

@@ -648,6 +648,133 @@ describe("StackClientApp cross-domain auth", () => {
     expect(redirectedUrl).toBe("/settings?tab=profile");
   });
 
+  it("restores a dropped after_auth_return_to from the sessionStorage mirror when redirecting after sign-in", async () => {
+    const previousWindow = globalThis.window;
+    const previousDocument = globalThis.document;
+    const hadPreviousWindow = Reflect.has(globalThis, "window");
+    const sessionStorageMap = new Map<string, string>();
+    const windowMock = {
+      location: {
+        href: "https://demo.example.test/handler/sign-in?after_auth_return_to=%2Fmusic%3Ftrack%3D1",
+      },
+      sessionStorage: {
+        getItem: (key: string) => sessionStorageMap.get(key) ?? null,
+        setItem: (key: string, value: string) => {
+          sessionStorageMap.set(key, value);
+        },
+        removeItem: (key: string) => {
+          sessionStorageMap.delete(key);
+        },
+      },
+    };
+    Reflect.set(globalThis, "window", windowMock);
+    globalThis.document = createMockDocument();
+
+    try {
+      // The constructor mirrors the redirect-back state from the arrival URL into sessionStorage.
+      const clientApp = new StackClientApp({
+        baseUrl: "http://localhost:12345",
+        projectId: "00000000-0000-4000-8000-000000000011",
+        publishableClientKey: "stack-pk-test",
+        tokenStore: "memory",
+        redirectMethod: "window",
+        noAutomaticPrefetch: true,
+      });
+
+      // Intermediate hops (MFA, magic link, OAuth round-trips, ...) dropped the query params.
+      windowMock.location.href = "https://demo.example.test/handler/mfa";
+
+      const redirectUrl = await clientApp[hexclaveAppInternalsSymbol].getRedirectToHandlerUrl("afterSignIn");
+      expect(redirectUrl).toBe("/music?track=1");
+
+      // noRedirectBack opts out of the mirror just like it opts out of the query param.
+      const noRedirectBackUrl = await clientApp[hexclaveAppInternalsSymbol].getRedirectToHandlerUrl("afterSignIn", { noRedirectBack: true });
+      expect(new URL(noRedirectBackUrl, "https://demo.example.test").pathname).toBe("/");
+    } finally {
+      globalThis.document = previousDocument;
+      if (hadPreviousWindow) {
+        Reflect.set(globalThis, "window", previousWindow);
+      } else {
+        Reflect.deleteProperty(globalThis, "window");
+      }
+    }
+  });
+
+  it("restores dropped cross-domain handoff state from the sessionStorage mirror when redirecting after sign-in", async () => {
+    const projectId = "00000000-0000-4000-8000-000000000012";
+    const previousWindow = globalThis.window;
+    const hadPreviousWindow = Reflect.has(globalThis, "window");
+    const sessionStorageMap = new Map<string, string>();
+
+    const handoffState = "mirror-handoff-state";
+    const handoffCodeChallenge = "abcdefghijklmnopqrstuvwxyzABCDEFG_0123456789-._~";
+    const handoffAfterCallbackRedirect = "https://demo.example.test/dashboard";
+    const redirectBackUrl = new URL("https://demo.example.test/handler/oauth-callback");
+    redirectBackUrl.searchParams.set("hexclave_cross_domain_auth", "1");
+    redirectBackUrl.searchParams.set("hexclave_cross_domain_state", handoffState);
+    redirectBackUrl.searchParams.set("hexclave_cross_domain_code_challenge", handoffCodeChallenge);
+    redirectBackUrl.searchParams.set("hexclave_cross_domain_after_callback_redirect_url", handoffAfterCallbackRedirect);
+
+    const arrivalUrl = new URL(`https://${projectId}.built-with-stack-auth.com/handler/sign-in`);
+    arrivalUrl.searchParams.set("after_auth_return_to", redirectBackUrl.toString());
+    arrivalUrl.searchParams.set("hexclave_cross_domain_state", handoffState);
+    arrivalUrl.searchParams.set("hexclave_cross_domain_code_challenge", handoffCodeChallenge);
+    arrivalUrl.searchParams.set("hexclave_cross_domain_after_callback_redirect_url", handoffAfterCallbackRedirect);
+
+    const previousDocument = globalThis.document;
+    const windowMock = {
+      location: {
+        href: arrivalUrl.toString(),
+      },
+      sessionStorage: {
+        getItem: (key: string) => sessionStorageMap.get(key) ?? null,
+        setItem: (key: string, value: string) => {
+          sessionStorageMap.set(key, value);
+        },
+        removeItem: (key: string) => {
+          sessionStorageMap.delete(key);
+        },
+      },
+    };
+    Reflect.set(globalThis, "window", windowMock);
+    globalThis.document = createMockDocument();
+
+    try {
+      const clientApp = new StackClientApp({
+        baseUrl: "http://localhost:12345",
+        projectId,
+        publishableClientKey: "stack-pk-test",
+        tokenStore: "memory",
+        redirectMethod: "window",
+        noAutomaticPrefetch: true,
+      });
+      const crossDomainAuthorizeRedirect = "https://demo.example.test/handler/oauth-callback?code=minted-code&state=mirror-handoff-state";
+      const createCrossDomainAuthRedirectUrlSpy = vi
+        .spyOn(clientApp as any, "_createCrossDomainAuthRedirectUrl")
+        .mockResolvedValue(crossDomainAuthorizeRedirect);
+
+      // All redirect-back query params were dropped before the after-sign-in redirect.
+      windowMock.location.href = `https://${projectId}.built-with-stack-auth.com/handler/sign-in`;
+
+      const redirectUrl = await clientApp[hexclaveAppInternalsSymbol].getRedirectToHandlerUrl("afterSignIn");
+
+      expect(createCrossDomainAuthRedirectUrlSpy).toHaveBeenCalledWith(expect.objectContaining({
+        redirectUri: redirectBackUrl.toString(),
+        state: handoffState,
+        codeChallenge: handoffCodeChallenge,
+        afterCallbackRedirectUrl: handoffAfterCallbackRedirect,
+      }));
+      expect(redirectUrl).toBe(crossDomainAuthorizeRedirect);
+    } finally {
+      globalThis.document = previousDocument;
+      if (hadPreviousWindow) {
+        Reflect.set(globalThis, "window", previousWindow);
+      } else {
+        Reflect.deleteProperty(globalThis, "window");
+      }
+    }
+  });
+
   it("ignores stale session callbacks after a newer refresh token owns the token store", async () => {
     const clientApp = new StackClientApp({
       baseUrl: "http://localhost:12345",

package/src/lib/hexclave-app/apps/implementations/client-app-impl.ts

@@ -59,6 +59,8 @@ import { TeamPermission } from "../../permissions";
 import { AdminOwnedProject, AdminProjectUpdateOptions, Project, adminProjectCreateOptionsToCrud } from "../../projects";
 import { EditableTeamMemberProfile, ReceivedTeamInvitation, SentTeamInvitation, Team, TeamCreateOptions, TeamUpdateOptions, TeamUser, teamCreateOptionsToCrud, teamUpdateOptionsToCrud } from "../../teams";
 import { buildCliAuthConfirmUrl, getHostedHandlerUrl, isHostedHandlerUrlForProject, resolveHandlerUrls } from "../../url-targets";
+import { augmentUrlWithPersistedRedirectBackState, saveRedirectBackStateFromUrl } from "./redirect-back-state";
+import { recordRedirectAndThrowIfLoopDetected } from "./redirect-loop-breaker";
 import { ActiveSession, Auth, BaseUser, CurrentUser, InternalUserExtra, OAuthProvider, ProjectCurrentUser, SyncedPartialUser, TokenPartialUser, UserExtra, UserUpdateOptions, userUpdateOptionsToCrud, withUserDestructureGuard } from "../../users";
 import { StackClientApp, StackClientAppConstructorOptions, StackClientAppJson } from "../interfaces/client-app";
 import { _HexclaveAdminAppImplIncomplete } from "./admin-app-impl";
@@ -732,6 +734,11 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
       this._trackPendingAuthResolution(async () => {
         await this._maybeHandleNestedCrossDomainAuth(urlAtConstructionTime);
       });
+
+      // Mirror any redirect-back state from the page URL into sessionStorage, so the return trip
+      // survives later hops that drop the query params (OAuth provider round-trips, MFA, magic
+      // links, ...). See redirect-back-state.ts for details.
+      saveRedirectBackStateFromUrl({ url: urlAtConstructionTime, projectId: this.projectId });
     }
 
     if (isBrowserLike() && resolvedOptions.devTool !== false) {
@@ -2903,6 +2910,17 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
   }
 
   protected async _redirectTo(options: { url: URL | string, replace?: boolean }) {
+    if (this._redirectMethod !== "none" && isBrowserLike()) {
+      const currentUrl = new URL(window.location.href);
+      const targetUrl = new URL(options.url, currentUrl);
+      // Circuit breaker: if this exact redirect keeps repeating, throw so the initiating page
+      // renders its error state instead of bouncing the user between pages forever.
+      recordRedirectAndThrowIfLoopDetected({ currentUrl, targetUrl });
+      // Client-side navigations don't re-run the app constructor, so mirror redirect-back state
+      // on every SDK-driven hop too (see redirect-back-state.ts).
+      saveRedirectBackStateFromUrl({ url: targetUrl, projectId: this.projectId });
+    }
+
     if (this._redirectMethod === "none") {
       return;
     } else if (isReactServer && this._redirectMethod === "nextjs") {
@@ -2967,9 +2985,21 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
       throw new Error(`No URL for handler name ${handlerName}`);
     }
 
-    const currentUrl = isReactServer || typeof window === "undefined"
+    let currentUrl = isReactServer || typeof window === "undefined"
       ? null
       : new URL(window.location.href);
+    if (
+      currentUrl != null
+      && options?.noRedirectBack !== true
+      && (handlerName === "afterSignIn" || handlerName === "afterSignUp")
+    ) {
+      // If intermediate hops dropped the redirect-back query params, restore them from the
+      // sessionStorage mirror so the user still returns to where they came from instead of
+      // stranding on the default post-auth page (on hosted components, that would be the hosted
+      // welcome page). The restored URL goes through the same _isTrusted / cross-domain-authorize
+      // validation below as one read from query params.
+      currentUrl = augmentUrlWithPersistedRedirectBackState({ currentUrl, projectId: this.projectId });
+    }
     const plan = await planRedirectToHandler({
       handlerName,
       rawHandlerUrl,
@@ -4071,6 +4101,9 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
       awaitPendingAuthResolutions: async () => {
         await this._awaitPendingAuthResolutions();
       },
+      isTrustedRedirectUrl: async (url: string) => {
+        return await this._isTrusted(url);
+      },
     };
   };
 

package/src/lib/hexclave-app/apps/implementations/common.ts

@@ -12,6 +12,7 @@ import { ReactPromise, runAsynchronously } from "@hexclave/shared/dist/utils/pro
 import { suspendIfSsr, use } from "@hexclave/shared/dist/utils/react";
 import { Result } from "@hexclave/shared/dist/utils/results";
 import { Store } from "@hexclave/shared/dist/utils/stores";
+import { deindent } from "@hexclave/shared/dist/utils/strings";
 import { getDefaultApiUrls } from "@hexclave/shared/dist/utils/urls";
 import React, { useCallback } from "react"; // THIS_LINE_PLATFORM react-like
 import { envVars } from "../../../../generated/env";
@@ -44,7 +45,23 @@ const showMissingConfigAlertInBrowser = (message: string) => {
 };
 
 const throwMissingProjectIdError = (): never => {
-  const message = "Welcome to Hexclave! It seems that you haven't provided a project ID. Please create a project on the Hexclave dashboard at https://app.hexclave.com and put it in the HEXCLAVE_PROJECT_ID environment variable.";
+  const message = deindent`
+    Welcome to Hexclave!
+    
+    It seems that you haven't provided a project ID.
+
+    ${envVars.NODE_ENV?.includes("dev") ? deindent`
+      You are running this app in development mode. Make sure that your start command is wrapped in a call to the Hexclave CLI: \`npx @hexclave/cli dev --config-file <file> -- <command>\`
+
+      Alternatively, you can also connect to a Cloud project's environment variables instead by creating a project on the Hexclave dashboard at https://app.hexclave.com and put its information in the HEXCLAVE_PROJECT_ID environment variable.
+    ` : envVars.NODE_ENV?.includes("prod") ? deindent`
+      It seems you are running a project in production. Please create a project on the Hexclave dashboard at https://app.hexclave.com and put it in the HEXCLAVE_PROJECT_ID environment variable.
+    ` : deindent`
+      - If you are running a development project and would like to connect the local Hexclave dashboard, wrap your start command in: \`npx @hexclave/cli dev --config-file <file> -- <command>\`
+
+      - If you are running a project in production and would like to connect to Hexclave Cloud, create a project on the Hexclave dashboard at https://app.hexclave.com and put its information in the HEXCLAVE_PROJECT_ID environment variable.
+    `}
+  `;
   showMissingConfigAlertInBrowser(message);
   return throwErr(new Error(message));
 };

package/src/lib/hexclave-app/apps/implementations/redirect-back-state.test.ts

@@ -0,0 +1,134 @@
+
+//===========================================
+// THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template
+//===========================================
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { augmentUrlWithPersistedRedirectBackState, readRedirectBackState, saveRedirectBackStateFromUrl } from "./redirect-back-state";
+
+function createMockSessionStorage() {
+  const map = new Map<string, string>();
+  return {
+    getItem: (key: string) => map.get(key) ?? null,
+    setItem: (key: string, value: string) => {
+      map.set(key, value);
+    },
+    removeItem: (key: string) => {
+      map.delete(key);
+    },
+  };
+}
+
+const previousWindow = Reflect.get(globalThis, "window");
+const hadPreviousWindow = Reflect.has(globalThis, "window");
+const projectId = "00000000-0000-4000-8000-000000000000";
+
+describe("redirect-back state mirror", () => {
+  beforeEach(() => {
+    Reflect.set(globalThis, "window", { sessionStorage: createMockSessionStorage() });
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-01-01T00:00:00Z"));
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    if (hadPreviousWindow) {
+      Reflect.set(globalThis, "window", previousWindow);
+    } else {
+      Reflect.deleteProperty(globalThis, "window");
+    }
+  });
+
+  it("round-trips redirect-back state including the cross-domain handoff params", () => {
+    const url = new URL("https://hosted.example.test/handler/sign-in");
+    url.searchParams.set("after_auth_return_to", "https://app.example.test/handler/oauth-callback?hexclave_cross_domain_auth=1");
+    url.searchParams.set("hexclave_cross_domain_state", "the-state");
+    url.searchParams.set("hexclave_cross_domain_code_challenge", "the-code-challenge");
+    url.searchParams.set("hexclave_cross_domain_after_callback_redirect_url", "https://app.example.test/dashboard");
+
+    saveRedirectBackStateFromUrl({ url, projectId });
+
+    expect(readRedirectBackState({ projectId })).toEqual({
+      afterAuthReturnTo: "https://app.example.test/handler/oauth-callback?hexclave_cross_domain_auth=1",
+      crossDomainState: "the-state",
+      crossDomainCodeChallenge: "the-code-challenge",
+      crossDomainAfterCallbackRedirectUrl: "https://app.example.test/dashboard",
+      savedAtMillis: Date.now(),
+    });
+  });
+
+  it("returns null when nothing was saved and does not save URLs without after_auth_return_to", () => {
+    expect(readRedirectBackState({ projectId })).toBeNull();
+    saveRedirectBackStateFromUrl({ url: new URL("https://hosted.example.test/handler/sign-in?foo=bar"), projectId });
+    expect(readRedirectBackState({ projectId })).toBeNull();
+  });
+
+  it("expires the state after the TTL", () => {
+    const url = new URL("https://hosted.example.test/handler/sign-in?after_auth_return_to=/music");
+    saveRedirectBackStateFromUrl({ url, projectId });
+
+    vi.advanceTimersByTime(29 * 60 * 1000);
+    expect(readRedirectBackState({ projectId })).not.toBeNull();
+
+    vi.advanceTimersByTime(2 * 60 * 1000);
+    expect(readRedirectBackState({ projectId })).toBeNull();
+  });
+
+  it("scopes the state per project", () => {
+    const url = new URL("https://hosted.example.test/handler/sign-in?after_auth_return_to=/music");
+    saveRedirectBackStateFromUrl({ url, projectId });
+    expect(readRedirectBackState({ projectId: "11111111-1111-4111-8111-111111111111" })).toBeNull();
+    expect(readRedirectBackState({ projectId })).not.toBeNull();
+  });
+
+  it("discards malformed stored values", () => {
+    const storage = createMockSessionStorage();
+    storage.setItem(`hexclave-redirect-back-state-${projectId}`, "{not json");
+    Reflect.set(globalThis, "window", { sessionStorage: storage });
+    expect(readRedirectBackState({ projectId })).toBeNull();
+
+    storage.setItem(`hexclave-redirect-back-state-${projectId}`, JSON.stringify({ some: "other-shape" }));
+    expect(readRedirectBackState({ projectId })).toBeNull();
+  });
+
+  it("restores dropped params onto a URL, but never overrides an explicit after_auth_return_to", () => {
+    const arrivalUrl = new URL("https://hosted.example.test/handler/sign-in");
+    arrivalUrl.searchParams.set("after_auth_return_to", "https://app.example.test/handler/oauth-callback");
+    arrivalUrl.searchParams.set("hexclave_cross_domain_state", "the-state");
+    arrivalUrl.searchParams.set("hexclave_cross_domain_code_challenge", "the-code-challenge");
+    arrivalUrl.searchParams.set("hexclave_cross_domain_after_callback_redirect_url", "https://app.example.test/dashboard");
+    saveRedirectBackStateFromUrl({ url: arrivalUrl, projectId });
+
+    // Params were dropped along the way: restore all of them.
+    const strippedUrl = new URL("https://hosted.example.test/handler/mfa");
+    const augmented = augmentUrlWithPersistedRedirectBackState({ currentUrl: strippedUrl, projectId });
+    expect(augmented.searchParams.get("after_auth_return_to")).toBe("https://app.example.test/handler/oauth-callback");
+    expect(augmented.searchParams.get("hexclave_cross_domain_state")).toBe("the-state");
+    expect(augmented.searchParams.get("hexclave_cross_domain_code_challenge")).toBe("the-code-challenge");
+    expect(augmented.searchParams.get("hexclave_cross_domain_after_callback_redirect_url")).toBe("https://app.example.test/dashboard");
+    // The input URL is not mutated.
+    expect(strippedUrl.searchParams.has("after_auth_return_to")).toBe(false);
+
+    // Explicit query params always win over the mirror.
+    const explicitUrl = new URL("https://hosted.example.test/handler/sign-in?after_auth_return_to=/somewhere-else");
+    const unchanged = augmentUrlWithPersistedRedirectBackState({ currentUrl: explicitUrl, projectId });
+    expect(unchanged.toString()).toBe(explicitUrl.toString());
+  });
+
+  it("leaves the URL unchanged when there is no mirrored state", () => {
+    const url = new URL("https://hosted.example.test/handler/sign-in");
+    const augmented = augmentUrlWithPersistedRedirectBackState({ currentUrl: url, projectId });
+    expect(augmented.toString()).toBe(url.toString());
+  });
+
+  it("degrades to a no-op when sessionStorage is unavailable", () => {
+    Reflect.set(globalThis, "window", {
+      get sessionStorage(): Storage {
+        throw new Error("Storage is disabled");
+      },
+    });
+    const url = new URL("https://hosted.example.test/handler/sign-in?after_auth_return_to=/music");
+    saveRedirectBackStateFromUrl({ url, projectId });
+    expect(readRedirectBackState({ projectId })).toBeNull();
+    expect(augmentUrlWithPersistedRedirectBackState({ currentUrl: url, projectId }).toString()).toBe(url.toString());
+  });
+});

package/src/lib/hexclave-app/apps/implementations/redirect-back-state.ts

@@ -0,0 +1,140 @@
+
+//===========================================
+// THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template
+//===========================================
+import { readSessionStorageItem, removeSessionStorageItem, writeSessionStorageItem } from "../../../../utils/session-storage";
+import { crossDomainAuthQueryParams } from "./redirect-page-urls";
+
+/**
+ * Resilience layer for the redirect-back ("return to where you came from") state of auth flows.
+ *
+ * The primary transport for this state is query params (`after_auth_return_to` +
+ * `hexclave_cross_domain_*`), which must survive every hop of the auth flow (sign-in page, OAuth
+ * provider round-trips, MFA, magic links, ...). Historically, any hop that dropped these params
+ * stranded the user on the wrong page after auth — on hosted components, that meant the hosted
+ * welcome page instead of the customer's app.
+ *
+ * This module mirrors the state into sessionStorage whenever it appears in a URL, so
+ * `redirectToAfterSignIn`/`redirectToAfterSignUp` can restore it if the params were dropped along
+ * the way. Query params always take precedence; the mirror is only a fallback. It is scoped
+ * per-tab (sessionStorage), per-origin (sessionStorage again), and per-project, and it expires
+ * after a TTL. Restored URLs still go through the exact same trust validation as URLs read from
+ * query params (the `_isTrusted` gate client-side and the cross-domain authorize endpoint
+ * server-side), so the mirror never widens the set of allowed destinations.
+ */
+
+// Deliberately NOT consumed/cleared on use: React can invoke the after-sign-in redirect twice
+// (strict mode, remounts), and consuming on first read would make the second invocation fall back
+// to the default post-auth page and race the correct redirect. Staleness is bounded by the TTL
+// instead, and a stale entry merely returns the user to the last page that started an auth flow
+// in this tab — which is also what they'd expect.
+//
+// The TTL must stay below the 1h lifetime of the outer PKCE verifier cookie (see
+// saveVerifierAndState in cookie.ts): the mirrored cross-domain params are useless once their
+// verifier cookie on the app domain has expired.
+const redirectBackStateTtlMillis = 30 * 60 * 1000;
+
+export type PersistedRedirectBackState = {
+  /**
+   * The `after_auth_return_to` value exactly as it appeared in the URL (possibly relative).
+   * sessionStorage is per-origin, so restoring it into a URL later always resolves it against the
+   * same origin it was saved from.
+   */
+  afterAuthReturnTo: string,
+  crossDomainState: string | null,
+  crossDomainCodeChallenge: string | null,
+  crossDomainAfterCallbackRedirectUrl: string | null,
+  /** Wall-clock ms (Date.now()); must survive page loads, so performance.now() is not usable. */
+  savedAtMillis: number,
+};
+
+function getStorageKey(projectId: string): string {
+  return `hexclave-redirect-back-state-${projectId}`;
+}
+
+function isPersistedRedirectBackState(value: unknown): value is PersistedRedirectBackState {
+  return (
+    typeof value === "object"
+    && value !== null
+    && "afterAuthReturnTo" in value && typeof value.afterAuthReturnTo === "string"
+    && "crossDomainState" in value && (value.crossDomainState === null || typeof value.crossDomainState === "string")
+    && "crossDomainCodeChallenge" in value && (value.crossDomainCodeChallenge === null || typeof value.crossDomainCodeChallenge === "string")
+    && "crossDomainAfterCallbackRedirectUrl" in value && (value.crossDomainAfterCallbackRedirectUrl === null || typeof value.crossDomainAfterCallbackRedirectUrl === "string")
+    && "savedAtMillis" in value && typeof value.savedAtMillis === "number"
+  );
+}
+
+/**
+ * Mirrors the redirect-back state from the given URL into sessionStorage, if it has any. Called
+ * with the page URL at app construction time (full page loads) and with the target URL of every
+ * SDK-driven redirect (client-side navigations, which don't re-run the constructor).
+ */
+export function saveRedirectBackStateFromUrl(options: { url: URL, projectId: string }): void {
+  const afterAuthReturnTo = options.url.searchParams.get("after_auth_return_to");
+  if (afterAuthReturnTo == null) {
+    return;
+  }
+  const state: PersistedRedirectBackState = {
+    afterAuthReturnTo,
+    crossDomainState: options.url.searchParams.get(crossDomainAuthQueryParams.state),
+    crossDomainCodeChallenge: options.url.searchParams.get(crossDomainAuthQueryParams.codeChallenge),
+    crossDomainAfterCallbackRedirectUrl: options.url.searchParams.get(crossDomainAuthQueryParams.afterCallbackRedirectUrl),
+    savedAtMillis: Date.now(),
+  };
+  writeSessionStorageItem(getStorageKey(options.projectId), JSON.stringify(state));
+}
+
+export function readRedirectBackState(options: { projectId: string }): PersistedRedirectBackState | null {
+  const storageKey = getStorageKey(options.projectId);
+  const raw = readSessionStorageItem(storageKey);
+  if (raw == null) {
+    return null;
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    // Corrupted value (eg. written by a different SDK version); losing the fallback for this flow
+    // is the pre-existing behavior, so just discard it.
+    removeSessionStorageItem(storageKey);
+    return null;
+  }
+  if (!isPersistedRedirectBackState(parsed)) {
+    removeSessionStorageItem(storageKey);
+    return null;
+  }
+  const ageMillis = Date.now() - parsed.savedAtMillis;
+  if (ageMillis < 0 || ageMillis > redirectBackStateTtlMillis) {
+    removeSessionStorageItem(storageKey);
+    return null;
+  }
+  return parsed;
+}
+
+/**
+ * Returns a copy of `currentUrl` with any redirect-back query params that were dropped along the
+ * way restored from the sessionStorage mirror. If `currentUrl` already carries
+ * `after_auth_return_to`, it is returned unchanged — explicit query params always win.
+ */
+export function augmentUrlWithPersistedRedirectBackState(options: { currentUrl: URL, projectId: string }): URL {
+  if (options.currentUrl.searchParams.has("after_auth_return_to")) {
+    return options.currentUrl;
+  }
+  const persisted = readRedirectBackState({ projectId: options.projectId });
+  if (persisted == null) {
+    return options.currentUrl;
+  }
+  const augmented = new URL(options.currentUrl.toString());
+  augmented.searchParams.set("after_auth_return_to", persisted.afterAuthReturnTo);
+  const crossDomainParamValues = [
+    [crossDomainAuthQueryParams.state, persisted.crossDomainState],
+    [crossDomainAuthQueryParams.codeChallenge, persisted.crossDomainCodeChallenge],
+    [crossDomainAuthQueryParams.afterCallbackRedirectUrl, persisted.crossDomainAfterCallbackRedirectUrl],
+  ] as const;
+  for (const [paramName, persistedValue] of crossDomainParamValues) {
+    if (persistedValue != null && !augmented.searchParams.has(paramName)) {
+      augmented.searchParams.set(paramName, persistedValue);
+    }
+  }
+  return augmented;
+}

package/src/lib/hexclave-app/apps/implementations/redirect-loop-breaker.test.ts

@@ -0,0 +1,127 @@
+
+//===========================================
+// THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template
+//===========================================
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { recordRedirectAndThrowIfLoopDetected } from "./redirect-loop-breaker";
+
+function createMockSessionStorage() {
+  const map = new Map<string, string>();
+  return {
+    getItem: (key: string) => map.get(key) ?? null,
+    setItem: (key: string, value: string) => {
+      map.set(key, value);
+    },
+    removeItem: (key: string) => {
+      map.delete(key);
+    },
+  };
+}
+
+const previousWindow = Reflect.get(globalThis, "window");
+const hadPreviousWindow = Reflect.has(globalThis, "window");
+
+function record(from: string, to: string) {
+  recordRedirectAndThrowIfLoopDetected({
+    currentUrl: new URL(from),
+    targetUrl: new URL(to),
+  });
+}
+
+describe("recordRedirectAndThrowIfLoopDetected", () => {
+  beforeEach(() => {
+    Reflect.set(globalThis, "window", { sessionStorage: createMockSessionStorage() });
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-01-01T00:00:00Z"));
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    if (hadPreviousWindow) {
+      Reflect.set(globalThis, "window", previousWindow);
+    } else {
+      Reflect.deleteProperty(globalThis, "window");
+    }
+  });
+
+  it("allows distinct redirects in quick succession", () => {
+    for (let i = 0; i < 20; i++) {
+      record(`https://app.example.test/page-${i}`, `https://app.example.test/page-${i + 1}`);
+    }
+  });
+
+  it("throws once the same redirect repeats 5 times within the window", () => {
+    for (let i = 0; i < 4; i++) {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+      vi.advanceTimersByTime(1000);
+    }
+    expect(() => {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    }).toThrowError(/Redirect loop detected/);
+  });
+
+  it("treats redirects that differ only in query params or hash as identical", () => {
+    // Real loops usually rotate nonce-style params (code, state, after_auth_return_to) each cycle.
+    for (let i = 0; i < 4; i++) {
+      record(
+        `https://app.example.test/dashboard?code=code-${i}`,
+        `https://hosted.example.test/handler/sign-in?state=state-${i}#frag-${i}`,
+      );
+    }
+    expect(() => {
+      record("https://app.example.test/dashboard?code=final", "https://hosted.example.test/handler/sign-in?state=final");
+    }).toThrowError(/Redirect loop detected/);
+  });
+
+  it("does not throw when the identical redirects are spread out beyond the window", () => {
+    for (let i = 0; i < 20; i++) {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+      vi.advanceTimersByTime(31_000);
+    }
+  });
+
+  it("allows the same redirect again after a loop was broken", () => {
+    for (let i = 0; i < 4; i++) {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    }
+    expect(() => {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    }).toThrowError(/Redirect loop detected/);
+    // The breadcrumbs for the broken loop are dropped, so a manual retry isn't instantly blocked.
+    record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+  });
+
+  it("counts self-redirects (same origin and path) towards loops", () => {
+    for (let i = 0; i < 4; i++) {
+      record(`https://hosted.example.test/handler/sign-in?attempt=${i}`, "https://hosted.example.test/handler/sign-in");
+    }
+    expect(() => {
+      record("https://hosted.example.test/handler/sign-in?attempt=final", "https://hosted.example.test/handler/sign-in");
+    }).toThrowError(/Redirect loop detected/);
+  });
+
+  it("degrades to a no-op when sessionStorage is unavailable", () => {
+    Reflect.set(globalThis, "window", {
+      get sessionStorage(): Storage {
+        throw new Error("Storage is disabled");
+      },
+    });
+    for (let i = 0; i < 20; i++) {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    }
+  });
+
+  it("recovers from corrupted breadcrumb storage", () => {
+    const storage = createMockSessionStorage();
+    storage.setItem("hexclave-redirect-loop-breadcrumbs", "{not json");
+    Reflect.set(globalThis, "window", { sessionStorage: storage });
+    record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    // After recovery, loop detection works again.
+    for (let i = 0; i < 3; i++) {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    }
+    expect(() => {
+      record("https://app.example.test/dashboard", "https://hosted.example.test/handler/sign-in");
+    }).toThrowError(/Redirect loop detected/);
+  });
+});