From b56597deec29a5d324942dab2cc53c3e7d65dc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Uruchurtu?= <im@vheissu.me>
Date: Thu, 9 Jul 2026 17:55:10 -0600
Subject: [PATCH 1/3] feat(web): replace blocking customer survey

---
 apps/web/src/app/(app)/layout.tsx             |   2 +
 .../web/src/app/account-verification/page.tsx |   3 +-
 .../app/customer-source-survey/page.test.ts   |  51 ++++
 .../src/app/customer-source-survey/page.tsx   |  16 +-
 apps/web/src/app/get-started/page.tsx         |   3 +-
 .../src/app/users/after-sign-in/route.test.ts |   4 -
 .../web/src/app/users/after-sign-in/route.tsx |   3 -
 .../components/CustomerSourcePrompt.test.ts   |  23 ++
 .../src/components/CustomerSourcePrompt.tsx   | 125 ++++++++++
 .../src/components/CustomerSourceSurvey.tsx   |  72 ------
 apps/web/src/lib/survey-redirect.ts           |  16 --
 apps/web/src/routers/user-router.test.ts      | 225 ++----------------
 .../account-verification-redirect.test.ts     |  63 ++---
 apps/web/src/tests/survey-redirect.test.ts    |  47 ----
 .../tests/e2e/app-shell-accessibility.spec.ts |   1 -
 apps/web/tests/e2e/auth.setup.ts              |  19 +-
 .../tests/e2e/customer-source-survey.spec.ts  | 203 ----------------
 .../e2e/get-started-dashboard-link.spec.ts    |  19 +-
 apps/web/tests/e2e/onboarding-wizard.spec.ts  |  13 -
 apps/web/tests/setup-smoke/profile.spec.ts    |   1 -
 dev/seed/AGENTS.md                            |   3 +-
 dev/seed/app/create-user.ts                   |   9 +-
 dev/seed/app/org-dashboard.ts                 |   1 -
 dev/seed/coding-plans/demo-data.ts            |   1 -
 dev/seed/cost-insights/spend-evidence.ts      |   2 -
 25 files changed, 261 insertions(+), 664 deletions(-)
 create mode 100644 apps/web/src/app/customer-source-survey/page.test.ts
 create mode 100644 apps/web/src/components/CustomerSourcePrompt.test.ts
 create mode 100644 apps/web/src/components/CustomerSourcePrompt.tsx
 delete mode 100644 apps/web/src/components/CustomerSourceSurvey.tsx
 delete mode 100644 apps/web/src/lib/survey-redirect.ts
 delete mode 100644 apps/web/src/tests/survey-redirect.test.ts
 delete mode 100644 apps/web/tests/e2e/customer-source-survey.spec.ts

diff --git a/apps/web/src/app/(app)/layout.tsx b/apps/web/src/app/(app)/layout.tsx
index eac1d1ad50..418c5d9457 100644
--- a/apps/web/src/app/(app)/layout.tsx
+++ b/apps/web/src/app/(app)/layout.tsx
@@ -9,6 +9,7 @@ import { AdminOmnibox } from '@/components/admin-omnibox';
 import { AppShellSkipLink } from '@/components/AppShellSkipLink';
 import { PrefetchedOrganizations } from './components/PrefetchedOrganizations';
 import { PlatformPresenceMount } from './components/PlatformPresenceMount';
+import { CustomerSourcePrompt } from '@/components/CustomerSourcePrompt';
 export default function AppLayout({ children }: { children: React.ReactNode }) {
   return (
     <RoleTestingProvider>
@@ -31,6 +32,7 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
               </div>
             </PrefetchedOrganizations>
           </SidebarProvider>
+          <CustomerSourcePrompt />
         </EventServiceProvider>
       </PageTitleProvider>
       <AdminOmnibox />
diff --git a/apps/web/src/app/account-verification/page.tsx b/apps/web/src/app/account-verification/page.tsx
index f681883e30..0c35672994 100644
--- a/apps/web/src/app/account-verification/page.tsx
+++ b/apps/web/src/app/account-verification/page.tsx
@@ -8,7 +8,6 @@ import { getUserFromAuthOrRedirect } from '@/lib/user/server';
 import { getStytchStatus, handleSignupPromotion, type SignupSource } from '@/lib/stytch';
 import { PageContainer } from '@/components/layouts/PageContainer';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
-import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
 import { isOpenclawAdvisorCallback } from '@/lib/signup-source';
 import { isCreditCampaignCallback, lookupCampaignBySlug } from '@/lib/credit-campaigns';
 
@@ -76,7 +75,7 @@ export default async function AccountVerificationPage({ searchParams }: AppPageP
   if (stytchStatus !== null) {
     const hasUsableCallback = isValidCallback && !stripCreditCampaignCallback;
     const finalDestination = hasUsableCallback ? callbackStr : '/get-started';
-    redirect(maybeInterceptWithSurvey(user, finalDestination));
+    redirect(finalDestination);
   }
 
   return (
diff --git a/apps/web/src/app/customer-source-survey/page.test.ts b/apps/web/src/app/customer-source-survey/page.test.ts
new file mode 100644
index 0000000000..784198ba5d
--- /dev/null
+++ b/apps/web/src/app/customer-source-survey/page.test.ts
@@ -0,0 +1,51 @@
+const mockRedirect = jest.fn<never, [string]>(() => {
+  throw new Error('NEXT_REDIRECT');
+});
+
+jest.mock('next/navigation', () => ({
+  redirect: (...args: [string]) => mockRedirect(...args),
+}));
+
+const mockGetUserFromAuthOrRedirect = jest.fn<Promise<void>, [string]>();
+jest.mock('@/lib/user/server', () => ({
+  getUserFromAuthOrRedirect: (...args: [string]) => mockGetUserFromAuthOrRedirect(...args),
+}));
+
+import CustomerSourceSurveyPage from './page';
+
+async function renderPage(searchParams: Record<string, string> = {}) {
+  try {
+    await CustomerSourceSurveyPage({
+      searchParams: Promise.resolve(searchParams),
+      params: Promise.resolve(undefined),
+    });
+  } catch (error) {
+    if (!(error instanceof Error) || error.message !== 'NEXT_REDIRECT') throw error;
+  }
+}
+
+describe('GET /customer-source-survey', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockGetUserFromAuthOrRedirect.mockResolvedValue();
+  });
+
+  it('redirects authenticated users to the dashboard resolver', async () => {
+    await renderPage();
+
+    expect(mockGetUserFromAuthOrRedirect).toHaveBeenCalledWith('/users/sign_in');
+    expect(mockRedirect).toHaveBeenCalledWith('/get-started');
+  });
+
+  it('preserves a valid in-app callbackPath', async () => {
+    await renderPage({ callbackPath: '/profile' });
+
+    expect(mockRedirect).toHaveBeenCalledWith('/profile');
+  });
+
+  it('rejects an external callbackPath', async () => {
+    await renderPage({ callbackPath: 'https://example.com' });
+
+    expect(mockRedirect).toHaveBeenCalledWith('/get-started');
+  });
+});
diff --git a/apps/web/src/app/customer-source-survey/page.tsx b/apps/web/src/app/customer-source-survey/page.tsx
index 020280eab0..1223f94b05 100644
--- a/apps/web/src/app/customer-source-survey/page.tsx
+++ b/apps/web/src/app/customer-source-survey/page.tsx
@@ -1,28 +1,16 @@
 import { redirect } from 'next/navigation';
 import { getUserFromAuthOrRedirect } from '@/lib/user/server';
-import { KiloCardLayout } from '@/components/KiloCardLayout';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
-import { CustomerSourceSurvey } from '@/components/CustomerSourceSurvey';
 
 export default async function CustomerSourceSurveyPage({ searchParams }: AppPageProps) {
-  const user = await getUserFromAuthOrRedirect('/users/sign_in');
+  await getUserFromAuthOrRedirect('/users/sign_in');
   const params = await searchParams;
 
-  // Determine where to go after survey
   const callbackParam = params.callbackPath;
   const redirectPath =
     callbackParam && typeof callbackParam === 'string' && isValidCallbackPath(callbackParam)
       ? callbackParam
       : '/get-started';
 
-  // If already answered, skip past
-  if (user.customer_source !== null) {
-    redirect(redirectPath);
-  }
-
-  return (
-    <KiloCardLayout title="Where did you hear about Kilo Code?" className="max-w-2xl">
-      <CustomerSourceSurvey redirectPath={redirectPath} />
-    </KiloCardLayout>
-  );
+  redirect(redirectPath);
 }
diff --git a/apps/web/src/app/get-started/page.tsx b/apps/web/src/app/get-started/page.tsx
index df06d3c209..6236bc3318 100644
--- a/apps/web/src/app/get-started/page.tsx
+++ b/apps/web/src/app/get-started/page.tsx
@@ -1,5 +1,4 @@
 import { buildLandingRedirectUrl } from '@/lib/landing-redirect';
-import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
 import { getProfileRedirectPath, getUserFromAuth } from '@/lib/user/server';
 import { redirect } from 'next/navigation';
 
@@ -18,5 +17,5 @@ export default async function GetStartedPage({ searchParams }: AppPageProps) {
     redirect('/account-verification');
   }
 
-  redirect(maybeInterceptWithSurvey(user, await getProfileRedirectPath(user)));
+  redirect(await getProfileRedirectPath(user));
 }
