Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(onboarding): land on Home, and stop flashing on the Google sign-up return (#7549)
teo55f06de203f2
diff --git a/apps/web/src/features/auth/auth.tsx b/apps/web/src/features/auth/auth.tsxindex 55678a3828..1b1567c31e 100644--- a/apps/web/src/features/auth/auth.tsx+++ b/apps/web/src/features/auth/auth.tsx@@ -1,6 +1,7 @@import {clearSignupDraft,Onboarding,+ OnboardingPending,OnboardingSignup,} from '@app/features/onboarding/onboarding';import { LoadingBlock } from '@core/component/LoadingBlock';@@ -49,6 +50,8 @@ export function Login(props: { signupMode?: boolean }) {: undefined}onSignIn={() => navigate('/login')}+ // Desktop sign-up resolves into onboarding's frame either way.+ pending={desktopSignup() ? () => <OnboardingPending /> : undefined}signedIn={(user) => <PostAuthGate user={user} />}/></AuthProvider>diff --git a/apps/web/src/features/auth/browser-test/auth.browser.e2e.ts b/apps/web/src/features/auth/browser-test/auth.browser.e2e.tsindex 83f0966984..a975958756 100644--- a/apps/web/src/features/auth/browser-test/auth.browser.e2e.ts+++ b/apps/web/src/features/auth/browser-test/auth.browser.e2e.ts@@ -122,6 +122,62 @@ test('a returning visitor on sign-up can switch to sign in', async ({await expectLanded(page, '/');});+test('returning from Google sign-up settles into onboarding without flashing', async ({+ page,+}) => {+ // Record, from the first paint of every load, whether the signed-out slide+ // ever shows, and whether the placeholder comes back after a real step.+ await page.addInitScript(() => {+ const w = window as unknown as {+ __frames: { signedOut: boolean; placeholderAfterStep: boolean };+ };+ w.__frames = { signedOut: false, placeholderAfterStep: false };+ let sawStep = false;+ const check = () => {+ const text = document.body?.textContent ?? '';+ if (text.includes('Your work email becomes your Macro sign-in'))+ w.__frames.signedOut = true;+ const placeholder = !!document.querySelector(+ '[aria-label="Loading setup"]'+ );+ if (sawStep && placeholder) w.__frames.placeholderAfterStep = true;+ if (document.querySelector('h1')?.textContent?.includes('Connect your'))+ sawStep = true;+ };+ new MutationObserver(check).observe(document, {+ childList: true,+ subtree: true,+ characterData: true,+ });+ });+ await openFixture(page, '/?page=signup&latency=500&sso=cookie', {+ ssoEmail: '[email protected]',+ });+ await page.getByRole('button', { name: 'Get started' }).click();+ await page.getByRole('button', { name: 'Continue' }).click();+ await page.getByRole('button', { name: 'Continue' }).click();+ await page.getByRole('button', { name: 'Connect work email' }).click();++ // Back from Google: the session takes 500ms to resolve on the fresh load.+ await expect(+ page.getByRole('heading', { level: 1, name: /Connect your work/ })+ ).toBeVisible();+ // Settled: the step's inbox lookup has landed.+ await expect(+ page.getByRole('button', { name: 'Connect work email' })+ ).toBeEnabled();+ expect(+ await page.evaluate(+ () =>+ (+ window as unknown as {+ __frames: { signedOut: boolean; placeholderAfterStep: boolean };+ }+ ).__frames+ )+ ).toEqual({ signedOut: false, placeholderAfterStep: false });+});+test('a mobile-web visitor gets a desktop link instead of signing up', async ({page,}) => {diff --git a/apps/web/src/features/auth/browser-test/fixture.tsx b/apps/web/src/features/auth/browser-test/fixture.tsxindex 0df6a5075b..94d2ded525 100644--- a/apps/web/src/features/auth/browser-test/fixture.tsx+++ b/apps/web/src/features/auth/browser-test/fixture.tsx@@ -7,6 +7,7 @@ import { OnboardingProvider } from '../../onboarding/context/onboarding-context'import { createFakeOnboarding } from '../../onboarding/tests/fake-onboarding-context';import { renderInviteOfferStub } from '../../onboarding/tests/invite-offer-stub';import { OnboardingFlowView } from '../../onboarding/views/onboarding-flow-view';+import { OnboardingPendingView } from '../../onboarding/views/onboarding-pending-view';import { SignupJourneyView } from '../../onboarding/views/signup-journey-view';import { AuthProvider, type AuthUser } from '../context/auth-context';import { sessionTokenParam } from '../core/email-code';@@ -26,6 +27,8 @@ import { FIXTURE_KEYS } from './fixture-keys';*/const params = Object.fromEntries(new URLSearchParams(location.search));const page = params.page ?? 'login';+/** `?latency=ms`: both backends load like a cold page instead of instantly. */+const latencyMs = Number(params.latency ?? 0);const read = <T,>(key: string): T | undefined => {const raw = sessionStorage.getItem(key);return raw ? (JSON.parse(raw) as T) : undefined;@@ -45,15 +48,29 @@ const auth = createFakeAuth({onChange: (world) => write(FIXTURE_KEYS.auth, world),ssoEmail: sessionStorage.getItem(FIXTURE_KEYS.ssoEmail) ?? undefined,- // The identity provider returns to the same page with a session code.+ // The identity provider returns to the same page with a session code;+ // `?sso=cookie` models hosted web instead, where cookies are already set.ssoRedirect: async (provider, _intent, email) => {- const token = `${provider}-${Date.now()}`;- auth.update((draft) => {- draft.sessionTokens[token] = email;- });- location.assign(`${location.pathname}?page=${page}&token=${token}`);+ if (params.sso === 'cookie') {+ auth.update((draft) => {+ draft.accounts[email] ??= { tutorialComplete: false };+ draft.user = {+ id: `macro|${email}`,+ email,+ tutorialComplete: draft.accounts[email].tutorialComplete,+ };+ });+ location.assign(location.href);+ } else {+ const token = `${provider}-${Date.now()}`;+ auth.update((draft) => {+ draft.sessionTokens[token] = email;+ });+ location.assign(`${location.pathname}?page=${page}&token=${token}`);+ }await new Promise(() => {});},+ sessionLatencyMs: latencyMs,});write(FIXTURE_KEYS.auth, structuredClone(unwrap(auth.world)));@@ -79,6 +96,7 @@ function createOnboardingFor(user: AuthUser) {location.reload();await new Promise(() => {});},+ latencyMs,});write(FIXTURE_KEYS.onboarding, structuredClone(unwrap(fake.world)));@@ -159,6 +177,9 @@ function Fixture() {: undefined}onSignIn={() => location.assign(`${location.pathname}?page=login`)}+ pending={+ page === 'signup' ? () => <OnboardingPendingView /> : undefined+ }signedIn={(user) => <SignedIn user={user} />}/></Match>diff --git a/apps/web/src/features/auth/tests/fake-auth-context.ts b/apps/web/src/features/auth/tests/fake-auth-context.tsindex b2682ef7c9..6d18a52368 100644--- a/apps/web/src/features/auth/tests/fake-auth-context.ts+++ b/apps/web/src/features/auth/tests/fake-auth-context.ts@@ -71,6 +71,8 @@ export function createFakeAuth(intent: AuthIntent,email: string) => Promise<void>;+ /** Report the session as loading this long, like a cold page load. */+ sessionLatencyMs?: number;} = {}) {const [world, setWorld] = createStore<FakeAuthWorld>({@@ -93,10 +95,15 @@ export function createFakeAuth(draft.pendingEmail = undefined;});+ const [settled, setSettled] = createSignal(!options.sessionLatencyMs);+ if (options.sessionLatencyMs)+ setTimeout(() => setSettled(true), options.sessionLatencyMs);const session = (): AuthSession =>- world.user- ? { t: 'signed-in', user: { ...world.user } }- : { t: 'signed-out' };+ !settled()+ ? { t: 'loading' }+ : world.user+ ? { t: 'signed-in', user: { ...world.user } }+ : { t: 'signed-out' };const context: AuthContext = {session,diff --git a/apps/web/src/features/auth/views/auth-view.test.tsx b/apps/web/src/features/auth/views/auth-view.test.tsxindex a419093616..a9e091699c 100644--- a/apps/web/src/features/auth/views/auth-view.test.tsx+++ b/apps/web/src/features/auth/views/auth-view.test.tsx@@ -245,4 +245,29 @@ describe('desktop sign-up', () => {fireEvent.click(screen.getByRole('button', { name: 'Sign in instead' }));expect(signIn).toHaveBeenCalledOnce();});++ it('holds a pending frame while the session resolves, then shows the signed-out slides', async () => {+ vi.useFakeTimers({ shouldAdvanceTime: true });+ renderWithFakeAuth(+ () => (+ <AuthView+ intent="signup"+ showApple={false}+ compact={false}+ signupJourney={(slots) => <Journey {...slots} />}+ pending={() => <p data-testid="pending">Loading</p>}+ signedIn={() => <p data-testid="signed-in" />}+ />+ ),+ {},+ { sessionLatencyMs: 300 }+ );+ expect(screen.getByTestId('pending')).toBeTruthy();+ expect(+ screen.queryByRole('button', { name: 'Connect work email' })+ ).toBeNull();+ await vi.advanceTimersByTimeAsync(300);+ await screen.findByRole('button', { name: 'Connect work email' });+ expect(screen.queryByTestId('pending')).toBeNull();+ });});diff --git a/apps/web/src/features/auth/views/auth-view.tsx b/apps/web/src/features/auth/views/auth-view.tsxindex b9ca527a52..c65ca1a9c4 100644--- a/apps/web/src/features/auth/views/auth-view.tsx+++ b/apps/web/src/features/auth/views/auth-view.tsx@@ -39,6 +39,11 @@ export function AuthView(props: {signupJourney?: (slots: SignupJourneySlots) => JSX.Element;/** Switches a returning visitor from sign-up to sign-in. */onSignIn?: () => void;+ /**+ * Shown while the session is still resolving on a cold load, instead of the+ * signed-out screens a returning visitor would otherwise see flash by.+ */+ pending?: () => JSX.Element;/** What a signed-in visitor sees instead. */signedIn: (user: AuthUser) => JSX.Element;}) {@@ -112,8 +117,10 @@ export function AuthView(props: {);return (- <Show when={user()} keyed fallback={signedOut()}>- {(signedIn) => props.signedIn(signedIn)}+ <Show when={context.session().t !== 'loading'} fallback={props.pending?.()}>+ <Show when={user()} keyed fallback={signedOut()}>+ {(signedIn) => props.signedIn(signedIn)}+ </Show></Show>);}diff --git a/apps/web/src/features/onboarding/browser-test/fixture.tsx b/apps/web/src/features/onboarding/browser-test/fixture.tsxindex 82b9d4e0b6..6cc7c05199 100644--- a/apps/web/src/features/onboarding/browser-test/fixture.tsx+++ b/apps/web/src/features/onboarding/browser-test/fixture.tsx@@ -42,6 +42,9 @@ const fake = createFakeOnboarding(loadWorld(), {location.assign(`${location.pathname}?view=flow`);await new Promise(() => {});},+ // `?latency=ms`: the viewer and sources load like a cold page instead of instantly.+ latencyMs: Number(params.latency ?? 0),+ viewerLatencyMs: Number(params.latency ?? 0),checkoutUrl: (tier) =>sessionStorage.getItem(FIXTURE_KEYS.checkoutOutcome) === 'cancel'? `${location.pathname}?view=flow&subscriptionCancel=true`diff --git a/apps/web/src/features/onboarding/browser-test/onboarding.browser.e2e.ts b/apps/web/src/features/onboarding/browser-test/onboarding.browser.e2e.tsindex 4c6340839e..956d809c34 100644--- a/apps/web/src/features/onboarding/browser-test/onboarding.browser.e2e.ts+++ b/apps/web/src/features/onboarding/browser-test/onboarding.browser.e2e.ts@@ -60,7 +60,7 @@ test('a new user signs up, connects everything, and starts the trial', async ({await page.getByRole('button', { name: 'Start 30 day trial' }).click();// Stripe returns on the success leg; the flow waits for the webhook's license.- await expectLanded(page, 'Entered Macro at /getting-started');+ await expectLanded(page, 'Entered Macro at /home');const world = await fakeWorld(page);expect(world.viewer).toMatchObject({tutorialComplete: true,@@ -182,7 +182,7 @@ test('an invite’s free months replace the trial and keep its promotion', asyncpage.getByRole('button', { name: 'Start 30 day trial' })).toHaveCount(0);await page.getByRole('button', { name: 'Claim your free months' }).click();- await expectLanded(page, 'Entered Macro at /getting-started');+ await expectLanded(page, 'Entered Macro at /home');expect((await fakeWorld(page)).viewer?.licensed).toBe(true);});diff --git a/apps/web/src/features/onboarding/components/step-fallback.tsx b/apps/web/src/features/onboarding/components/step-fallback.tsxnew file mode 100644index 0000000000..f2995f5509--- /dev/null+++ b/apps/web/src/features/onboarding/components/step-fallback.tsx@@ -0,0 +1,14 @@+import LogoIcon from '@icon/macro-logo.svg';++/** The quiet placeholder while a step's data is still on its way. */+export function StepFallback() {+ return (+ <div+ role="status"+ aria-label="Loading setup"+ class="flex justify-center py-10"+ >+ <LogoIcon class="size-6 animate-pulse text-ink/30" />+ </div>+ );+}diff --git a/apps/web/src/features/onboarding/core/next-target.test.ts b/apps/web/src/features/onboarding/core/next-target.test.tsindex a91ad94cf0..212c011116 100644--- a/apps/web/src/features/onboarding/core/next-target.test.ts+++ b/apps/web/src/features/onboarding/core/next-target.test.ts@@ -1,9 +1,5 @@import { describe, expect, it } from 'vitest';-import {- afterOnboardingTarget,- bypassTarget,- sanitizeNext,-} from './next-target';+import { afterOnboardingTarget, sanitizeNext } from './next-target';describe('sanitizeNext', () => {it.each([@@ -28,16 +24,7 @@ describe('afterOnboardingTarget', () => {);});- it('falls back to Getting Started', () => {- expect(afterOnboardingTarget(undefined, '//evil.com')).toBe(- '/getting-started'- );- });-});--describe('bypassTarget', () => {- it('keeps the deep link, else enters the app instead of Getting Started', () => {- expect(bypassTarget(undefined, '/channel/x')).toBe('/channel/x');- expect(bypassTarget(undefined, undefined)).toBe('/home');+ it('falls back to Home', () => {+ expect(afterOnboardingTarget(undefined, '//evil.com')).toBe('/home');});});diff --git a/apps/web/src/features/onboarding/core/next-target.ts b/apps/web/src/features/onboarding/core/next-target.tsindex 23fedd7be9..e835c5c429 100644--- a/apps/web/src/features/onboarding/core/next-target.ts+++ b/apps/web/src/features/onboarding/core/next-target.ts@@ -1,8 +1,8 @@-import { AFTER_SETUP_ROUTE, DEFAULT_ROUTE } from '@app/constants/defaultRoute';+import { DEFAULT_ROUTE } from '@app/constants/defaultRoute';/*** Same-app relative paths only. A `next` at the default route is not a real- * deep link, so it falls through to the post-setup landing.+ * deep link, so it falls through to the default landing.*/export function sanitizeNext(value: unknown): string | undefined {return typeof value === 'string' &&@@ -14,18 +14,13 @@ export function sanitizeNext(value: unknown): string | undefined {: undefined;}-function firstDeepLink(candidates: readonly unknown[]): string | undefined {+/** Where leaving onboarding lands: the first valid deep link, else Home. */+export function afterOnboardingTarget(+ ...candidates: readonly unknown[]+): string {for (const candidate of candidates) {const next = sanitizeNext(candidate);if (next) return next;}- return undefined;+ return DEFAULT_ROUTE;}--/** Where finishing onboarding lands: the first valid deep link, else Getting Started. */-export const afterOnboardingTarget = (...candidates: readonly unknown[]) =>- firstDeepLink(candidates) ?? AFTER_SETUP_ROUTE;--/** Where bypassing lands: the deep link, else straight in the app — Getting Started is onboarding too. */-export const bypassTarget = (...candidates: readonly unknown[]) =>- firstDeepLink(candidates) ?? DEFAULT_ROUTE;diff --git a/apps/web/src/features/onboarding/onboarding.tsx b/apps/web/src/features/onboarding/onboarding.tsxindex 34d1f0925b..92897d6512 100644--- a/apps/web/src/features/onboarding/onboarding.tsx+++ b/apps/web/src/features/onboarding/onboarding.tsx@@ -60,3 +60,4 @@ export function OnboardingSignup(props: {}export { clearSignupDraft } from './primitives/flow-storage';+export { OnboardingPendingView as OnboardingPending } from './views/onboarding-pending-view';diff --git a/apps/web/src/features/onboarding/primitives/flow-finish.test.ts b/apps/web/src/features/onboarding/primitives/flow-finish.test.tsindex 67d84a076e..f649c0ab64 100644--- a/apps/web/src/features/onboarding/primitives/flow-finish.test.ts+++ b/apps/web/src/features/onboarding/primitives/flow-finish.test.ts@@ -89,10 +89,10 @@ describe('leaving onboarding', () => {expect(navigate).toHaveBeenCalledWith('/channel/live');});- it('lands on Getting Started without a deep link', async () => {+ it('lands on Home without a deep link', async () => {const { finish, navigate } = setup({}, '/home');await finish.finishFree(true);- expect(navigate).toHaveBeenCalledWith('/getting-started');+ expect(navigate).toHaveBeenCalledWith('/home');});it('stays on setup with saved progress when completion fails', async () => {diff --git a/apps/web/src/features/onboarding/primitives/flow-finish.ts b/apps/web/src/features/onboarding/primitives/flow-finish.tsindex 04fb1686c6..6ee5efc2fe 100644--- a/apps/web/src/features/onboarding/primitives/flow-finish.ts+++ b/apps/web/src/features/onboarding/primitives/flow-finish.ts@@ -5,11 +5,7 @@ import type {OnboardingContext,} from '../context/onboarding-context';import type { CheckoutTerms } from '../core/checkout';-import {- afterOnboardingTarget,- bypassTarget,- sanitizeNext,-} from '../core/next-target';+import { afterOnboardingTarget, sanitizeNext } from '../core/next-target';import { clearFlowProgress, readSavedNext, saveNext } from './flow-storage';type FinishCapabilities = Pick<@@ -19,7 +15,7 @@ type FinishCapabilities = Pick</*** The "leave onboarding" workflow: complete onboarding, then land in the app- * (the preserved `?next` deep link, or the Getting Started checklist).+ * (the preserved `?next` deep link, or Home).*/export function createFlowFinish(context: FinishCapabilities,@@ -126,7 +122,7 @@ export function createFlowFinish(bypass: (step: string) =>leave({skipped: true,- target: bypassTarget(options.next(), readSavedNext()),+ target: afterTarget(),onCompleted: () => context.track('onboarding_v4_bypassed', { step }),}),};diff --git a/apps/web/src/features/onboarding/primitives/onboarding-flow.ts b/apps/web/src/features/onboarding/primitives/onboarding-flow.tsindex 8637c49c83..c159033633 100644--- a/apps/web/src/features/onboarding/primitives/onboarding-flow.ts+++ b/apps/web/src/features/onboarding/primitives/onboarding-flow.ts@@ -1,4 +1,10 @@-import { type Accessor, createEffect, createSignal, on } from 'solid-js';+import {+ type Accessor,+ createEffect,+ createSignal,+ on,+ untrack,+} from 'solid-js';import type {Loadable,OnboardingContext,@@ -63,24 +69,23 @@ export function createOnboardingFlow(// Restore once per viewer: the signed-out draft's OAuth return wins, then// saved progress; a checkout return always lands on the plan step.- createEffect(- on(- () => viewer()?.id,- (userId) => {- if (!userId || step()) return;- const draft = readSignupDraft();- const initial = restoreOnboardingStep(- draft?.authenticating ? 'work' : readSavedStep(userId),- options.checkoutReturn() !== undefined- );- saveStep(userId, initial);- if (draft?.authenticating && draft.accent)- context.applyAccent(draft.accent, userId);- clearSignupDraft();- setStep(initial);- }- )- );+ const restore = (userId: string | undefined) => {+ if (!userId || step()) return;+ const draft = readSignupDraft();+ const initial = restoreOnboardingStep(+ draft?.authenticating ? 'work' : readSavedStep(userId),+ options.checkoutReturn() !== undefined+ );+ saveStep(userId, initial);+ if (draft?.authenticating && draft.accent)+ context.applyAccent(draft.accent, userId);+ clearSignupDraft();+ setStep(initial);+ };+ // A viewer already known (sign-in just resolved it) restores before the+ // first render, so the flow never paints a placeholder in between.+ untrack(() => restore(viewer()?.id));+ createEffect(on(() => viewer()?.id, restore, { defer: true }));let started = false;createEffect(() => {diff --git a/apps/web/src/features/onboarding/tests/fake-onboarding-context.ts b/apps/web/src/features/onboarding/tests/fake-onboarding-context.tsindex e94a4760cf..ad58a54a89 100644--- a/apps/web/src/features/onboarding/tests/fake-onboarding-context.ts+++ b/apps/web/src/features/onboarding/tests/fake-onboarding-context.ts@@ -94,6 +94,10 @@ export function createFakeOnboarding(onChange?: (world: FakeOnboardingWorld) => void;roundTrip?: (apply: () => void) => Promise<void>;checkoutUrl?: (tier: PaidPlanTier) => string;+ /** Report the sources as loading this long, like a cold page load. */+ latencyMs?: number;+ /** The viewer's own delay; a host that just resolved sign-in already has it. */+ viewerLatencyMs?: number;} = {}) {const [world, setWorld] = createStore<FakeOnboardingWorld>({@@ -115,18 +119,29 @@ export function createFakeOnboarding(if (message === undefined) return;throw new Error(message);};+ const [settled, setSettled] = createSignal(!options.latencyMs);+ if (options.latencyMs) setTimeout(() => setSettled(true), options.latencyMs);const loadable = <T>(failure: keyof FakeOnboardingWorld['failures'],value: () => T): Loadable<T> =>- world.failures[failure] !== undefined- ? { t: 'error' }- : { t: 'ready', value: value() };+ !settled()+ ? { t: 'loading' }+ : world.failures[failure] !== undefined+ ? { t: 'error' }+ : { t: 'ready', value: value() };+ const [viewerSettled, setViewerSettled] = createSignal(+ !options.viewerLatencyMs+ );+ if (options.viewerLatencyMs)+ setTimeout(() => setViewerSettled(true), options.viewerLatencyMs);const viewerState = (): ViewerState =>- world.viewer- ? { t: 'signed-in', viewer: { ...world.viewer } }- : { t: 'signed-out' };+ !viewerSettled()+ ? { t: 'loading' }+ : world.viewer+ ? { t: 'signed-in', viewer: { ...world.viewer } }+ : { t: 'signed-out' };const context: OnboardingContext = {viewer: viewerState,@@ -141,7 +156,8 @@ export function createFakeOnboarding(});return viewerState();},- createOnboardingRecord: () => () => ({ t: 'ready', value: world.record }),+ createOnboardingRecord: () => () =>+ settled() ? { t: 'ready', value: world.record } : { t: 'loading' },createEmailAccounts: () => ({accounts: () => loadable('emailAccounts', () => world.emailAccounts),refresh: async () => {},diff --git a/apps/web/src/features/onboarding/views/onboarding-flow-view.test.tsx b/apps/web/src/features/onboarding/views/onboarding-flow-view.test.tsxindex fbdfc3b5d1..dadb4cb709 100644--- a/apps/web/src/features/onboarding/views/onboarding-flow-view.test.tsx+++ b/apps/web/src/features/onboarding/views/onboarding-flow-view.test.tsx@@ -156,12 +156,9 @@ describe('onboarding flow', () => {world: { webhookPollsRemaining: 1 },});await heading('Free Claude & GPT for 30 days.');- await waitFor(- () => expect(navigate).toHaveBeenCalledWith('/getting-started'),- {- timeout: 3_000,- }- );+ await waitFor(() => expect(navigate).toHaveBeenCalledWith('/home'), {+ timeout: 3_000,+ });});it('starts hosted checkout from the trial offer', async () => {@@ -254,4 +251,13 @@ describe('onboarding flow', () => {await heading('Built for teams.');expect(screen.queryByRole('button', { name: 'Bypass' })).toBeNull();});++ it('paints the resumed step on the first render, without a placeholder in between', () => {+ setup({ resume: 'team' });+ // Synchronous: no effect or timer has run yet.+ expect(screen.queryByRole('status', { name: 'Loading setup' })).toBeNull();+ expect(+ screen.getByRole('heading', { level: 1, name: 'Built for teams.' })+ ).toBeTruthy();+ });});diff --git a/apps/web/src/features/onboarding/views/onboarding-flow-view.tsx b/apps/web/src/features/onboarding/views/onboarding-flow-view.tsxindex 9988a510e9..c3fe78ed3d 100644--- a/apps/web/src/features/onboarding/views/onboarding-flow-view.tsx+++ b/apps/web/src/features/onboarding/views/onboarding-flow-view.tsx@@ -1,4 +1,3 @@-import LogoIcon from '@icon/macro-logo.svg';import { createEffect, Match, onCleanup, Show, Switch } from 'solid-js';import { BypassButton } from '../components/bypass-button';import {@@ -7,6 +6,7 @@ import {} from '../components/motion/step-change';import { OnboardingShell } from '../components/onboarding-shell';import { PlanComparison } from '../components/plan-comparison';+import { StepFallback } from '../components/step-fallback';import { OnboardingTrustDetails } from '../components/trust-details';import { useOnboardingContext } from '../context/onboarding-context';import type { CheckoutReturn } from '../core/checkout';@@ -25,18 +25,6 @@ import { StoryStageView } from './story-stage-view';import { TeamStep } from './team-step';import { ToolsStep } from './tools-step';-function StepFallback() {- return (- <div- role="status"- aria-label="Loading setup"- class="flex justify-center py-10"- >- <LogoIcon class="size-6 animate-pulse text-ink/30" />- </div>- );-}-/** The signed-in onboarding steps, from the workspace slides to the trial offer. */export function OnboardingFlowView(props: {/** A deep link to land on after onboarding. */diff --git a/apps/web/src/features/onboarding/views/onboarding-pending-view.tsx b/apps/web/src/features/onboarding/views/onboarding-pending-view.tsxnew file mode 100644index 0000000000..01c81875b0--- /dev/null+++ b/apps/web/src/features/onboarding/views/onboarding-pending-view.tsx@@ -0,0 +1,15 @@+import { OnboardingShell } from '../components/onboarding-shell';+import { StepFallback } from '../components/step-fallback';++/**+ * The onboarding frame while the session is still resolving, so a Google+ * sign-up return reads as one screen into onboarding instead of flashing the+ * signed-out slides first.+ */+export function OnboardingPendingView() {+ return (+ <OnboardingShell wide>+ <StepFallback />+ </OnboardingShell>+ );+}diff --git a/apps/web/src/lib/constants/defaultRoute.ts b/apps/web/src/lib/constants/defaultRoute.tsindex 9c94fdd1f5..549b945c92 100644--- a/apps/web/src/lib/constants/defaultRoute.ts+++ b/apps/web/src/lib/constants/defaultRoute.ts@@ -1,6 +1 @@export const DEFAULT_ROUTE = '/home';--/**- * Where leaving onboarding lands when no deep link was preserved (`?next=`)- */-export const AFTER_SETUP_ROUTE = '/getting-started';diff --git a/docs/AGENT_GUIDE/login.md b/docs/AGENT_GUIDE/login.mdindex 04d8ca3836..b06aa9b2a7 100644--- a/docs/AGENT_GUIDE/login.md+++ b/docs/AGENT_GUIDE/login.md@@ -126,7 +126,7 @@ Cancellation returns to this step. A successful returnpolls the server's license state, completes onboarding, and enters the app withoutan extra confirmation click. A pending webhook shows a retryable confirmationstate. The Guest scroll cue opens a comparison with a separate Guest continuation.-Both completion paths preserve an original `next` destination. Old saved email,+Both completion paths preserve an original `next` destination and otherwise land on Home (`/app/home`). Old saved email,connector, building, and summary step names are migrated on resume.## Public onboarding preview