diff --git a/apps/web/src/app/users/after-sign-in/route.test.ts b/apps/web/src/app/users/after-sign-in/route.test.ts
index e4ade47914..c879eec9cf 100644
--- a/apps/web/src/app/users/after-sign-in/route.test.ts
+++ b/apps/web/src/app/users/after-sign-in/route.test.ts
@@ -31,10 +31,6 @@ jest.mock('@/lib/impact/debug', () => ({
 
 jest.mock('@/lib/posthog', () => jest.fn(() => ({ capture: jest.fn() })));
 
-jest.mock('@/lib/survey-redirect', () => ({
-  maybeInterceptWithSurvey: jest.fn((_, responsePath: string) => responsePath),
-}));
-
 jest.mock('@/lib/credit-campaigns', () => ({
   isCreditCampaignCallback: jest.fn(() => null),
   lookupCampaignBySlug: jest.fn(),
diff --git a/apps/web/src/app/users/after-sign-in/route.tsx b/apps/web/src/app/users/after-sign-in/route.tsx
index d1f6202916..6d7c083ce1 100644
--- a/apps/web/src/app/users/after-sign-in/route.tsx
+++ b/apps/web/src/app/users/after-sign-in/route.tsx
@@ -1,6 +1,5 @@
 import { getProfileRedirectPath, getUserFromAuth } from '@/lib/user/server';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
-import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
 import PostHogClient from '@/lib/posthog';
 import { getAffiliateAttribution } from '@/lib/affiliate-attribution';
 import { recordAffiliateAttributionAndQueueParentEvent } from '@/lib/impact/affiliate-events';
@@ -152,8 +151,6 @@ export async function GET(request: NextRequest) {
       } else {
         responsePath = '/account-verification';
       }
-    } else {
-      responsePath = maybeInterceptWithSurvey(user, responsePath);
     }
   }
 
diff --git a/apps/web/src/components/CustomerSourcePrompt.test.ts b/apps/web/src/components/CustomerSourcePrompt.test.ts
new file mode 100644
index 0000000000..f1766297ac
--- /dev/null
+++ b/apps/web/src/components/CustomerSourcePrompt.test.ts
@@ -0,0 +1,23 @@
+import { shouldShowCustomerSourcePrompt } from './CustomerSourcePrompt';
+
+describe('shouldShowCustomerSourcePrompt', () => {
+  it('shows for a user without a saved source on app pages', () => {
+    expect(shouldShowCustomerSourcePrompt(null, '/profile')).toBe(true);
+  });
+
+  it('does not show after a user answers or dismisses the prompt', () => {
+    expect(shouldShowCustomerSourcePrompt('GitHub', '/profile')).toBe(false);
+    expect(shouldShowCustomerSourcePrompt('', '/profile')).toBe(false);
+    expect(shouldShowCustomerSourcePrompt(undefined, '/profile')).toBe(false);
+  });
+
+  it('does not show during product setup flows', () => {
+    expect(shouldShowCustomerSourcePrompt(null, '/gastown/onboarding')).toBe(false);
+    expect(
+      shouldShowCustomerSourcePrompt(
+        null,
+        '/organizations/2dce8b38-32dc-4b71-b0ec-0e3d646cbdc4/welcome'
+      )
+    ).toBe(false);
+  });
+});
diff --git a/apps/web/src/components/CustomerSourcePrompt.tsx b/apps/web/src/components/CustomerSourcePrompt.tsx
new file mode 100644
index 0000000000..e9c5cf4a0a
--- /dev/null
+++ b/apps/web/src/components/CustomerSourcePrompt.tsx
@@ -0,0 +1,125 @@
+'use client';
+
+import { useState } from 'react';
+import { usePathname } from 'next/navigation';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { LoaderCircle } from 'lucide-react';
+import { useUser } from '@/hooks/useUser';
+import { useTRPC } from '@/lib/trpc/utils';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+
+const ORGANIZATION_WELCOME_PATH = /^\/organizations\/[0-9a-f-]{36}\/welcome$/;
+
+export function shouldShowCustomerSourcePrompt(
+  customerSource: string | null | undefined,
+  pathname: string
+): boolean {
+  return (
+    customerSource === null &&
+    pathname !== '/gastown/onboarding' &&
+    !ORGANIZATION_WELCOME_PATH.test(pathname)
+  );
+}
+
+export function CustomerSourcePrompt() {
+  const pathname = usePathname();
+  const { data: user } = useUser();
+  const trpc = useTRPC();
+  const queryClient = useQueryClient();
+  const [source, setSource] = useState('');
+  const [dismissed, setDismissed] = useState(false);
+
+  function completePrompt() {
+    setDismissed(true);
+    void queryClient.invalidateQueries({ queryKey: ['user'] });
+  }
+
+  const submitSource = useMutation(
+    trpc.user.submitCustomerSource.mutationOptions({
+      onSuccess: completePrompt,
+    })
+  );
+  const dismissPrompt = useMutation(
+    trpc.user.skipCustomerSource.mutationOptions({
+      onSuccess: completePrompt,
+    })
+  );
+
+  const isPending = submitSource.isPending || dismissPrompt.isPending;
+  const error = submitSource.error ?? dismissPrompt.error;
+
+  if (dismissed || !shouldShowCustomerSourcePrompt(user?.customer_source, pathname)) {
+    return null;
+  }
+
+  function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    const trimmedSource = source.trim();
+    if (trimmedSource) submitSource.mutate({ source: trimmedSource });
+  }
+
+  return (
+    <aside
+      aria-labelledby="customer-source-prompt-title"
+      className="fixed right-4 bottom-[max(5rem,env(safe-area-inset-bottom))] z-40 w-[calc(100vw-2rem)] max-w-sm sm:right-5"
+    >
+      <Card className="bg-card/95 shadow-lg backdrop-blur-sm">
+        <CardHeader className="p-4 pb-3">
+          <CardTitle id="customer-source-prompt-title">
+            Where did you hear about Kilo Code?
+          </CardTitle>
+          <CardDescription>A short answer helps us understand what is working.</CardDescription>
+        </CardHeader>
+        <CardContent className="p-4 pt-0">
+          <form onSubmit={handleSubmit} className="space-y-3">
+            <div className="space-y-1.5">
+              <Label htmlFor="customer-source">Source</Label>
+              <Input
+                id="customer-source"
+                value={source}
+                onChange={event => setSource(event.target.value)}
+                placeholder="GitHub, a teammate, YouTube..."
+                maxLength={1000}
+                disabled={isPending}
+                aria-invalid={error !== null}
+                aria-describedby={error ? 'customer-source-error' : undefined}
+              />
+              {error && (
+                <p id="customer-source-error" className="text-destructive type-body" role="alert">
+                  We could not save your answer. Please try again.
+                </p>
+              )}
+            </div>
+            <div className="flex items-center justify-between gap-2">
+              <Button
+                type="button"
+                variant="ghost"
+                onClick={() => dismissPrompt.mutate()}
+                disabled={isPending}
+                className="h-control-touch px-3"
+              >
+                {dismissPrompt.isPending && (
+                  <LoaderCircle aria-hidden="true" className="size-4 animate-spin" />
+                )}
+                {dismissPrompt.isPending ? 'Dismissing...' : 'Dismiss'}
+              </Button>
+              <Button
+                type="submit"
+                disabled={isPending || source.trim().length === 0}
+                className="h-control-touch px-4"
+              >
+                {submitSource.isPending && (
+                  <LoaderCircle aria-hidden="true" className="size-4 animate-spin" />
+                )}
+                Save answer
+              </Button>
+            </div>
+          </form>
+        </CardContent>
+      </Card>
+    </aside>
+  );
+}
diff --git a/apps/web/src/components/CustomerSourceSurvey.tsx b/apps/web/src/components/CustomerSourceSurvey.tsx
deleted file mode 100644
index ba3c49ecb4..0000000000
--- a/apps/web/src/components/CustomerSourceSurvey.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import { useMutation } from '@tanstack/react-query';
-import { useTRPC } from '@/lib/trpc/utils';
-import { Button } from '@/components/ui/button';
-import { Textarea } from '@/components/ui/textarea';
-
-type CustomerSourceSurveyProps = {
-  redirectPath: string;
-};
-
-export function CustomerSourceSurvey({ redirectPath }: CustomerSourceSurveyProps) {
-  const [source, setSource] = useState('');
-  const [skipped, setSkipped] = useState(false);
-  const router = useRouter();
-  const trpc = useTRPC();
-
-  const { mutate: submitSource, isPending } = useMutation(
-    trpc.user.submitCustomerSource.mutationOptions({
-      onSuccess: () => {
-        router.push(redirectPath);
-      },
-    })
-  );
-
-  const { mutate: skipSource } = useMutation(
-    trpc.user.skipCustomerSource.mutationOptions({
-      onSuccess: () => {
-        router.push(redirectPath);
-      },
-      onError: () => {
-        setSkipped(false);
-      },
-    })
-  );
-
-  function handleSkip() {
-    setSkipped(true);
-    skipSource();
-  }
-
-  return (
-    <div className="space-y-4 px-6 pb-6">
-      <Textarea
-        autoFocus
-        placeholder="Example: A YouTube video from Theo"
-        value={source}
-        onChange={e => setSource(e.target.value)}
-        rows={3}
-        maxLength={1000}
-      />
-      <div className="flex items-center justify-between">
-        <button
-          type="button"
-          onClick={handleSkip}
-          disabled={skipped || isPending}
-          className="cursor-pointer text-muted-foreground text-sm hover:underline"
-        >
-          {skipped ? 'Skipping...' : 'Skip'}
-        </button>
-        <Button
-          onClick={() => submitSource({ source: source.trim() })}
-          disabled={isPending || skipped || source.trim().length === 0}
-        >
-          {isPending ? 'Submitting...' : 'Submit'}
-        </Button>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/lib/survey-redirect.ts b/apps/web/src/lib/survey-redirect.ts
deleted file mode 100644
index 1c07f4167b..0000000000
--- a/apps/web/src/lib/survey-redirect.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { User } from '@kilocode/db/schema';
-
-/**
- * If the user has not yet completed the customer-source survey,
- * wraps `destinationPath` so the user lands on the survey first,
- * then continues to `destinationPath` after completing it.
- */
-export function maybeInterceptWithSurvey(
-  user: Pick<User, 'customer_source'>,
-  destinationPath: string
-): string {
-  if (user.customer_source === null && !destinationPath.startsWith('/customer-source-survey')) {
-    return `/customer-source-survey?callbackPath=${encodeURIComponent(destinationPath)}`;
-  }
-  return destinationPath;
-}
diff --git a/apps/web/src/routers/user-router.test.ts b/apps/web/src/routers/user-router.test.ts
index f213c30ad5..330015a129 100644
--- a/apps/web/src/routers/user-router.test.ts
+++ b/apps/web/src/routers/user-router.test.ts
@@ -6,8 +6,6 @@ import { insertTestUser } from '@/tests/helpers/user.helper';
 import type { User } from '@kilocode/db/schema';
 
 let testUser: User;
-let surveyTestUser: User;
-let skipTestUser: User;
 
 describe('user router - updateProfile', () => {
   beforeAll(async () => {
@@ -131,217 +129,40 @@ describe('user router - updateProfile', () => {
   });
 });
 
-describe('user router - submitCustomerSource', () => {
-  beforeAll(async () => {
-    surveyTestUser = await insertTestUser({
-      google_user_email: 'survey-test@example.com',
-      google_user_name: 'Survey Test User',
-    });
-  });
-
-  afterEach(async () => {
-    await db
-      .update(kilocode_users)
-      .set({ customer_source: null })
-      .where(eq(kilocode_users.id, surveyTestUser.id));
-  });
-
-  it('saves the customer source to the database', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-    const result = await caller.user.submitCustomerSource({ source: 'A YouTube video' });
-
-    expect(result).toEqual({ success: true });
-
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, surveyTestUser.id),
-    });
-    expect(updated?.customer_source).toBe('A YouTube video');
-  });
-
-  it('overwrites a previous response', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-
-    await caller.user.submitCustomerSource({ source: 'First answer' });
-    await caller.user.submitCustomerSource({ source: 'Updated answer' });
-
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, surveyTestUser.id),
-    });
-    expect(updated?.customer_source).toBe('Updated answer');
-  });
-
-  it('rejects empty strings', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-
-    await expect(caller.user.submitCustomerSource({ source: '' })).rejects.toThrow();
-  });
-
-  it('rejects strings over 1000 characters', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-
-    const longString = 'a'.repeat(1001);
-    await expect(caller.user.submitCustomerSource({ source: longString })).rejects.toThrow();
-  });
-
-  it('accepts a string at the max length of 1000', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-    const maxString = 'a'.repeat(1000);
-
-    const result = await caller.user.submitCustomerSource({ source: maxString });
-    expect(result).toEqual({ success: true });
-
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, surveyTestUser.id),
-    });
-    expect(updated?.customer_source).toBe(maxString);
-  });
-
-  it('accepts a single-character string', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-    const result = await caller.user.submitCustomerSource({ source: 'X' });
-
-    expect(result).toEqual({ success: true });
-
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, surveyTestUser.id),
-    });
-    expect(updated?.customer_source).toBe('X');
-  });
-
-  it('accepts 1000 chars of content with leading/trailing spaces (validates post-trim)', async () => {
-    const caller = await createCallerForUser(surveyTestUser.id);
-    const content = 'a'.repeat(1000);
-    const result = await caller.user.submitCustomerSource({ source: `  ${content}  ` });
-
-    expect(result).toEqual({ success: true });
-
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, surveyTestUser.id),
-    });
-    expect(updated?.customer_source).toBe(content);
-  });
-
-  describe('whitespace-only input rejection', () => {
-    it('rejects spaces-only input', async () => {
-      const caller = await createCallerForUser(surveyTestUser.id);
-
-      await expect(caller.user.submitCustomerSource({ source: '   ' })).rejects.toThrow();
-    });
-
-    it('rejects tab-only input', async () => {
-      const caller = await createCallerForUser(surveyTestUser.id);
-
-      await expect(caller.user.submitCustomerSource({ source: '\t\t' })).rejects.toThrow();
-    });
-
-    it('rejects newline-only input', async () => {
-      const caller = await createCallerForUser(surveyTestUser.id);
-
-      await expect(caller.user.submitCustomerSource({ source: '\n\n' })).rejects.toThrow();
-    });
-
-    it('rejects mixed whitespace input', async () => {
-      const caller = await createCallerForUser(surveyTestUser.id);
-
-      await expect(caller.user.submitCustomerSource({ source: ' \t\n ' })).rejects.toThrow();
-    });
-  });
-
-  describe('whitespace trimming on valid input', () => {
-    it('trims leading and trailing whitespace before storing', async () => {
-      const caller = await createCallerForUser(surveyTestUser.id);
-      const result = await caller.user.submitCustomerSource({ source: '  hello  ' });
-
-      expect(result).toEqual({ success: true });
-
-      const updated = await db.query.kilocode_users.findFirst({
-        where: eq(kilocode_users.id, surveyTestUser.id),
-      });
-      expect(updated?.customer_source).toBe('hello');
-    });
-
-    it('preserves internal whitespace in stored value', async () => {
-      const caller = await createCallerForUser(surveyTestUser.id);
-      const result = await caller.user.submitCustomerSource({ source: 'a YouTube video' });
-
-      expect(result).toEqual({ success: true });
-
-      const updated = await db.query.kilocode_users.findFirst({
-        where: eq(kilocode_users.id, surveyTestUser.id),
-      });
-      expect(updated?.customer_source).toBe('a YouTube video');
-    });
-  });
-});
-
-describe('user router - skipCustomerSource', () => {
-  beforeAll(async () => {
-    skipTestUser = await insertTestUser({
-      google_user_email: 'skip-survey-test@example.com',
-      google_user_name: 'Skip Survey Test User',
-    });
-  });
-
-  afterEach(async () => {
-    await db
-      .update(kilocode_users)
-      .set({ customer_source: null })
-      .where(eq(kilocode_users.id, skipTestUser.id));
-  });
-
-  it('skipCustomerSource mutation exists and returns success', async () => {
-    const caller = await createCallerForUser(skipTestUser.id);
-    const result = await caller.user.skipCustomerSource();
-
-    expect(result).toEqual({ success: true });
-  });
+describe('user router - customer source', () => {
+  it('saves a submitted source', async () => {
+    const user = await insertTestUser();
+    const caller = await createCallerForUser(user.id);
 
-  it('sets customer_source to empty string after skipping', async () => {
-    const caller = await createCallerForUser(skipTestUser.id);
-    await caller.user.skipCustomerSource();
+    await caller.user.submitCustomerSource({ source: '  GitHub  ' });
 
     const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, skipTestUser.id),
+      where: eq(kilocode_users.id, user.id),
     });
-    expect(updated?.customer_source).toBe('');
+    expect(updated?.customer_source).toBe('GitHub');
   });
 
-  it('is idempotent - calling skipCustomerSource twice still returns success', async () => {
-    const caller = await createCallerForUser(skipTestUser.id);
-
-    const result1 = await caller.user.skipCustomerSource();
-    expect(result1).toEqual({ success: true });
-
-    const result2 = await caller.user.skipCustomerSource();
-    expect(result2).toEqual({ success: true });
+  it('rejects empty and oversized sources', async () => {
+    const user = await insertTestUser();
+    const caller = await createCallerForUser(user.id);
 
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, skipTestUser.id),
-    });
-    expect(updated?.customer_source).toBe('');
+    await expect(caller.user.submitCustomerSource({ source: '   ' })).rejects.toThrow();
+    await expect(caller.user.submitCustomerSource({ source: 'a'.repeat(1001) })).rejects.toThrow();
   });
 
-  it('does NOT overwrite a real answer when skipCustomerSource is called after submitCustomerSource', async () => {
-    const caller = await createCallerForUser(skipTestUser.id);
-
-    await caller.user.submitCustomerSource({ source: 'Found it on Hacker News' });
-    await caller.user.skipCustomerSource();
-
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, skipTestUser.id),
-    });
-    expect(updated?.customer_source).toBe('Found it on Hacker News');
-  });
+  it('dismisses an unanswered prompt without overwriting an answer', async () => {
+    const unansweredUser = await insertTestUser();
+    const answeredUser = await insertTestUser({ customer_source: 'A teammate' });
 
-  it('allows a real answer to overwrite a previous skip', async () => {
-    const caller = await createCallerForUser(skipTestUser.id);
-    await caller.user.skipCustomerSource();
-    await caller.user.submitCustomerSource({ source: 'Changed my mind — Reddit' });
+    await (await createCallerForUser(unansweredUser.id)).user.skipCustomerSource();
+    await (await createCallerForUser(answeredUser.id)).user.skipCustomerSource();
 
-    const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, skipTestUser.id),
-    });
-    expect(updated?.customer_source).toBe('Changed my mind — Reddit');
+    const [unansweredResult, answeredResult] = await Promise.all([
+      db.query.kilocode_users.findFirst({ where: eq(kilocode_users.id, unansweredUser.id) }),
+      db.query.kilocode_users.findFirst({ where: eq(kilocode_users.id, answeredUser.id) }),
+    ]);
+    expect(unansweredResult?.customer_source).toBe('');
+    expect(answeredResult?.customer_source).toBe('A teammate');
   });
 });
 
diff --git a/apps/web/src/tests/account-verification-redirect.test.ts b/apps/web/src/tests/account-verification-redirect.test.ts
index 47e1714eb7..fd06a24fb3 100644
--- a/apps/web/src/tests/account-verification-redirect.test.ts
+++ b/apps/web/src/tests/account-verification-redirect.test.ts
@@ -1,12 +1,9 @@
 /**
  * Tests for the account-verification page redirect logic.
  *
- * The CORRECT behavior should be:
- * - If stytchStatus !== null AND user.customer_source !== null:
- *   redirect directly to the final destination (callbackPath or /get-started),
- *   skipping the survey entirely.
- * - If stytchStatus !== null AND user.customer_source === null:
- *   redirect to /customer-source-survey with callbackPath forwarding.
+ * The redirect behavior should be:
+ * - If stytchStatus !== null, redirect directly to the final destination
+ *   (callbackPath or /get-started).
  * - If stytchStatus === null: render the page (no redirect).
  */
 
@@ -159,11 +156,8 @@ describe('account-verification redirect logic', () => {
     });
   });
 
-  // ---------------------------------------------------------------
-  // Case: verified user who has NOT completed the survey
-  // ---------------------------------------------------------------
-  describe('when stytchStatus is non-null AND customer_source is null (survey not completed)', () => {
-    it('should redirect to /customer-source-survey with /get-started as default destination', async () => {
+  describe('when stytchStatus is non-null', () => {
+    it('redirects to /get-started by default', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -171,12 +165,10 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect to /customer-source-survey with callbackPath forwarded', async () => {
+    it('preserves a valid callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -184,12 +176,10 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/get-started' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect to /customer-source-survey with an org callbackPath forwarded', async () => {
+    it('preserves an organization callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -197,18 +187,12 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/organizations/some-org-id' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/organizations/some-org-id');
     });
   });
 
-  // ---------------------------------------------------------------
-  // Case: verified user who HAS completed the survey
-  // These tests expose the redundant-redirect bug.
-  // ---------------------------------------------------------------
-  describe('when stytchStatus is non-null AND customer_source is set (survey already completed)', () => {
-    it('should redirect directly to /get-started, NOT through /customer-source-survey', async () => {
+  describe('when legacy customer_source values exist', () => {
+    it('redirects to /get-started', async () => {
       const user = makeUser({ customer_source: 'Twitter' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -219,7 +203,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect directly to callbackPath when customer_source is set', async () => {
+    it('preserves a callbackPath', async () => {
       const user = makeUser({ customer_source: 'Twitter' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -230,7 +214,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect directly to an org callbackPath when customer_source is set', async () => {
+    it('preserves an organization callbackPath', async () => {
       const user = makeUser({ customer_source: 'A friend or colleague' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -241,7 +225,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/organizations/some-org-id');
     });
 
-    it('should redirect to /get-started when customer_source is empty string (skipped survey)', async () => {
+    it('redirects to /get-started for a legacy skip sentinel', async () => {
       const user = makeUser({ customer_source: '' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -252,7 +236,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect directly to callbackPath when customer_source is empty string (skipped)', async () => {
+    it('preserves a callbackPath for a legacy skip sentinel', async () => {
       const user = makeUser({ customer_source: '' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -277,12 +261,10 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should skip survey when customer_source is set even with stytchStatus=false', async () => {
+    it('redirects despite legacy customer_source values', async () => {
       const user = makeUser({ customer_source: 'Google search' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(false);
@@ -548,7 +530,7 @@ describe('account-verification redirect logic', () => {
   // Edge: invalid callbackPath should be ignored
   // ---------------------------------------------------------------
   describe('when callbackPath is invalid', () => {
-    it('should ignore invalid callbackPath for user without customer_source', async () => {
+    it('should ignore invalid callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -556,13 +538,10 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: 'https://evil.com/phish' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      // Invalid callbackPath is dropped — redirect to survey with default destination
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should ignore invalid callbackPath for user with customer_source set', async () => {
+    it('ignores invalid callbackPath when legacy customer_source values exist', async () => {
       const user = makeUser({ customer_source: 'Reddit' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
diff --git a/apps/web/src/tests/survey-redirect.test.ts b/apps/web/src/tests/survey-redirect.test.ts
deleted file mode 100644
index 9d319688ec..0000000000
--- a/apps/web/src/tests/survey-redirect.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
-
-describe('maybeInterceptWithSurvey', () => {
-  it('wraps destination with survey when customer_source is null', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-    );
-  });
-
-  it('preserves complex callback paths', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/organizations/some-org-id')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
-    );
-  });
-
-  it('returns destination unchanged when customer_source is a non-empty string', () => {
-    const user = { customer_source: 'Twitter' };
-    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe('/get-started');
-  });
-
-  it('returns destination unchanged when customer_source is empty string (skipped)', () => {
-    const user = { customer_source: '' };
-    expect(maybeInterceptWithSurvey(user, '/profile')).toBe('/profile');
-  });
-
-  it('does not double-wrap if destination is already the survey page', () => {
-    const user = { customer_source: null };
-    const surveyPath = '/customer-source-survey?callbackPath=%2Fget-started';
-    expect(maybeInterceptWithSurvey(user, surveyPath)).toBe(surveyPath);
-  });
-
-  it('does not double-wrap bare survey path', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/customer-source-survey')).toBe(
-      '/customer-source-survey'
-    );
-  });
-
-  it('correctly encodes destinations containing query strings', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/organizations/abc?tab=billing')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/abc?tab=billing')}`
-    );
-  });
-});
diff --git a/apps/web/tests/e2e/app-shell-accessibility.spec.ts b/apps/web/tests/e2e/app-shell-accessibility.spec.ts
index f23948fd48..4010af90b4 100644
--- a/apps/web/tests/e2e/app-shell-accessibility.spec.ts
+++ b/apps/web/tests/e2e/app-shell-accessibility.spec.ts
@@ -27,7 +27,6 @@ async function seedFakeUser({ isAdmin }: { isAdmin: boolean }) {
       hosted_domain: hosted_domain_specials.fake_devonly,
       stripe_customer_id: `cus_app_shell_${uniqueId}`,
       completed_welcome_form: true,
-      customer_source: 'App shell test',
       has_validation_stytch: true,
       is_admin: isAdmin,
     });
diff --git a/apps/web/tests/e2e/auth.setup.ts b/apps/web/tests/e2e/auth.setup.ts
index 2c25d831e0..62730da40d 100644
--- a/apps/web/tests/e2e/auth.setup.ts
+++ b/apps/web/tests/e2e/auth.setup.ts
@@ -17,30 +17,15 @@ setup('authenticate', async ({ page }) => {
   // Navigate to sign in page with fakeUser query param to trigger auto-submit
   await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
 
-  // Wait for navigation to complete - user will end up on survey, profile, or their org
+  // Wait for navigation to complete - user will end up on their profile or org.
   await page.waitForURL(
-    url =>
-      url.pathname === '/customer-source-survey' ||
-      url.pathname === '/profile' ||
-      url.pathname.startsWith('/organizations/'),
+    url => url.pathname === '/profile' || url.pathname.startsWith('/organizations/'),
     {
       timeout: 20000,
       waitUntil: 'networkidle',
     }
   );
 
-  // If we land on the survey page, skip it to complete setup
-  if (new URL(page.url()).pathname === '/customer-source-survey') {
-    await page.click('button:has-text("Skip")');
-    await page.waitForURL(
-      url => url.pathname === '/profile' || url.pathname.startsWith('/organizations/'),
-      {
-        timeout: 10000,
-        waitUntil: 'networkidle',
-      }
-    );
-  }
-
   // Save the authenticated state (cookies, localStorage, etc.)
   await page.context().storageState({ path: 'playwright/.auth/state.json' });
 
diff --git a/apps/web/tests/e2e/customer-source-survey.spec.ts b/apps/web/tests/e2e/customer-source-survey.spec.ts
deleted file mode 100644
index 5e17870cb6..0000000000
--- a/apps/web/tests/e2e/customer-source-survey.spec.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { test, expect } from '@chromatic-com/playwright';
-import { randomUUID } from 'crypto';
-
-/**
- * Customer Source Survey E2E tests.
- *
- * Each test that needs a clean survey state (customer_source === null) creates
- * its own fresh user via the fake-login flow. This avoids shared-state issues
- * where one test's actions (submit/skip) poison subsequent tests.
- *
- * The helper `signInFreshUser` navigates through sign-in and stytch verification
- * with a brand-new email, landing the user at wherever the post-verification
- * redirect points (which should be /customer-source-survey once Task 6 is done).
- */
-
-function isSignedInDestination(url: URL) {
-  return url.pathname === '/profile' || url.pathname.startsWith('/organizations/');
-}
-
-async function waitForSignedInDestination(page: import('@playwright/test').Page) {
-  await page.waitForURL(url => isSignedInDestination(url), {
-    timeout: 15000,
-  });
-  expect(isSignedInDestination(new URL(page.url()))).toBe(true);
-}
-
-/**
- * Signs in a brand-new user via fake-login with stytchpass behavior.
- * Returns the final URL after sign-in + verification completes.
- *
- * Uses +stytchpass to auto-pass stytch verification so the user proceeds
- * through the full new-user flow: sign-in -> after-sign-in -> account-verification -> survey.
- */
-async function signInFreshUser(page: import('@playwright/test').Page): Promise<string> {
-  const uniqueId = randomUUID().slice(0, 8);
-  const testEmail = `test-survey-${uniqueId}+stytchpass@example.com`;
-
-  await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
-
-  // Wait for the full redirect chain to settle.
-  await page.waitForURL(
-    url => url.pathname === '/customer-source-survey' || isSignedInDestination(url),
-    { timeout: 30000, waitUntil: 'networkidle' }
-  );
-
-  return page.url();
-}
-
-test.describe('Customer Source Survey', () => {
-  // These tests do NOT use the shared storageState from auth.setup.ts.
-  // Each test creates its own user to ensure isolation.
-  test.use({ storageState: { cookies: [], origins: [] } });
-
-  test('new user is redirected to survey after verification', async ({ page }) => {
-    const finalUrl = await signInFreshUser(page);
-
-    // After Task 6 (account-verification redirect change), new users should
-    // land on /customer-source-survey instead of continuing directly to their app destination.
-    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
-  });
-
-  test('survey page displays expected content', async ({ page }) => {
-    const finalUrl = await signInFreshUser(page);
-    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
-
-    // Verify the page has the expected heading
-    await expect(page.getByText('Where did you hear about Kilo Code?')).toBeVisible();
-
-    // Verify the textarea placeholder is present
-    await expect(page.getByPlaceholder('Example: A YouTube video from Theo')).toBeVisible();
-
-    // Verify Submit button exists and is initially disabled (empty input)
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-    await expect(submitButton).toBeVisible();
-    await expect(submitButton).toBeDisabled();
-
-    // Verify Skip link exists
-    await expect(page.getByRole('button', { name: 'Skip' })).toBeVisible();
-  });
-
-  test('submit button is enabled only when textarea has content', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    // Initially disabled
-    await expect(submitButton).toBeDisabled();
-
-    // Type something
-    await textarea.fill('A friend told me');
-    await expect(submitButton).toBeEnabled();
-
-    // Clear it
-    await textarea.fill('');
-    await expect(submitButton).toBeDisabled();
-
-    // Whitespace only should not enable (trim check)
-    await textarea.fill('   ');
-    await expect(submitButton).toBeDisabled();
-  });
-
-  test('submitting a response redirects to the signed-in app destination', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Found it on Reddit');
-    await submitButton.click();
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('skipping redirects to the signed-in app destination', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('already-answered user is redirected past survey', async ({ page }) => {
-    // First: sign in and submit a response
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Twitter post');
-    await submitButton.click();
-
-    await waitForSignedInDestination(page);
-
-    // Now navigate directly to the survey page. Since customer_source is set,
-    // the server component should redirect past it.
-    await page.goto('/customer-source-survey');
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('after skipping, revisiting survey should redirect away (H2 sentinel)', async ({ page }) => {
-    // This test verifies the H2 bug fix: when a user clicks "Skip", a sentinel
-    // value should be written to customer_source so that revisiting the survey
-    // redirects past it. Without the fix, customer_source stays null and the
-    // survey is shown again.
-    await signInFreshUser(page);
-
-    // Click Skip
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    await waitForSignedInDestination(page);
-
-    // Navigate back to the survey page directly
-    await page.goto('/customer-source-survey');
-
-    // If H2 is fixed (skip writes a sentinel), user should be redirected away.
-    // If H2 is NOT fixed, user will see the survey form again.
-    await page.waitForURL(
-      url => isSignedInDestination(url) || url.pathname === '/customer-source-survey',
-      { timeout: 15000 }
-    );
-
-    // This assertion will FAIL until the H2 skip-persistence bug is fixed
-    expect(isSignedInDestination(new URL(page.url()))).toBe(true);
-  });
-
-  test('survey preserves callbackPath through submit', async ({ page }) => {
-    await signInFreshUser(page);
-
-    // If the user landed on /customer-source-survey, navigate with a callbackPath
-    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Hacker News');
-    await submitButton.click();
-
-    // Should redirect to /profile (the callbackPath), not the default destination
-    await page.waitForURL(url => url.pathname === '/profile', {
-      timeout: 15000,
-    });
-    expect(new URL(page.url()).pathname).toBe('/profile');
-  });
-
-  test('survey preserves callbackPath through skip', async ({ page }) => {
-    await signInFreshUser(page);
-
-    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
-
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    // Should redirect to /profile (the callbackPath), not the default destination
-    await page.waitForURL(url => url.pathname === '/profile', {
-      timeout: 15000,
-    });
-    expect(new URL(page.url()).pathname).toBe('/profile');
-  });
-});
diff --git a/apps/web/tests/e2e/get-started-dashboard-link.spec.ts b/apps/web/tests/e2e/get-started-dashboard-link.spec.ts
index cdf3c4a3e5..e1819ecc71 100644
--- a/apps/web/tests/e2e/get-started-dashboard-link.spec.ts
+++ b/apps/web/tests/e2e/get-started-dashboard-link.spec.ts
@@ -23,18 +23,13 @@ test.describe('/get-started auth-aware router', () => {
     const testEmail = `test-get-started-${uniqueId}+stytchpass@example.com`;
 
     await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
-    await page.waitForURL(
-      url => url.pathname === '/customer-source-survey' || isSignedInDestination(url),
-      { timeout: 30000, waitUntil: 'networkidle' }
-    );
-
-    if (new URL(page.url()).pathname === '/customer-source-survey') {
-      await page.getByRole('button', { name: 'Skip' }).click();
-      await page.waitForURL(url => isSignedInDestination(url), {
-        timeout: 15000,
-        waitUntil: 'networkidle',
-      });
-    }
+    await page.waitForURL(url => isSignedInDestination(url), {
+      timeout: 30000,
+      waitUntil: 'networkidle',
+    });
+    await expect(
+      page.getByText('Where did you hear about Kilo Code?', { exact: true })
+    ).toBeVisible();
 
     await page.goto('/get-started');
     await page.waitForURL(url => isSignedInDestination(url), {
diff --git a/apps/web/tests/e2e/onboarding-wizard.spec.ts b/apps/web/tests/e2e/onboarding-wizard.spec.ts
index 0a59a0a528..4e80f3c2e0 100644
--- a/apps/web/tests/e2e/onboarding-wizard.spec.ts
+++ b/apps/web/tests/e2e/onboarding-wizard.spec.ts
@@ -25,24 +25,11 @@ async function signInFreshUser(
   await page.waitForURL(
     url =>
       url.pathname === '/gastown/onboarding' ||
-      url.pathname === '/customer-source-survey' ||
       url.pathname === '/profile' ||
       url.pathname.startsWith('/organizations/'),
     { timeout: 30000, waitUntil: 'networkidle' }
   );
 
-  // If we landed on the survey page, skip it
-  if (new URL(page.url()).pathname === '/customer-source-survey') {
-    await page.click('button:has-text("Skip")');
-    await page.waitForURL(
-      url =>
-        url.pathname === '/gastown/onboarding' ||
-        url.pathname === '/profile' ||
-        url.pathname.startsWith('/organizations/'),
-      { timeout: 15000, waitUntil: 'networkidle' }
-    );
-  }
-
   // If we're not on /gastown/onboarding, navigate directly
   if (new URL(page.url()).pathname !== '/gastown/onboarding') {
     await page.goto('/gastown/onboarding');
diff --git a/apps/web/tests/setup-smoke/profile.spec.ts b/apps/web/tests/setup-smoke/profile.spec.ts
index 4f817cba60..716bea4708 100644
--- a/apps/web/tests/setup-smoke/profile.spec.ts
+++ b/apps/web/tests/setup-smoke/profile.spec.ts
@@ -46,7 +46,6 @@ test.describe('local setup smoke', () => {
         hosted_domain: hosted_domain_specials.fake_devonly,
         stripe_customer_id: `cus_setup_smoke_${uniqueId}`,
         completed_welcome_form: true,
-        customer_source: 'Setup smoke test',
         has_validation_stytch: true,
       });
     } finally {
diff --git a/dev/seed/AGENTS.md b/dev/seed/AGENTS.md
index 26d25f6e84..407e144845 100644
--- a/dev/seed/AGENTS.md
+++ b/dev/seed/AGENTS.md
@@ -72,9 +72,8 @@ Topic files MUST NOT:
 Bare `kilocode_users` inserts leave users trapped in onboarding. To reach product surfaces, set:
 
 - `has_validation_stytch: true` — bypasses `/account-verification` (`!== null`).
-- `customer_source: 'dev-seed'` — bypasses `/customer-source-survey` (`!== null`; `''` means skipped).
 
-Canonical example: `app/create-user.ts`. Gate code: `apps/web/src/lib/stytch.ts` (`getStytchStatus`) and `apps/web/src/lib/survey-redirect.ts` (`maybeInterceptWithSurvey`). When adding a gate, update this section and `app/create-user.ts` together.
+Canonical example: `app/create-user.ts`. Gate code: `apps/web/src/lib/stytch.ts` (`getStytchStatus`). When adding a gate, update this section and `app/create-user.ts` together.
 
 ## New-topic checklist
 
diff --git a/dev/seed/app/create-user.ts b/dev/seed/app/create-user.ts
index b7d7905637..2395bd88ae 100644
--- a/dev/seed/app/create-user.ts
+++ b/dev/seed/app/create-user.ts
@@ -75,11 +75,8 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
     kiloUserId: userId,
   });
 
-  // Pre-set the onboarding gates so seeded users can hit dashboards without
-  // bouncing through `/account-verification` (gated on
-  // `has_validation_stytch !== null`) or `/customer-source-survey` (gated on
-  // `customer_source !== null`). See apps/web/src/lib/stytch.ts and
-  // apps/web/src/lib/survey-redirect.ts.
+  // Pre-set account verification so seeded users can hit dashboards without
+  // bouncing through `/account-verification`.
   try {
     await db.insert(kilocode_users).values({
       id: userId,
@@ -89,7 +86,6 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
       stripe_customer_id: stripeCustomer.id,
       normalized_email: normalizedEmail,
       has_validation_stytch: true,
-      customer_source: 'dev-seed',
     });
   } catch (error) {
     // The DB insert failed after we already created a Stripe customer; clean
@@ -104,6 +100,5 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
     email: trimmedEmail,
     stripeCustomerId: stripeCustomer.id,
     hasValidationStytch: true,
-    customerSource: 'dev-seed',
   };
 }
diff --git a/dev/seed/app/org-dashboard.ts b/dev/seed/app/org-dashboard.ts
index 6f7d3cf99e..42b7326c80 100644
--- a/dev/seed/app/org-dashboard.ts
+++ b/dev/seed/app/org-dashboard.ts
@@ -107,7 +107,6 @@ async function createUser(handle: string, displayName: string) {
     stripe_customer_id: `cus_seed_${id.replace(/-/g, '').slice(0, 14)}`,
     normalized_email: email,
     has_validation_stytch: true,
-    customer_source: 'dev-seed',
   });
   return id;
 }
diff --git a/dev/seed/coding-plans/demo-data.ts b/dev/seed/coding-plans/demo-data.ts
index 6a7d41aa18..4d37faaa8e 100644
--- a/dev/seed/coding-plans/demo-data.ts
+++ b/dev/seed/coding-plans/demo-data.ts
@@ -480,7 +480,6 @@ async function seedScenario(scenario: string, key: Buffer, users: SeedUser[]): P
           normalized_email: user.normalizedEmail,
           email_domain: EMAIL_DOMAIN,
           has_validation_stytch: true,
-          customer_source: 'dev-seed',
           total_microdollars_acquired: grantAmount,
           microdollars_used: subscription ? PLANS[subscription.planId].costMicrodollars : 0,
           auto_top_up_enabled: subscription?.status === 'past_due',
diff --git a/dev/seed/cost-insights/spend-evidence.ts b/dev/seed/cost-insights/spend-evidence.ts
index 016c96a03c..089e8036b8 100644
--- a/dev/seed/cost-insights/spend-evidence.ts
+++ b/dev/seed/cost-insights/spend-evidence.ts
@@ -1507,7 +1507,6 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
             stripe_customer_id: user.stripeCustomerId,
             normalized_email: user.email,
             has_validation_stytch: true,
-            customer_source: 'dev-seed',
             is_admin: user.isAdmin,
             microdollars_used: 0,
             total_microdollars_acquired: BALANCE_BUFFER_MICRODOLLARS,
@@ -1521,7 +1520,6 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
               stripe_customer_id: user.stripeCustomerId,
               normalized_email: user.email,
               has_validation_stytch: true,
-              customer_source: 'dev-seed',
               is_admin: user.isAdmin,
               microdollars_used: 0,
               total_microdollars_acquired: BALANCE_BUFFER_MICRODOLLARS,

From ef38ae125fcbc3ddadf1a17c82d639ff9ad85172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Uruchurtu?= <im@vheissu.me>
Date: Thu, 9 Jul 2026 18:01:59 -0600
Subject: [PATCH 2/3] Revert "feat(web): replace blocking customer survey"

This reverts commit b56597deec29a5d324942dab2cc53c3e7d65dc0c.
---
 apps/web/src/app/(app)/layout.tsx             |   2 -
 .../web/src/app/account-verification/page.tsx |   3 +-
 .../app/customer-source-survey/page.test.ts   |  51 ----
 .../src/app/customer-source-survey/page.tsx   |  16 +-
 apps/web/src/app/get-started/page.tsx         |   3 +-
 .../src/app/users/after-sign-in/route.test.ts |   4 +
 .../web/src/app/users/after-sign-in/route.tsx |   3 +
 .../components/CustomerSourcePrompt.test.ts   |  23 --
 .../src/components/CustomerSourcePrompt.tsx   | 125 ----------
 .../src/components/CustomerSourceSurvey.tsx   |  72 ++++++
 apps/web/src/lib/survey-redirect.ts           |  16 ++
 apps/web/src/routers/user-router.test.ts      | 225 ++++++++++++++++--
 .../account-verification-redirect.test.ts     |  63 +++--
 apps/web/src/tests/survey-redirect.test.ts    |  47 ++++
 .../tests/e2e/app-shell-accessibility.spec.ts |   1 +
 apps/web/tests/e2e/auth.setup.ts              |  19 +-
 .../tests/e2e/customer-source-survey.spec.ts  | 203 ++++++++++++++++
 .../e2e/get-started-dashboard-link.spec.ts    |  19 +-
 apps/web/tests/e2e/onboarding-wizard.spec.ts  |  13 +
 apps/web/tests/setup-smoke/profile.spec.ts    |   1 +
 dev/seed/AGENTS.md                            |   3 +-
 dev/seed/app/create-user.ts                   |   9 +-
 dev/seed/app/org-dashboard.ts                 |   1 +
 dev/seed/coding-plans/demo-data.ts            |   1 +
 dev/seed/cost-insights/spend-evidence.ts      |   2 +
 25 files changed, 664 insertions(+), 261 deletions(-)
 delete mode 100644 apps/web/src/app/customer-source-survey/page.test.ts
 delete mode 100644 apps/web/src/components/CustomerSourcePrompt.test.ts
 delete mode 100644 apps/web/src/components/CustomerSourcePrompt.tsx
 create mode 100644 apps/web/src/components/CustomerSourceSurvey.tsx
 create mode 100644 apps/web/src/lib/survey-redirect.ts
 create mode 100644 apps/web/src/tests/survey-redirect.test.ts
 create mode 100644 apps/web/tests/e2e/customer-source-survey.spec.ts

diff --git a/apps/web/src/app/(app)/layout.tsx b/apps/web/src/app/(app)/layout.tsx
index 418c5d9457..eac1d1ad50 100644
--- a/apps/web/src/app/(app)/layout.tsx
+++ b/apps/web/src/app/(app)/layout.tsx
@@ -9,7 +9,6 @@ import { AdminOmnibox } from '@/components/admin-omnibox';
 import { AppShellSkipLink } from '@/components/AppShellSkipLink';
 import { PrefetchedOrganizations } from './components/PrefetchedOrganizations';
 import { PlatformPresenceMount } from './components/PlatformPresenceMount';
-import { CustomerSourcePrompt } from '@/components/CustomerSourcePrompt';
 export default function AppLayout({ children }: { children: React.ReactNode }) {
   return (
     <RoleTestingProvider>
@@ -32,7 +31,6 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
               </div>
             </PrefetchedOrganizations>
           </SidebarProvider>
-          <CustomerSourcePrompt />
         </EventServiceProvider>
       </PageTitleProvider>
       <AdminOmnibox />
diff --git a/apps/web/src/app/account-verification/page.tsx b/apps/web/src/app/account-verification/page.tsx
index 0c35672994..f681883e30 100644
--- a/apps/web/src/app/account-verification/page.tsx
+++ b/apps/web/src/app/account-verification/page.tsx
@@ -8,6 +8,7 @@ import { getUserFromAuthOrRedirect } from '@/lib/user/server';
 import { getStytchStatus, handleSignupPromotion, type SignupSource } from '@/lib/stytch';
 import { PageContainer } from '@/components/layouts/PageContainer';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
+import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
 import { isOpenclawAdvisorCallback } from '@/lib/signup-source';
 import { isCreditCampaignCallback, lookupCampaignBySlug } from '@/lib/credit-campaigns';
 
@@ -75,7 +76,7 @@ export default async function AccountVerificationPage({ searchParams }: AppPageP
   if (stytchStatus !== null) {
     const hasUsableCallback = isValidCallback && !stripCreditCampaignCallback;
     const finalDestination = hasUsableCallback ? callbackStr : '/get-started';
-    redirect(finalDestination);
+    redirect(maybeInterceptWithSurvey(user, finalDestination));
   }
 
   return (
diff --git a/apps/web/src/app/customer-source-survey/page.test.ts b/apps/web/src/app/customer-source-survey/page.test.ts
deleted file mode 100644
index 784198ba5d..0000000000
--- a/apps/web/src/app/customer-source-survey/page.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-const mockRedirect = jest.fn<never, [string]>(() => {
-  throw new Error('NEXT_REDIRECT');
-});
-
-jest.mock('next/navigation', () => ({
-  redirect: (...args: [string]) => mockRedirect(...args),
-}));
-
-const mockGetUserFromAuthOrRedirect = jest.fn<Promise<void>, [string]>();
-jest.mock('@/lib/user/server', () => ({
-  getUserFromAuthOrRedirect: (...args: [string]) => mockGetUserFromAuthOrRedirect(...args),
-}));
-
-import CustomerSourceSurveyPage from './page';
-
-async function renderPage(searchParams: Record<string, string> = {}) {
-  try {
-    await CustomerSourceSurveyPage({
-      searchParams: Promise.resolve(searchParams),
-      params: Promise.resolve(undefined),
-    });
-  } catch (error) {
-    if (!(error instanceof Error) || error.message !== 'NEXT_REDIRECT') throw error;
-  }
-}
-
-describe('GET /customer-source-survey', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockGetUserFromAuthOrRedirect.mockResolvedValue();
-  });
-
-  it('redirects authenticated users to the dashboard resolver', async () => {
-    await renderPage();
-
-    expect(mockGetUserFromAuthOrRedirect).toHaveBeenCalledWith('/users/sign_in');
-    expect(mockRedirect).toHaveBeenCalledWith('/get-started');
-  });
-
-  it('preserves a valid in-app callbackPath', async () => {
-    await renderPage({ callbackPath: '/profile' });
-
-    expect(mockRedirect).toHaveBeenCalledWith('/profile');
-  });
-
-  it('rejects an external callbackPath', async () => {
-    await renderPage({ callbackPath: 'https://example.com' });
-
-    expect(mockRedirect).toHaveBeenCalledWith('/get-started');
-  });
-});
diff --git a/apps/web/src/app/customer-source-survey/page.tsx b/apps/web/src/app/customer-source-survey/page.tsx
index 1223f94b05..020280eab0 100644
--- a/apps/web/src/app/customer-source-survey/page.tsx
+++ b/apps/web/src/app/customer-source-survey/page.tsx
@@ -1,16 +1,28 @@
 import { redirect } from 'next/navigation';
 import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { KiloCardLayout } from '@/components/KiloCardLayout';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
+import { CustomerSourceSurvey } from '@/components/CustomerSourceSurvey';
 
 export default async function CustomerSourceSurveyPage({ searchParams }: AppPageProps) {
-  await getUserFromAuthOrRedirect('/users/sign_in');
+  const user = await getUserFromAuthOrRedirect('/users/sign_in');
   const params = await searchParams;
 
+  // Determine where to go after survey
   const callbackParam = params.callbackPath;
   const redirectPath =
     callbackParam && typeof callbackParam === 'string' && isValidCallbackPath(callbackParam)
       ? callbackParam
       : '/get-started';
 
-  redirect(redirectPath);
+  // If already answered, skip past
+  if (user.customer_source !== null) {
+    redirect(redirectPath);
+  }
+
+  return (
+    <KiloCardLayout title="Where did you hear about Kilo Code?" className="max-w-2xl">
+      <CustomerSourceSurvey redirectPath={redirectPath} />
+    </KiloCardLayout>
+  );
 }
diff --git a/apps/web/src/app/get-started/page.tsx b/apps/web/src/app/get-started/page.tsx
index 6236bc3318..df06d3c209 100644
--- a/apps/web/src/app/get-started/page.tsx
+++ b/apps/web/src/app/get-started/page.tsx
@@ -1,4 +1,5 @@
 import { buildLandingRedirectUrl } from '@/lib/landing-redirect';
+import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
 import { getProfileRedirectPath, getUserFromAuth } from '@/lib/user/server';
 import { redirect } from 'next/navigation';
 
@@ -17,5 +18,5 @@ export default async function GetStartedPage({ searchParams }: AppPageProps) {
     redirect('/account-verification');
   }
 
-  redirect(await getProfileRedirectPath(user));
+  redirect(maybeInterceptWithSurvey(user, await getProfileRedirectPath(user)));
 }
diff --git a/apps/web/src/app/users/after-sign-in/route.test.ts b/apps/web/src/app/users/after-sign-in/route.test.ts
index c879eec9cf..e4ade47914 100644
--- a/apps/web/src/app/users/after-sign-in/route.test.ts
+++ b/apps/web/src/app/users/after-sign-in/route.test.ts
@@ -31,6 +31,10 @@ jest.mock('@/lib/impact/debug', () => ({
 
 jest.mock('@/lib/posthog', () => jest.fn(() => ({ capture: jest.fn() })));
 
+jest.mock('@/lib/survey-redirect', () => ({
+  maybeInterceptWithSurvey: jest.fn((_, responsePath: string) => responsePath),
+}));
+
 jest.mock('@/lib/credit-campaigns', () => ({
   isCreditCampaignCallback: jest.fn(() => null),
   lookupCampaignBySlug: jest.fn(),
diff --git a/apps/web/src/app/users/after-sign-in/route.tsx b/apps/web/src/app/users/after-sign-in/route.tsx
index 6d7c083ce1..d1f6202916 100644
--- a/apps/web/src/app/users/after-sign-in/route.tsx
+++ b/apps/web/src/app/users/after-sign-in/route.tsx
@@ -1,5 +1,6 @@
 import { getProfileRedirectPath, getUserFromAuth } from '@/lib/user/server';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
+import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
 import PostHogClient from '@/lib/posthog';
 import { getAffiliateAttribution } from '@/lib/affiliate-attribution';
 import { recordAffiliateAttributionAndQueueParentEvent } from '@/lib/impact/affiliate-events';
@@ -151,6 +152,8 @@ export async function GET(request: NextRequest) {
       } else {
         responsePath = '/account-verification';
       }
+    } else {
+      responsePath = maybeInterceptWithSurvey(user, responsePath);
     }
   }
 
diff --git a/apps/web/src/components/CustomerSourcePrompt.test.ts b/apps/web/src/components/CustomerSourcePrompt.test.ts
deleted file mode 100644
index f1766297ac..0000000000
--- a/apps/web/src/components/CustomerSourcePrompt.test.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { shouldShowCustomerSourcePrompt } from './CustomerSourcePrompt';
-
-describe('shouldShowCustomerSourcePrompt', () => {
-  it('shows for a user without a saved source on app pages', () => {
-    expect(shouldShowCustomerSourcePrompt(null, '/profile')).toBe(true);
-  });
-
-  it('does not show after a user answers or dismisses the prompt', () => {
-    expect(shouldShowCustomerSourcePrompt('GitHub', '/profile')).toBe(false);
-    expect(shouldShowCustomerSourcePrompt('', '/profile')).toBe(false);
-    expect(shouldShowCustomerSourcePrompt(undefined, '/profile')).toBe(false);
-  });
-
-  it('does not show during product setup flows', () => {
-    expect(shouldShowCustomerSourcePrompt(null, '/gastown/onboarding')).toBe(false);
-    expect(
-      shouldShowCustomerSourcePrompt(
-        null,
-        '/organizations/2dce8b38-32dc-4b71-b0ec-0e3d646cbdc4/welcome'
-      )
-    ).toBe(false);
-  });
-});
diff --git a/apps/web/src/components/CustomerSourcePrompt.tsx b/apps/web/src/components/CustomerSourcePrompt.tsx
deleted file mode 100644
index e9c5cf4a0a..0000000000
--- a/apps/web/src/components/CustomerSourcePrompt.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { usePathname } from 'next/navigation';
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { LoaderCircle } from 'lucide-react';
-import { useUser } from '@/hooks/useUser';
-import { useTRPC } from '@/lib/trpc/utils';
-import { Button } from '@/components/ui/button';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-
-const ORGANIZATION_WELCOME_PATH = /^\/organizations\/[0-9a-f-]{36}\/welcome$/;
-
-export function shouldShowCustomerSourcePrompt(
-  customerSource: string | null | undefined,
-  pathname: string
-): boolean {
-  return (
-    customerSource === null &&
-    pathname !== '/gastown/onboarding' &&
-    !ORGANIZATION_WELCOME_PATH.test(pathname)
-  );
-}
-
-export function CustomerSourcePrompt() {
-  const pathname = usePathname();
-  const { data: user } = useUser();
-  const trpc = useTRPC();
-  const queryClient = useQueryClient();
-  const [source, setSource] = useState('');
-  const [dismissed, setDismissed] = useState(false);
-
-  function completePrompt() {
-    setDismissed(true);
-    void queryClient.invalidateQueries({ queryKey: ['user'] });
-  }
-
-  const submitSource = useMutation(
-    trpc.user.submitCustomerSource.mutationOptions({
-      onSuccess: completePrompt,
-    })
-  );
-  const dismissPrompt = useMutation(
-    trpc.user.skipCustomerSource.mutationOptions({
-      onSuccess: completePrompt,
-    })
-  );
-
-  const isPending = submitSource.isPending || dismissPrompt.isPending;
-  const error = submitSource.error ?? dismissPrompt.error;
-
-  if (dismissed || !shouldShowCustomerSourcePrompt(user?.customer_source, pathname)) {
-    return null;
-  }
-
-  function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
-    event.preventDefault();
-    const trimmedSource = source.trim();
-    if (trimmedSource) submitSource.mutate({ source: trimmedSource });
-  }
-
-  return (
-    <aside
-      aria-labelledby="customer-source-prompt-title"
-      className="fixed right-4 bottom-[max(5rem,env(safe-area-inset-bottom))] z-40 w-[calc(100vw-2rem)] max-w-sm sm:right-5"
-    >
-      <Card className="bg-card/95 shadow-lg backdrop-blur-sm">
-        <CardHeader className="p-4 pb-3">
-          <CardTitle id="customer-source-prompt-title">
-            Where did you hear about Kilo Code?
-          </CardTitle>
-          <CardDescription>A short answer helps us understand what is working.</CardDescription>
-        </CardHeader>
-        <CardContent className="p-4 pt-0">
-          <form onSubmit={handleSubmit} className="space-y-3">
-            <div className="space-y-1.5">
-              <Label htmlFor="customer-source">Source</Label>
-              <Input
-                id="customer-source"
-                value={source}
-                onChange={event => setSource(event.target.value)}
-                placeholder="GitHub, a teammate, YouTube..."
-                maxLength={1000}
-                disabled={isPending}
-                aria-invalid={error !== null}
-                aria-describedby={error ? 'customer-source-error' : undefined}
-              />
-              {error && (
-                <p id="customer-source-error" className="text-destructive type-body" role="alert">
-                  We could not save your answer. Please try again.
-                </p>
-              )}
-            </div>
-            <div className="flex items-center justify-between gap-2">
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={() => dismissPrompt.mutate()}
-                disabled={isPending}
-                className="h-control-touch px-3"
-              >
-                {dismissPrompt.isPending && (
-                  <LoaderCircle aria-hidden="true" className="size-4 animate-spin" />
-                )}
-                {dismissPrompt.isPending ? 'Dismissing...' : 'Dismiss'}
-              </Button>
-              <Button
-                type="submit"
-                disabled={isPending || source.trim().length === 0}
-                className="h-control-touch px-4"
-              >
-                {submitSource.isPending && (
-                  <LoaderCircle aria-hidden="true" className="size-4 animate-spin" />
-                )}
-                Save answer
-              </Button>
-            </div>
-          </form>
-        </CardContent>
-      </Card>
-    </aside>
-  );
-}
diff --git a/apps/web/src/components/CustomerSourceSurvey.tsx b/apps/web/src/components/CustomerSourceSurvey.tsx
new file mode 100644
index 0000000000..ba3c49ecb4
--- /dev/null
+++ b/apps/web/src/components/CustomerSourceSurvey.tsx
@@ -0,0 +1,72 @@
+'use client';
+
+import { useState } from 'react';
+import { useRouter } from 'next/navigation';
+import { useMutation } from '@tanstack/react-query';
+import { useTRPC } from '@/lib/trpc/utils';
+import { Button } from '@/components/ui/button';
+import { Textarea } from '@/components/ui/textarea';
+
+type CustomerSourceSurveyProps = {
+  redirectPath: string;
+};
+
+export function CustomerSourceSurvey({ redirectPath }: CustomerSourceSurveyProps) {
+  const [source, setSource] = useState('');
+  const [skipped, setSkipped] = useState(false);
+  const router = useRouter();
+  const trpc = useTRPC();
+
+  const { mutate: submitSource, isPending } = useMutation(
+    trpc.user.submitCustomerSource.mutationOptions({
+      onSuccess: () => {
+        router.push(redirectPath);
+      },
+    })
+  );
+
+  const { mutate: skipSource } = useMutation(
+    trpc.user.skipCustomerSource.mutationOptions({
+      onSuccess: () => {
+        router.push(redirectPath);
+      },
+      onError: () => {
+        setSkipped(false);
+      },
+    })
+  );
+
+  function handleSkip() {
+    setSkipped(true);
+    skipSource();
+  }
+
+  return (
+    <div className="space-y-4 px-6 pb-6">
+      <Textarea
+        autoFocus
+        placeholder="Example: A YouTube video from Theo"
+        value={source}
+        onChange={e => setSource(e.target.value)}
+        rows={3}
+        maxLength={1000}
+      />
+      <div className="flex items-center justify-between">
+        <button
+          type="button"
+          onClick={handleSkip}
+          disabled={skipped || isPending}
+          className="cursor-pointer text-muted-foreground text-sm hover:underline"
+        >
+          {skipped ? 'Skipping...' : 'Skip'}
+        </button>
+        <Button
+          onClick={() => submitSource({ source: source.trim() })}
+          disabled={isPending || skipped || source.trim().length === 0}
+        >
+          {isPending ? 'Submitting...' : 'Submit'}
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/lib/survey-redirect.ts b/apps/web/src/lib/survey-redirect.ts
new file mode 100644
index 0000000000..1c07f4167b
--- /dev/null
+++ b/apps/web/src/lib/survey-redirect.ts
@@ -0,0 +1,16 @@
+import type { User } from '@kilocode/db/schema';
+
+/**
+ * If the user has not yet completed the customer-source survey,
+ * wraps `destinationPath` so the user lands on the survey first,
+ * then continues to `destinationPath` after completing it.
+ */
+export function maybeInterceptWithSurvey(
+  user: Pick<User, 'customer_source'>,
+  destinationPath: string
+): string {
+  if (user.customer_source === null && !destinationPath.startsWith('/customer-source-survey')) {
+    return `/customer-source-survey?callbackPath=${encodeURIComponent(destinationPath)}`;
+  }
+  return destinationPath;
+}
diff --git a/apps/web/src/routers/user-router.test.ts b/apps/web/src/routers/user-router.test.ts
index 330015a129..f213c30ad5 100644
--- a/apps/web/src/routers/user-router.test.ts
+++ b/apps/web/src/routers/user-router.test.ts
@@ -6,6 +6,8 @@ import { insertTestUser } from '@/tests/helpers/user.helper';
 import type { User } from '@kilocode/db/schema';
 
 let testUser: User;
+let surveyTestUser: User;
+let skipTestUser: User;
 
 describe('user router - updateProfile', () => {
   beforeAll(async () => {
@@ -129,40 +131,217 @@ describe('user router - updateProfile', () => {
   });
 });
 
-describe('user router - customer source', () => {
-  it('saves a submitted source', async () => {
-    const user = await insertTestUser();
-    const caller = await createCallerForUser(user.id);
+describe('user router - submitCustomerSource', () => {
+  beforeAll(async () => {
+    surveyTestUser = await insertTestUser({
+      google_user_email: 'survey-test@example.com',
+      google_user_name: 'Survey Test User',
+    });
+  });
 
-    await caller.user.submitCustomerSource({ source: '  GitHub  ' });
+  afterEach(async () => {
+    await db
+      .update(kilocode_users)
+      .set({ customer_source: null })
+      .where(eq(kilocode_users.id, surveyTestUser.id));
+  });
+
+  it('saves the customer source to the database', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
+    const result = await caller.user.submitCustomerSource({ source: 'A YouTube video' });
+
+    expect(result).toEqual({ success: true });
 
     const updated = await db.query.kilocode_users.findFirst({
-      where: eq(kilocode_users.id, user.id),
+      where: eq(kilocode_users.id, surveyTestUser.id),
     });
-    expect(updated?.customer_source).toBe('GitHub');
+    expect(updated?.customer_source).toBe('A YouTube video');
   });
 
-  it('rejects empty and oversized sources', async () => {
-    const user = await insertTestUser();
-    const caller = await createCallerForUser(user.id);
+  it('overwrites a previous response', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
+
+    await caller.user.submitCustomerSource({ source: 'First answer' });
+    await caller.user.submitCustomerSource({ source: 'Updated answer' });
 
-    await expect(caller.user.submitCustomerSource({ source: '   ' })).rejects.toThrow();
-    await expect(caller.user.submitCustomerSource({ source: 'a'.repeat(1001) })).rejects.toThrow();
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, surveyTestUser.id),
+    });
+    expect(updated?.customer_source).toBe('Updated answer');
   });
 
-  it('dismisses an unanswered prompt without overwriting an answer', async () => {
-    const unansweredUser = await insertTestUser();
-    const answeredUser = await insertTestUser({ customer_source: 'A teammate' });
+  it('rejects empty strings', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
+
+    await expect(caller.user.submitCustomerSource({ source: '' })).rejects.toThrow();
+  });
 
-    await (await createCallerForUser(unansweredUser.id)).user.skipCustomerSource();
-    await (await createCallerForUser(answeredUser.id)).user.skipCustomerSource();
+  it('rejects strings over 1000 characters', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
 
-    const [unansweredResult, answeredResult] = await Promise.all([
-      db.query.kilocode_users.findFirst({ where: eq(kilocode_users.id, unansweredUser.id) }),
-      db.query.kilocode_users.findFirst({ where: eq(kilocode_users.id, answeredUser.id) }),
-    ]);
-    expect(unansweredResult?.customer_source).toBe('');
-    expect(answeredResult?.customer_source).toBe('A teammate');
+    const longString = 'a'.repeat(1001);
+    await expect(caller.user.submitCustomerSource({ source: longString })).rejects.toThrow();
+  });
+
+  it('accepts a string at the max length of 1000', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
+    const maxString = 'a'.repeat(1000);
+
+    const result = await caller.user.submitCustomerSource({ source: maxString });
+    expect(result).toEqual({ success: true });
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, surveyTestUser.id),
+    });
+    expect(updated?.customer_source).toBe(maxString);
+  });
+
+  it('accepts a single-character string', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
+    const result = await caller.user.submitCustomerSource({ source: 'X' });
+
+    expect(result).toEqual({ success: true });
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, surveyTestUser.id),
+    });
+    expect(updated?.customer_source).toBe('X');
+  });
+
+  it('accepts 1000 chars of content with leading/trailing spaces (validates post-trim)', async () => {
+    const caller = await createCallerForUser(surveyTestUser.id);
+    const content = 'a'.repeat(1000);
+    const result = await caller.user.submitCustomerSource({ source: `  ${content}  ` });
+
+    expect(result).toEqual({ success: true });
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, surveyTestUser.id),
+    });
+    expect(updated?.customer_source).toBe(content);
+  });
+
+  describe('whitespace-only input rejection', () => {
+    it('rejects spaces-only input', async () => {
+      const caller = await createCallerForUser(surveyTestUser.id);
+
+      await expect(caller.user.submitCustomerSource({ source: '   ' })).rejects.toThrow();
+    });
+
+    it('rejects tab-only input', async () => {
+      const caller = await createCallerForUser(surveyTestUser.id);
+
+      await expect(caller.user.submitCustomerSource({ source: '\t\t' })).rejects.toThrow();
+    });
+
+    it('rejects newline-only input', async () => {
+      const caller = await createCallerForUser(surveyTestUser.id);
+
+      await expect(caller.user.submitCustomerSource({ source: '\n\n' })).rejects.toThrow();
+    });
+
+    it('rejects mixed whitespace input', async () => {
+      const caller = await createCallerForUser(surveyTestUser.id);
+
+      await expect(caller.user.submitCustomerSource({ source: ' \t\n ' })).rejects.toThrow();
+    });
+  });
+
+  describe('whitespace trimming on valid input', () => {
+    it('trims leading and trailing whitespace before storing', async () => {
+      const caller = await createCallerForUser(surveyTestUser.id);
+      const result = await caller.user.submitCustomerSource({ source: '  hello  ' });
+
+      expect(result).toEqual({ success: true });
+
+      const updated = await db.query.kilocode_users.findFirst({
+        where: eq(kilocode_users.id, surveyTestUser.id),
+      });
+      expect(updated?.customer_source).toBe('hello');
+    });
+
+    it('preserves internal whitespace in stored value', async () => {
+      const caller = await createCallerForUser(surveyTestUser.id);
+      const result = await caller.user.submitCustomerSource({ source: 'a YouTube video' });
+
+      expect(result).toEqual({ success: true });
+
+      const updated = await db.query.kilocode_users.findFirst({
+        where: eq(kilocode_users.id, surveyTestUser.id),
+      });
+      expect(updated?.customer_source).toBe('a YouTube video');
+    });
+  });
+});
+
+describe('user router - skipCustomerSource', () => {
+  beforeAll(async () => {
+    skipTestUser = await insertTestUser({
+      google_user_email: 'skip-survey-test@example.com',
+      google_user_name: 'Skip Survey Test User',
+    });
+  });
+
+  afterEach(async () => {
+    await db
+      .update(kilocode_users)
+      .set({ customer_source: null })
+      .where(eq(kilocode_users.id, skipTestUser.id));
+  });
+
+  it('skipCustomerSource mutation exists and returns success', async () => {
+    const caller = await createCallerForUser(skipTestUser.id);
+    const result = await caller.user.skipCustomerSource();
+
+    expect(result).toEqual({ success: true });
+  });
+
+  it('sets customer_source to empty string after skipping', async () => {
+    const caller = await createCallerForUser(skipTestUser.id);
+    await caller.user.skipCustomerSource();
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, skipTestUser.id),
+    });
+    expect(updated?.customer_source).toBe('');
+  });
+
+  it('is idempotent - calling skipCustomerSource twice still returns success', async () => {
+    const caller = await createCallerForUser(skipTestUser.id);
+
+    const result1 = await caller.user.skipCustomerSource();
+    expect(result1).toEqual({ success: true });
+
+    const result2 = await caller.user.skipCustomerSource();
+    expect(result2).toEqual({ success: true });
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, skipTestUser.id),
+    });
+    expect(updated?.customer_source).toBe('');
+  });
+
+  it('does NOT overwrite a real answer when skipCustomerSource is called after submitCustomerSource', async () => {
+    const caller = await createCallerForUser(skipTestUser.id);
+
+    await caller.user.submitCustomerSource({ source: 'Found it on Hacker News' });
+    await caller.user.skipCustomerSource();
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, skipTestUser.id),
+    });
+    expect(updated?.customer_source).toBe('Found it on Hacker News');
+  });
+
+  it('allows a real answer to overwrite a previous skip', async () => {
+    const caller = await createCallerForUser(skipTestUser.id);
+    await caller.user.skipCustomerSource();
+    await caller.user.submitCustomerSource({ source: 'Changed my mind — Reddit' });
+
+    const updated = await db.query.kilocode_users.findFirst({
+      where: eq(kilocode_users.id, skipTestUser.id),
+    });
+    expect(updated?.customer_source).toBe('Changed my mind — Reddit');
   });
 });
 
diff --git a/apps/web/src/tests/account-verification-redirect.test.ts b/apps/web/src/tests/account-verification-redirect.test.ts
index fd06a24fb3..47e1714eb7 100644
--- a/apps/web/src/tests/account-verification-redirect.test.ts
+++ b/apps/web/src/tests/account-verification-redirect.test.ts
@@ -1,9 +1,12 @@
 /**
  * Tests for the account-verification page redirect logic.
  *
- * The redirect behavior should be:
- * - If stytchStatus !== null, redirect directly to the final destination
- *   (callbackPath or /get-started).
+ * The CORRECT behavior should be:
+ * - If stytchStatus !== null AND user.customer_source !== null:
+ *   redirect directly to the final destination (callbackPath or /get-started),
+ *   skipping the survey entirely.
+ * - If stytchStatus !== null AND user.customer_source === null:
+ *   redirect to /customer-source-survey with callbackPath forwarding.
  * - If stytchStatus === null: render the page (no redirect).
  */
 
@@ -156,8 +159,11 @@ describe('account-verification redirect logic', () => {
     });
   });
 
-  describe('when stytchStatus is non-null', () => {
-    it('redirects to /get-started by default', async () => {
+  // ---------------------------------------------------------------
+  // Case: verified user who has NOT completed the survey
+  // ---------------------------------------------------------------
+  describe('when stytchStatus is non-null AND customer_source is null (survey not completed)', () => {
+    it('should redirect to /customer-source-survey with /get-started as default destination', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -165,10 +171,12 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
+      expect(mockRedirect).toHaveBeenCalledWith(
+        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
+      );
     });
 
-    it('preserves a valid callbackPath', async () => {
+    it('should redirect to /customer-source-survey with callbackPath forwarded', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -176,10 +184,12 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/get-started' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
+      expect(mockRedirect).toHaveBeenCalledWith(
+        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
+      );
     });
 
-    it('preserves an organization callbackPath', async () => {
+    it('should redirect to /customer-source-survey with an org callbackPath forwarded', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -187,12 +197,18 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/organizations/some-org-id' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith('/organizations/some-org-id');
+      expect(mockRedirect).toHaveBeenCalledWith(
+        `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
+      );
     });
   });
 
-  describe('when legacy customer_source values exist', () => {
-    it('redirects to /get-started', async () => {
+  // ---------------------------------------------------------------
+  // Case: verified user who HAS completed the survey
+  // These tests expose the redundant-redirect bug.
+  // ---------------------------------------------------------------
+  describe('when stytchStatus is non-null AND customer_source is set (survey already completed)', () => {
+    it('should redirect directly to /get-started, NOT through /customer-source-survey', async () => {
       const user = makeUser({ customer_source: 'Twitter' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -203,7 +219,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('preserves a callbackPath', async () => {
+    it('should redirect directly to callbackPath when customer_source is set', async () => {
       const user = makeUser({ customer_source: 'Twitter' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -214,7 +230,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('preserves an organization callbackPath', async () => {
+    it('should redirect directly to an org callbackPath when customer_source is set', async () => {
       const user = makeUser({ customer_source: 'A friend or colleague' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -225,7 +241,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/organizations/some-org-id');
     });
 
-    it('redirects to /get-started for a legacy skip sentinel', async () => {
+    it('should redirect to /get-started when customer_source is empty string (skipped survey)', async () => {
       const user = makeUser({ customer_source: '' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -236,7 +252,7 @@ describe('account-verification redirect logic', () => {
       expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('preserves a callbackPath for a legacy skip sentinel', async () => {
+    it('should redirect directly to callbackPath when customer_source is empty string (skipped)', async () => {
       const user = makeUser({ customer_source: '' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -261,10 +277,12 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
+      expect(mockRedirect).toHaveBeenCalledWith(
+        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
+      );
     });
 
-    it('redirects despite legacy customer_source values', async () => {
+    it('should skip survey when customer_source is set even with stytchStatus=false', async () => {
       const user = makeUser({ customer_source: 'Google search' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(false);
@@ -530,7 +548,7 @@ describe('account-verification redirect logic', () => {
   // Edge: invalid callbackPath should be ignored
   // ---------------------------------------------------------------
   describe('when callbackPath is invalid', () => {
-    it('should ignore invalid callbackPath', async () => {
+    it('should ignore invalid callbackPath for user without customer_source', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -538,10 +556,13 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: 'https://evil.com/phish' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
+      // Invalid callbackPath is dropped — redirect to survey with default destination
+      expect(mockRedirect).toHaveBeenCalledWith(
+        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
+      );
     });
 
-    it('ignores invalid callbackPath when legacy customer_source values exist', async () => {
+    it('should ignore invalid callbackPath for user with customer_source set', async () => {
       const user = makeUser({ customer_source: 'Reddit' });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
diff --git a/apps/web/src/tests/survey-redirect.test.ts b/apps/web/src/tests/survey-redirect.test.ts
new file mode 100644
index 0000000000..9d319688ec
--- /dev/null
+++ b/apps/web/src/tests/survey-redirect.test.ts
@@ -0,0 +1,47 @@
+import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
+
+describe('maybeInterceptWithSurvey', () => {
+  it('wraps destination with survey when customer_source is null', () => {
+    const user = { customer_source: null };
+    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe(
+      `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
+    );
+  });
+
+  it('preserves complex callback paths', () => {
+    const user = { customer_source: null };
+    expect(maybeInterceptWithSurvey(user, '/organizations/some-org-id')).toBe(
+      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
+    );
+  });
+
+  it('returns destination unchanged when customer_source is a non-empty string', () => {
+    const user = { customer_source: 'Twitter' };
+    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe('/get-started');
+  });
+
+  it('returns destination unchanged when customer_source is empty string (skipped)', () => {
+    const user = { customer_source: '' };
+    expect(maybeInterceptWithSurvey(user, '/profile')).toBe('/profile');
+  });
+
+  it('does not double-wrap if destination is already the survey page', () => {
+    const user = { customer_source: null };
+    const surveyPath = '/customer-source-survey?callbackPath=%2Fget-started';
+    expect(maybeInterceptWithSurvey(user, surveyPath)).toBe(surveyPath);
+  });
+
+  it('does not double-wrap bare survey path', () => {
+    const user = { customer_source: null };
+    expect(maybeInterceptWithSurvey(user, '/customer-source-survey')).toBe(
+      '/customer-source-survey'
+    );
+  });
+
+  it('correctly encodes destinations containing query strings', () => {
+    const user = { customer_source: null };
+    expect(maybeInterceptWithSurvey(user, '/organizations/abc?tab=billing')).toBe(
+      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/abc?tab=billing')}`
+    );
+  });
+});
diff --git a/apps/web/tests/e2e/app-shell-accessibility.spec.ts b/apps/web/tests/e2e/app-shell-accessibility.spec.ts
index 4010af90b4..f23948fd48 100644
--- a/apps/web/tests/e2e/app-shell-accessibility.spec.ts
+++ b/apps/web/tests/e2e/app-shell-accessibility.spec.ts
@@ -27,6 +27,7 @@ async function seedFakeUser({ isAdmin }: { isAdmin: boolean }) {
       hosted_domain: hosted_domain_specials.fake_devonly,
       stripe_customer_id: `cus_app_shell_${uniqueId}`,
       completed_welcome_form: true,
+      customer_source: 'App shell test',
       has_validation_stytch: true,
       is_admin: isAdmin,
     });
diff --git a/apps/web/tests/e2e/auth.setup.ts b/apps/web/tests/e2e/auth.setup.ts
index 62730da40d..2c25d831e0 100644
--- a/apps/web/tests/e2e/auth.setup.ts
+++ b/apps/web/tests/e2e/auth.setup.ts
@@ -17,15 +17,30 @@ setup('authenticate', async ({ page }) => {
   // Navigate to sign in page with fakeUser query param to trigger auto-submit
   await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
 
-  // Wait for navigation to complete - user will end up on their profile or org.
+  // Wait for navigation to complete - user will end up on survey, profile, or their org
   await page.waitForURL(
-    url => url.pathname === '/profile' || url.pathname.startsWith('/organizations/'),
+    url =>
+      url.pathname === '/customer-source-survey' ||
+      url.pathname === '/profile' ||
+      url.pathname.startsWith('/organizations/'),
     {
       timeout: 20000,
       waitUntil: 'networkidle',
     }
   );
 
+  // If we land on the survey page, skip it to complete setup
+  if (new URL(page.url()).pathname === '/customer-source-survey') {
+    await page.click('button:has-text("Skip")');
+    await page.waitForURL(
+      url => url.pathname === '/profile' || url.pathname.startsWith('/organizations/'),
+      {
+        timeout: 10000,
+        waitUntil: 'networkidle',
+      }
+    );
+  }
+
   // Save the authenticated state (cookies, localStorage, etc.)
   await page.context().storageState({ path: 'playwright/.auth/state.json' });
 
diff --git a/apps/web/tests/e2e/customer-source-survey.spec.ts b/apps/web/tests/e2e/customer-source-survey.spec.ts
new file mode 100644
index 0000000000..5e17870cb6
--- /dev/null
+++ b/apps/web/tests/e2e/customer-source-survey.spec.ts
@@ -0,0 +1,203 @@
+import { test, expect } from '@chromatic-com/playwright';
+import { randomUUID } from 'crypto';
+
+/**
+ * Customer Source Survey E2E tests.
+ *
+ * Each test that needs a clean survey state (customer_source === null) creates
+ * its own fresh user via the fake-login flow. This avoids shared-state issues
+ * where one test's actions (submit/skip) poison subsequent tests.
+ *
+ * The helper `signInFreshUser` navigates through sign-in and stytch verification
+ * with a brand-new email, landing the user at wherever the post-verification
+ * redirect points (which should be /customer-source-survey once Task 6 is done).
+ */
+
+function isSignedInDestination(url: URL) {
+  return url.pathname === '/profile' || url.pathname.startsWith('/organizations/');
+}
+
+async function waitForSignedInDestination(page: import('@playwright/test').Page) {
+  await page.waitForURL(url => isSignedInDestination(url), {
+    timeout: 15000,
+  });
+  expect(isSignedInDestination(new URL(page.url()))).toBe(true);
+}
+
+/**
+ * Signs in a brand-new user via fake-login with stytchpass behavior.
+ * Returns the final URL after sign-in + verification completes.
+ *
+ * Uses +stytchpass to auto-pass stytch verification so the user proceeds
+ * through the full new-user flow: sign-in -> after-sign-in -> account-verification -> survey.
+ */
+async function signInFreshUser(page: import('@playwright/test').Page): Promise<string> {
+  const uniqueId = randomUUID().slice(0, 8);
+  const testEmail = `test-survey-${uniqueId}+stytchpass@example.com`;
+
+  await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
+
+  // Wait for the full redirect chain to settle.
+  await page.waitForURL(
+    url => url.pathname === '/customer-source-survey' || isSignedInDestination(url),
+    { timeout: 30000, waitUntil: 'networkidle' }
+  );
+
+  return page.url();
+}
+
+test.describe('Customer Source Survey', () => {
+  // These tests do NOT use the shared storageState from auth.setup.ts.
+  // Each test creates its own user to ensure isolation.
+  test.use({ storageState: { cookies: [], origins: [] } });
+
+  test('new user is redirected to survey after verification', async ({ page }) => {
+    const finalUrl = await signInFreshUser(page);
+
+    // After Task 6 (account-verification redirect change), new users should
+    // land on /customer-source-survey instead of continuing directly to their app destination.
+    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
+  });
+
+  test('survey page displays expected content', async ({ page }) => {
+    const finalUrl = await signInFreshUser(page);
+    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
+
+    // Verify the page has the expected heading
+    await expect(page.getByText('Where did you hear about Kilo Code?')).toBeVisible();
+
+    // Verify the textarea placeholder is present
+    await expect(page.getByPlaceholder('Example: A YouTube video from Theo')).toBeVisible();
+
+    // Verify Submit button exists and is initially disabled (empty input)
+    const submitButton = page.getByRole('button', { name: 'Submit' });
+    await expect(submitButton).toBeVisible();
+    await expect(submitButton).toBeDisabled();
+
+    // Verify Skip link exists
+    await expect(page.getByRole('button', { name: 'Skip' })).toBeVisible();
+  });
+
+  test('submit button is enabled only when textarea has content', async ({ page }) => {
+    await signInFreshUser(page);
+
+    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
+    const submitButton = page.getByRole('button', { name: 'Submit' });
+
+    // Initially disabled
+    await expect(submitButton).toBeDisabled();
+
+    // Type something
+    await textarea.fill('A friend told me');
+    await expect(submitButton).toBeEnabled();
+
+    // Clear it
+    await textarea.fill('');
+    await expect(submitButton).toBeDisabled();
+
+    // Whitespace only should not enable (trim check)
+    await textarea.fill('   ');
+    await expect(submitButton).toBeDisabled();
+  });
+
+  test('submitting a response redirects to the signed-in app destination', async ({ page }) => {
+    await signInFreshUser(page);
+
+    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
+    const submitButton = page.getByRole('button', { name: 'Submit' });
+
+    await textarea.fill('Found it on Reddit');
+    await submitButton.click();
+
+    await waitForSignedInDestination(page);
+  });
+
+  test('skipping redirects to the signed-in app destination', async ({ page }) => {
+    await signInFreshUser(page);
+
+    const skipLink = page.getByRole('button', { name: 'Skip' });
+    await skipLink.click();
+
+    await waitForSignedInDestination(page);
+  });
+
+  test('already-answered user is redirected past survey', async ({ page }) => {
+    // First: sign in and submit a response
+    await signInFreshUser(page);
+
+    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
+    const submitButton = page.getByRole('button', { name: 'Submit' });
+
+    await textarea.fill('Twitter post');
+    await submitButton.click();
+
+    await waitForSignedInDestination(page);
+
+    // Now navigate directly to the survey page. Since customer_source is set,
+    // the server component should redirect past it.
+    await page.goto('/customer-source-survey');
+
+    await waitForSignedInDestination(page);
+  });
+
+  test('after skipping, revisiting survey should redirect away (H2 sentinel)', async ({ page }) => {
+    // This test verifies the H2 bug fix: when a user clicks "Skip", a sentinel
+    // value should be written to customer_source so that revisiting the survey
+    // redirects past it. Without the fix, customer_source stays null and the
+    // survey is shown again.
+    await signInFreshUser(page);
+
+    // Click Skip
+    const skipLink = page.getByRole('button', { name: 'Skip' });
+    await skipLink.click();
+
+    await waitForSignedInDestination(page);
+
+    // Navigate back to the survey page directly
+    await page.goto('/customer-source-survey');
+
+    // If H2 is fixed (skip writes a sentinel), user should be redirected away.
+    // If H2 is NOT fixed, user will see the survey form again.
+    await page.waitForURL(
+      url => isSignedInDestination(url) || url.pathname === '/customer-source-survey',
+      { timeout: 15000 }
+    );
+
+    // This assertion will FAIL until the H2 skip-persistence bug is fixed
+    expect(isSignedInDestination(new URL(page.url()))).toBe(true);
+  });
+
+  test('survey preserves callbackPath through submit', async ({ page }) => {
+    await signInFreshUser(page);
+
+    // If the user landed on /customer-source-survey, navigate with a callbackPath
+    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
+
+    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
+    const submitButton = page.getByRole('button', { name: 'Submit' });
+
+    await textarea.fill('Hacker News');
+    await submitButton.click();
+
+    // Should redirect to /profile (the callbackPath), not the default destination
+    await page.waitForURL(url => url.pathname === '/profile', {
+      timeout: 15000,
+    });
+    expect(new URL(page.url()).pathname).toBe('/profile');
+  });
+
+  test('survey preserves callbackPath through skip', async ({ page }) => {
+    await signInFreshUser(page);
+
+    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
+
+    const skipLink = page.getByRole('button', { name: 'Skip' });
+    await skipLink.click();
+
+    // Should redirect to /profile (the callbackPath), not the default destination
+    await page.waitForURL(url => url.pathname === '/profile', {
+      timeout: 15000,
+    });
+    expect(new URL(page.url()).pathname).toBe('/profile');
+  });
+});
diff --git a/apps/web/tests/e2e/get-started-dashboard-link.spec.ts b/apps/web/tests/e2e/get-started-dashboard-link.spec.ts
index e1819ecc71..cdf3c4a3e5 100644
--- a/apps/web/tests/e2e/get-started-dashboard-link.spec.ts
+++ b/apps/web/tests/e2e/get-started-dashboard-link.spec.ts
@@ -23,13 +23,18 @@ test.describe('/get-started auth-aware router', () => {
     const testEmail = `test-get-started-${uniqueId}+stytchpass@example.com`;
 
     await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
-    await page.waitForURL(url => isSignedInDestination(url), {
-      timeout: 30000,
-      waitUntil: 'networkidle',
-    });
-    await expect(
-      page.getByText('Where did you hear about Kilo Code?', { exact: true })
-    ).toBeVisible();
+    await page.waitForURL(
+      url => url.pathname === '/customer-source-survey' || isSignedInDestination(url),
+      { timeout: 30000, waitUntil: 'networkidle' }
+    );
+
+    if (new URL(page.url()).pathname === '/customer-source-survey') {
+      await page.getByRole('button', { name: 'Skip' }).click();
+      await page.waitForURL(url => isSignedInDestination(url), {
+        timeout: 15000,
+        waitUntil: 'networkidle',
+      });
+    }
 
     await page.goto('/get-started');
     await page.waitForURL(url => isSignedInDestination(url), {
diff --git a/apps/web/tests/e2e/onboarding-wizard.spec.ts b/apps/web/tests/e2e/onboarding-wizard.spec.ts
index 4e80f3c2e0..0a59a0a528 100644
--- a/apps/web/tests/e2e/onboarding-wizard.spec.ts
+++ b/apps/web/tests/e2e/onboarding-wizard.spec.ts
@@ -25,11 +25,24 @@ async function signInFreshUser(
   await page.waitForURL(
     url =>
       url.pathname === '/gastown/onboarding' ||
+      url.pathname === '/customer-source-survey' ||
       url.pathname === '/profile' ||
       url.pathname.startsWith('/organizations/'),
     { timeout: 30000, waitUntil: 'networkidle' }
   );
 
+  // If we landed on the survey page, skip it
+  if (new URL(page.url()).pathname === '/customer-source-survey') {
+    await page.click('button:has-text("Skip")');
+    await page.waitForURL(
+      url =>
+        url.pathname === '/gastown/onboarding' ||
+        url.pathname === '/profile' ||
+        url.pathname.startsWith('/organizations/'),
+      { timeout: 15000, waitUntil: 'networkidle' }
+    );
+  }
+
   // If we're not on /gastown/onboarding, navigate directly
   if (new URL(page.url()).pathname !== '/gastown/onboarding') {
     await page.goto('/gastown/onboarding');
diff --git a/apps/web/tests/setup-smoke/profile.spec.ts b/apps/web/tests/setup-smoke/profile.spec.ts
index 716bea4708..4f817cba60 100644
--- a/apps/web/tests/setup-smoke/profile.spec.ts
+++ b/apps/web/tests/setup-smoke/profile.spec.ts
@@ -46,6 +46,7 @@ test.describe('local setup smoke', () => {
         hosted_domain: hosted_domain_specials.fake_devonly,
         stripe_customer_id: `cus_setup_smoke_${uniqueId}`,
         completed_welcome_form: true,
+        customer_source: 'Setup smoke test',
         has_validation_stytch: true,
       });
     } finally {
diff --git a/dev/seed/AGENTS.md b/dev/seed/AGENTS.md
index 407e144845..26d25f6e84 100644
--- a/dev/seed/AGENTS.md
+++ b/dev/seed/AGENTS.md
@@ -72,8 +72,9 @@ Topic files MUST NOT:
 Bare `kilocode_users` inserts leave users trapped in onboarding. To reach product surfaces, set:
 
 - `has_validation_stytch: true` — bypasses `/account-verification` (`!== null`).
+- `customer_source: 'dev-seed'` — bypasses `/customer-source-survey` (`!== null`; `''` means skipped).
 
-Canonical example: `app/create-user.ts`. Gate code: `apps/web/src/lib/stytch.ts` (`getStytchStatus`). When adding a gate, update this section and `app/create-user.ts` together.
+Canonical example: `app/create-user.ts`. Gate code: `apps/web/src/lib/stytch.ts` (`getStytchStatus`) and `apps/web/src/lib/survey-redirect.ts` (`maybeInterceptWithSurvey`). When adding a gate, update this section and `app/create-user.ts` together.
 
 ## New-topic checklist
 
diff --git a/dev/seed/app/create-user.ts b/dev/seed/app/create-user.ts
index 2395bd88ae..b7d7905637 100644
--- a/dev/seed/app/create-user.ts
+++ b/dev/seed/app/create-user.ts
@@ -75,8 +75,11 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
     kiloUserId: userId,
   });
 
-  // Pre-set account verification so seeded users can hit dashboards without
-  // bouncing through `/account-verification`.
+  // Pre-set the onboarding gates so seeded users can hit dashboards without
+  // bouncing through `/account-verification` (gated on
+  // `has_validation_stytch !== null`) or `/customer-source-survey` (gated on
+  // `customer_source !== null`). See apps/web/src/lib/stytch.ts and
+  // apps/web/src/lib/survey-redirect.ts.
   try {
     await db.insert(kilocode_users).values({
       id: userId,
@@ -86,6 +89,7 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
       stripe_customer_id: stripeCustomer.id,
       normalized_email: normalizedEmail,
       has_validation_stytch: true,
+      customer_source: 'dev-seed',
     });
   } catch (error) {
     // The DB insert failed after we already created a Stripe customer; clean
@@ -100,5 +104,6 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
     email: trimmedEmail,
     stripeCustomerId: stripeCustomer.id,
     hasValidationStytch: true,
+    customerSource: 'dev-seed',
   };
 }
diff --git a/dev/seed/app/org-dashboard.ts b/dev/seed/app/org-dashboard.ts
index 42b7326c80..6f7d3cf99e 100644
--- a/dev/seed/app/org-dashboard.ts
+++ b/dev/seed/app/org-dashboard.ts
@@ -107,6 +107,7 @@ async function createUser(handle: string, displayName: string) {
     stripe_customer_id: `cus_seed_${id.replace(/-/g, '').slice(0, 14)}`,
     normalized_email: email,
     has_validation_stytch: true,
+    customer_source: 'dev-seed',
   });
   return id;
 }
diff --git a/dev/seed/coding-plans/demo-data.ts b/dev/seed/coding-plans/demo-data.ts
index 4d37faaa8e..6a7d41aa18 100644
--- a/dev/seed/coding-plans/demo-data.ts
+++ b/dev/seed/coding-plans/demo-data.ts
@@ -480,6 +480,7 @@ async function seedScenario(scenario: string, key: Buffer, users: SeedUser[]): P
           normalized_email: user.normalizedEmail,
           email_domain: EMAIL_DOMAIN,
           has_validation_stytch: true,
+          customer_source: 'dev-seed',
           total_microdollars_acquired: grantAmount,
           microdollars_used: subscription ? PLANS[subscription.planId].costMicrodollars : 0,
           auto_top_up_enabled: subscription?.status === 'past_due',
diff --git a/dev/seed/cost-insights/spend-evidence.ts b/dev/seed/cost-insights/spend-evidence.ts
index 089e8036b8..016c96a03c 100644
--- a/dev/seed/cost-insights/spend-evidence.ts
+++ b/dev/seed/cost-insights/spend-evidence.ts
@@ -1507,6 +1507,7 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
             stripe_customer_id: user.stripeCustomerId,
             normalized_email: user.email,
             has_validation_stytch: true,
+            customer_source: 'dev-seed',
             is_admin: user.isAdmin,
             microdollars_used: 0,
             total_microdollars_acquired: BALANCE_BUFFER_MICRODOLLARS,
@@ -1520,6 +1521,7 @@ export async function run(...args: string[]): Promise<SeedResult | void> {
               stripe_customer_id: user.stripeCustomerId,
               normalized_email: user.email,
               has_validation_stytch: true,
+              customer_source: 'dev-seed',
               is_admin: user.isAdmin,
               microdollars_used: 0,
               total_microdollars_acquired: BALANCE_BUFFER_MICRODOLLARS,

From 0b975d20e3bf9a7912e3bf84d172b51762eb06a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Uruchurtu?= <im@vheissu.me>
Date: Thu, 9 Jul 2026 18:04:24 -0600
Subject: [PATCH 3/3] refactor(web): minimize survey experience change

---
 apps/web/src/app/(app)/layout.tsx             |   2 +
 .../src/app/customer-source-survey/page.tsx   |  16 +-
 .../src/components/CustomerSourceSurvey.tsx   |  98 ++++-----
 apps/web/src/lib/survey-redirect.ts           |  10 +-
 .../account-verification-redirect.test.ts     |  29 +--
 apps/web/src/tests/survey-redirect.test.ts    |  47 ----
 .../tests/e2e/customer-source-survey.spec.ts  | 203 ------------------
 7 files changed, 65 insertions(+), 340 deletions(-)
 delete mode 100644 apps/web/src/tests/survey-redirect.test.ts
 delete mode 100644 apps/web/tests/e2e/customer-source-survey.spec.ts

diff --git a/apps/web/src/app/(app)/layout.tsx b/apps/web/src/app/(app)/layout.tsx
index eac1d1ad50..aae2e8bdac 100644
--- a/apps/web/src/app/(app)/layout.tsx
+++ b/apps/web/src/app/(app)/layout.tsx
@@ -9,6 +9,7 @@ import { AdminOmnibox } from '@/components/admin-omnibox';
 import { AppShellSkipLink } from '@/components/AppShellSkipLink';
 import { PrefetchedOrganizations } from './components/PrefetchedOrganizations';
 import { PlatformPresenceMount } from './components/PlatformPresenceMount';
+import { CustomerSourceSurvey } from '@/components/CustomerSourceSurvey';
 export default function AppLayout({ children }: { children: React.ReactNode }) {
   return (
     <RoleTestingProvider>
@@ -31,6 +32,7 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
               </div>
             </PrefetchedOrganizations>
           </SidebarProvider>
+          <CustomerSourceSurvey />
         </EventServiceProvider>
       </PageTitleProvider>
       <AdminOmnibox />
diff --git a/apps/web/src/app/customer-source-survey/page.tsx b/apps/web/src/app/customer-source-survey/page.tsx
index 020280eab0..1223f94b05 100644
--- a/apps/web/src/app/customer-source-survey/page.tsx
+++ b/apps/web/src/app/customer-source-survey/page.tsx
@@ -1,28 +1,16 @@
 import { redirect } from 'next/navigation';
 import { getUserFromAuthOrRedirect } from '@/lib/user/server';
-import { KiloCardLayout } from '@/components/KiloCardLayout';
 import { isValidCallbackPath } from '@/lib/getSignInCallbackUrl';
-import { CustomerSourceSurvey } from '@/components/CustomerSourceSurvey';
 
 export default async function CustomerSourceSurveyPage({ searchParams }: AppPageProps) {
-  const user = await getUserFromAuthOrRedirect('/users/sign_in');
+  await getUserFromAuthOrRedirect('/users/sign_in');
   const params = await searchParams;
 
-  // Determine where to go after survey
   const callbackParam = params.callbackPath;
   const redirectPath =
     callbackParam && typeof callbackParam === 'string' && isValidCallbackPath(callbackParam)
       ? callbackParam
       : '/get-started';
 
-  // If already answered, skip past
-  if (user.customer_source !== null) {
-    redirect(redirectPath);
-  }
-
-  return (
-    <KiloCardLayout title="Where did you hear about Kilo Code?" className="max-w-2xl">
-      <CustomerSourceSurvey redirectPath={redirectPath} />
-    </KiloCardLayout>
-  );
+  redirect(redirectPath);
 }
diff --git a/apps/web/src/components/CustomerSourceSurvey.tsx b/apps/web/src/components/CustomerSourceSurvey.tsx
index ba3c49ecb4..f9c9b66b56 100644
--- a/apps/web/src/components/CustomerSourceSurvey.tsx
+++ b/apps/web/src/components/CustomerSourceSurvey.tsx
@@ -1,72 +1,72 @@
 'use client';
 
 import { useState } from 'react';
-import { useRouter } from 'next/navigation';
 import { useMutation } from '@tanstack/react-query';
 import { useTRPC } from '@/lib/trpc/utils';
+import { useUser } from '@/hooks/useUser';
 import { Button } from '@/components/ui/button';
-import { Textarea } from '@/components/ui/textarea';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
 
-type CustomerSourceSurveyProps = {
-  redirectPath: string;
-};
-
-export function CustomerSourceSurvey({ redirectPath }: CustomerSourceSurveyProps) {
+export function CustomerSourceSurvey() {
   const [source, setSource] = useState('');
-  const [skipped, setSkipped] = useState(false);
-  const router = useRouter();
+  const [dismissed, setDismissed] = useState(false);
+  const { data: user } = useUser();
   const trpc = useTRPC();
 
-  const { mutate: submitSource, isPending } = useMutation(
+  const submitSource = useMutation(
     trpc.user.submitCustomerSource.mutationOptions({
-      onSuccess: () => {
-        router.push(redirectPath);
-      },
+      onSuccess: () => setDismissed(true),
     })
   );
 
-  const { mutate: skipSource } = useMutation(
+  const skipSource = useMutation(
     trpc.user.skipCustomerSource.mutationOptions({
-      onSuccess: () => {
-        router.push(redirectPath);
-      },
-      onError: () => {
-        setSkipped(false);
-      },
+      onSuccess: () => setDismissed(true),
     })
   );
 
-  function handleSkip() {
-    setSkipped(true);
-    skipSource();
+  if (dismissed || user?.customer_source !== null) {
+    return null;
   }
 
   return (
-    <div className="space-y-4 px-6 pb-6">
-      <Textarea
-        autoFocus
-        placeholder="Example: A YouTube video from Theo"
-        value={source}
-        onChange={e => setSource(e.target.value)}
-        rows={3}
-        maxLength={1000}
-      />
-      <div className="flex items-center justify-between">
-        <button
-          type="button"
-          onClick={handleSkip}
-          disabled={skipped || isPending}
-          className="cursor-pointer text-muted-foreground text-sm hover:underline"
-        >
-          {skipped ? 'Skipping...' : 'Skip'}
-        </button>
-        <Button
-          onClick={() => submitSource({ source: source.trim() })}
-          disabled={isPending || skipped || source.trim().length === 0}
-        >
-          {isPending ? 'Submitting...' : 'Submit'}
-        </Button>
-      </div>
-    </div>
+    <aside className="fixed right-4 bottom-20 z-40 w-[calc(100vw-2rem)] max-w-sm">
+      <Card className="shadow-lg">
+        <CardHeader className="p-4 pb-3">
+          <CardTitle>Where did you hear about Kilo Code?</CardTitle>
+          <CardDescription>A short answer helps us understand what is working.</CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-3 p-4 pt-0">
+          <div className="space-y-1.5">
+            <Label htmlFor="customer-source">Source</Label>
+            <Input
+              id="customer-source"
+              placeholder="GitHub, a teammate, YouTube..."
+              value={source}
+              onChange={event => setSource(event.target.value)}
+              maxLength={1000}
+            />
+          </div>
+          <div className="flex items-center justify-between gap-2">
+            <Button
+              type="button"
+              variant="ghost"
+              onClick={() => skipSource.mutate()}
+              disabled={skipSource.isPending || submitSource.isPending}
+            >
+              Dismiss
+            </Button>
+            <Button
+              onClick={() => submitSource.mutate({ source: source.trim() })}
+              disabled={submitSource.isPending || skipSource.isPending || !source.trim()}
+            >
+              Save answer
+            </Button>
+          </div>
+        </CardContent>
+      </Card>
+    </aside>
   );
 }
diff --git a/apps/web/src/lib/survey-redirect.ts b/apps/web/src/lib/survey-redirect.ts
index 1c07f4167b..1862898eea 100644
--- a/apps/web/src/lib/survey-redirect.ts
+++ b/apps/web/src/lib/survey-redirect.ts
@@ -1,16 +1,12 @@
 import type { User } from '@kilocode/db/schema';
 
 /**
- * If the user has not yet completed the customer-source survey,
- * wraps `destinationPath` so the user lands on the survey first,
- * then continues to `destinationPath` after completing it.
+ * Preserves the existing call sites while the customer-source question is
+ * presented non-blockingly in the authenticated app shell.
  */
 export function maybeInterceptWithSurvey(
-  user: Pick<User, 'customer_source'>,
+  _user: Pick<User, 'customer_source'>,
   destinationPath: string
 ): string {
-  if (user.customer_source === null && !destinationPath.startsWith('/customer-source-survey')) {
-    return `/customer-source-survey?callbackPath=${encodeURIComponent(destinationPath)}`;
-  }
   return destinationPath;
 }
diff --git a/apps/web/src/tests/account-verification-redirect.test.ts b/apps/web/src/tests/account-verification-redirect.test.ts
index 47e1714eb7..72466fa3b9 100644
--- a/apps/web/src/tests/account-verification-redirect.test.ts
+++ b/apps/web/src/tests/account-verification-redirect.test.ts
@@ -6,7 +6,7 @@
  *   redirect directly to the final destination (callbackPath or /get-started),
  *   skipping the survey entirely.
  * - If stytchStatus !== null AND user.customer_source === null:
- *   redirect to /customer-source-survey with callbackPath forwarding.
+ *   redirect directly to the final destination without blocking on the survey.
  * - If stytchStatus === null: render the page (no redirect).
  */
 
@@ -163,7 +163,7 @@ describe('account-verification redirect logic', () => {
   // Case: verified user who has NOT completed the survey
   // ---------------------------------------------------------------
   describe('when stytchStatus is non-null AND customer_source is null (survey not completed)', () => {
-    it('should redirect to /customer-source-survey with /get-started as default destination', async () => {
+    it('should redirect to /get-started as the default destination', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -171,12 +171,10 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect to /customer-source-survey with callbackPath forwarded', async () => {
+    it('should redirect directly to callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -184,12 +182,10 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/get-started' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
-    it('should redirect to /customer-source-survey with an org callbackPath forwarded', async () => {
+    it('should redirect directly to an org callbackPath', async () => {
       const user = makeUser({ customer_source: null });
       mockGetUserFromAuthOrRedirect.mockResolvedValue(user);
       mockGetStytchStatus.mockResolvedValue(true);
@@ -197,9 +193,7 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: '/organizations/some-org-id' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/organizations/some-org-id');
     });
   });
 
@@ -277,9 +271,7 @@ describe('account-verification redirect logic', () => {
       await renderPage();
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
     it('should skip survey when customer_source is set even with stytchStatus=false', async () => {
@@ -556,10 +548,7 @@ describe('account-verification redirect logic', () => {
       await renderPage({ callbackPath: 'https://evil.com/phish' });
 
       expect(mockRedirect).toHaveBeenCalledTimes(1);
-      // Invalid callbackPath is dropped — redirect to survey with default destination
-      expect(mockRedirect).toHaveBeenCalledWith(
-        `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-      );
+      expect(mockRedirect).toHaveBeenCalledWith('/get-started');
     });
 
     it('should ignore invalid callbackPath for user with customer_source set', async () => {
diff --git a/apps/web/src/tests/survey-redirect.test.ts b/apps/web/src/tests/survey-redirect.test.ts
deleted file mode 100644
index 9d319688ec..0000000000
--- a/apps/web/src/tests/survey-redirect.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { maybeInterceptWithSurvey } from '@/lib/survey-redirect';
-
-describe('maybeInterceptWithSurvey', () => {
-  it('wraps destination with survey when customer_source is null', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/get-started')}`
-    );
-  });
-
-  it('preserves complex callback paths', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/organizations/some-org-id')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/some-org-id')}`
-    );
-  });
-
-  it('returns destination unchanged when customer_source is a non-empty string', () => {
-    const user = { customer_source: 'Twitter' };
-    expect(maybeInterceptWithSurvey(user, '/get-started')).toBe('/get-started');
-  });
-
-  it('returns destination unchanged when customer_source is empty string (skipped)', () => {
-    const user = { customer_source: '' };
-    expect(maybeInterceptWithSurvey(user, '/profile')).toBe('/profile');
-  });
-
-  it('does not double-wrap if destination is already the survey page', () => {
-    const user = { customer_source: null };
-    const surveyPath = '/customer-source-survey?callbackPath=%2Fget-started';
-    expect(maybeInterceptWithSurvey(user, surveyPath)).toBe(surveyPath);
-  });
-
-  it('does not double-wrap bare survey path', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/customer-source-survey')).toBe(
-      '/customer-source-survey'
-    );
-  });
-
-  it('correctly encodes destinations containing query strings', () => {
-    const user = { customer_source: null };
-    expect(maybeInterceptWithSurvey(user, '/organizations/abc?tab=billing')).toBe(
-      `/customer-source-survey?callbackPath=${encodeURIComponent('/organizations/abc?tab=billing')}`
-    );
-  });
-});
diff --git a/apps/web/tests/e2e/customer-source-survey.spec.ts b/apps/web/tests/e2e/customer-source-survey.spec.ts
deleted file mode 100644
index 5e17870cb6..0000000000
--- a/apps/web/tests/e2e/customer-source-survey.spec.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { test, expect } from '@chromatic-com/playwright';
-import { randomUUID } from 'crypto';
-
-/**
- * Customer Source Survey E2E tests.
- *
- * Each test that needs a clean survey state (customer_source === null) creates
- * its own fresh user via the fake-login flow. This avoids shared-state issues
- * where one test's actions (submit/skip) poison subsequent tests.
- *
- * The helper `signInFreshUser` navigates through sign-in and stytch verification
- * with a brand-new email, landing the user at wherever the post-verification
- * redirect points (which should be /customer-source-survey once Task 6 is done).
- */
-
-function isSignedInDestination(url: URL) {
-  return url.pathname === '/profile' || url.pathname.startsWith('/organizations/');
-}
-
-async function waitForSignedInDestination(page: import('@playwright/test').Page) {
-  await page.waitForURL(url => isSignedInDestination(url), {
-    timeout: 15000,
-  });
-  expect(isSignedInDestination(new URL(page.url()))).toBe(true);
-}
-
-/**
- * Signs in a brand-new user via fake-login with stytchpass behavior.
- * Returns the final URL after sign-in + verification completes.
- *
- * Uses +stytchpass to auto-pass stytch verification so the user proceeds
- * through the full new-user flow: sign-in -> after-sign-in -> account-verification -> survey.
- */
-async function signInFreshUser(page: import('@playwright/test').Page): Promise<string> {
-  const uniqueId = randomUUID().slice(0, 8);
-  const testEmail = `test-survey-${uniqueId}+stytchpass@example.com`;
-
-  await page.goto(`/users/sign_in?fakeUser=${encodeURIComponent(testEmail)}`);
-
-  // Wait for the full redirect chain to settle.
-  await page.waitForURL(
-    url => url.pathname === '/customer-source-survey' || isSignedInDestination(url),
-    { timeout: 30000, waitUntil: 'networkidle' }
-  );
-
-  return page.url();
-}
-
-test.describe('Customer Source Survey', () => {
-  // These tests do NOT use the shared storageState from auth.setup.ts.
-  // Each test creates its own user to ensure isolation.
-  test.use({ storageState: { cookies: [], origins: [] } });
-
-  test('new user is redirected to survey after verification', async ({ page }) => {
-    const finalUrl = await signInFreshUser(page);
-
-    // After Task 6 (account-verification redirect change), new users should
-    // land on /customer-source-survey instead of continuing directly to their app destination.
-    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
-  });
-
-  test('survey page displays expected content', async ({ page }) => {
-    const finalUrl = await signInFreshUser(page);
-    expect(new URL(finalUrl).pathname).toBe('/customer-source-survey');
-
-    // Verify the page has the expected heading
-    await expect(page.getByText('Where did you hear about Kilo Code?')).toBeVisible();
-
-    // Verify the textarea placeholder is present
-    await expect(page.getByPlaceholder('Example: A YouTube video from Theo')).toBeVisible();
-
-    // Verify Submit button exists and is initially disabled (empty input)
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-    await expect(submitButton).toBeVisible();
-    await expect(submitButton).toBeDisabled();
-
-    // Verify Skip link exists
-    await expect(page.getByRole('button', { name: 'Skip' })).toBeVisible();
-  });
-
-  test('submit button is enabled only when textarea has content', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    // Initially disabled
-    await expect(submitButton).toBeDisabled();
-
-    // Type something
-    await textarea.fill('A friend told me');
-    await expect(submitButton).toBeEnabled();
-
-    // Clear it
-    await textarea.fill('');
-    await expect(submitButton).toBeDisabled();
-
-    // Whitespace only should not enable (trim check)
-    await textarea.fill('   ');
-    await expect(submitButton).toBeDisabled();
-  });
-
-  test('submitting a response redirects to the signed-in app destination', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Found it on Reddit');
-    await submitButton.click();
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('skipping redirects to the signed-in app destination', async ({ page }) => {
-    await signInFreshUser(page);
-
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('already-answered user is redirected past survey', async ({ page }) => {
-    // First: sign in and submit a response
-    await signInFreshUser(page);
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Twitter post');
-    await submitButton.click();
-
-    await waitForSignedInDestination(page);
-
-    // Now navigate directly to the survey page. Since customer_source is set,
-    // the server component should redirect past it.
-    await page.goto('/customer-source-survey');
-
-    await waitForSignedInDestination(page);
-  });
-
-  test('after skipping, revisiting survey should redirect away (H2 sentinel)', async ({ page }) => {
-    // This test verifies the H2 bug fix: when a user clicks "Skip", a sentinel
-    // value should be written to customer_source so that revisiting the survey
-    // redirects past it. Without the fix, customer_source stays null and the
-    // survey is shown again.
-    await signInFreshUser(page);
-
-    // Click Skip
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    await waitForSignedInDestination(page);
-
-    // Navigate back to the survey page directly
-    await page.goto('/customer-source-survey');
-
-    // If H2 is fixed (skip writes a sentinel), user should be redirected away.
-    // If H2 is NOT fixed, user will see the survey form again.
-    await page.waitForURL(
-      url => isSignedInDestination(url) || url.pathname === '/customer-source-survey',
-      { timeout: 15000 }
-    );
-
-    // This assertion will FAIL until the H2 skip-persistence bug is fixed
-    expect(isSignedInDestination(new URL(page.url()))).toBe(true);
-  });
-
-  test('survey preserves callbackPath through submit', async ({ page }) => {
-    await signInFreshUser(page);
-
-    // If the user landed on /customer-source-survey, navigate with a callbackPath
-    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
-
-    const textarea = page.getByPlaceholder('Example: A YouTube video from Theo');
-    const submitButton = page.getByRole('button', { name: 'Submit' });
-
-    await textarea.fill('Hacker News');
-    await submitButton.click();
-
-    // Should redirect to /profile (the callbackPath), not the default destination
-    await page.waitForURL(url => url.pathname === '/profile', {
-      timeout: 15000,
-    });
-    expect(new URL(page.url()).pathname).toBe('/profile');
-  });
-
-  test('survey preserves callbackPath through skip', async ({ page }) => {
-    await signInFreshUser(page);
-
-    await page.goto('/customer-source-survey?callbackPath=%2Fprofile');
-
-    const skipLink = page.getByRole('button', { name: 'Skip' });
-    await skipLink.click();
-
-    // Should redirect to /profile (the callbackPath), not the default destination
-    await page.waitForURL(url => url.pathname === '/profile', {
-      timeout: 15000,
-    });
-    expect(new URL(page.url()).pathname).toBe('/profile');
-  });
-});