Route landing account sign-ins to checkout

frontend/app/auth/callback/route.ts

@@ -96,7 +96,7 @@ async function resolvePostAuthRedirect({
   }
 
   const redirectPath =
-    profile?.subscription_active === false ? TERMINAL_CHECKOUT_PATH : nextPath;
+    profile?.subscription_active === true ? nextPath : TERMINAL_CHECKOUT_PATH;
   return new URL(redirectPath, baseUrl);
 }
 

frontend/components/account/AccountCenter.tsx

@@ -675,7 +675,7 @@ export function AccountCenter() {
             </button>
           ) : (
             <Link
-              href="/auth/login?next=%2Faccount"
+              href="/auth/login?next=%2Faccount%3Fcheckout%3D1"
               className="flex items-center gap-2 rounded-lg border border-blue-200 bg-blue-50 px-4 py-2 text-sm font-semibold text-blue-700 transition-all hover:bg-blue-100"
             >
               <LogIn size={16} /> {copy.signIn}

frontend/components/account/__tests__/trialUpgradeConversion.test.ts

@@ -11,6 +11,14 @@ export function runTests() {
   const accountCenter = fs.readFileSync(path.join(accountDir, "AccountCenter.tsx"), "utf8");
   const paymentFlow = fs.readFileSync(path.join(accountDir, "usePaymentFlow.ts"), "utf8");
   const accountPayment = fs.readFileSync(path.join(accountDir, "useAccountPayment.ts"), "utf8");
+  const landingPage = fs.readFileSync(
+    path.join(projectRoot, "components", "landing", "InstitutionalLandingPage.tsx"),
+    "utf8",
+  );
+  const landingAuthActions = fs.readFileSync(
+    path.join(projectRoot, "components", "landing", "LandingAuthActions.tsx"),
+    "utf8",
+  );
   const productAccess = fs.readFileSync(
     path.join(projectRoot, "components", "dashboard", "scan-terminal", "ProductAccessRequired.tsx"),
     "utf8",
@@ -30,6 +38,19 @@ export function runTests() {
     "account page must support /account?checkout=1 for direct upgrade entry",
   );
 
+  assert(
+    accountCenter.includes('href="/auth/login?next=%2Faccount%3Fcheckout%3D1"'),
+    "account page sign-in button must preserve the checkout entry for unauthenticated subscription recovery",
+  );
+
+  assert(
+    landingAuthActions.includes('href="/account?checkout=1"') &&
+      landingPage.includes('href="/account?checkout=1"') &&
+      !/href="\/account"(?![/?#])/.test(landingAuthActions) &&
+      !/href="\/account"(?![/?#])/.test(landingPage),
+    "landing subscription/account CTAs must open the checkout account entry instead of a generic account page",
+  );
+
   assert(
     productAccess.includes('href="/account?checkout=1"') &&
       productAccess.includes("Renew and restore access") &&

frontend/components/auth/LoginClient.tsx

@@ -51,13 +51,13 @@ async function resolvePostLoginRedirect({
         Authorization: `Bearer ${token}`,
       },
     });
-    if (!response.ok) return nextPath;
+    if (!response.ok) return TERMINAL_CHECKOUT_PATH;
     const payload = await response.json();
-    return payload?.subscription_active === false
+    return payload?.subscription_active === true
-      ? TERMINAL_CHECKOUT_PATH
+      ? nextPath
-      : nextPath;
+      : TERMINAL_CHECKOUT_PATH;
   } catch {
-    return nextPath;
+    return TERMINAL_CHECKOUT_PATH;
   }
 }
 

frontend/components/auth/__tests__/terminalCheckoutRedirect.test.ts

@@ -20,19 +20,22 @@ export function runTests() {
     loginClientSource.includes("TERMINAL_CHECKOUT_PATH") &&
       loginClientSource.includes('"/account?checkout=1"') &&
       loginClientSource.includes("resolvePostLoginRedirect") &&
-      loginClientSource.includes("subscription_active === false") &&
+      loginClientSource.includes("subscription_active === true") &&
+      loginClientSource.includes("return TERMINAL_CHECKOUT_PATH") &&
       loginClientSource.includes("router.replace(redirectPath)") &&
+      !loginClientSource.includes("if (!response.ok) return nextPath;") &&
+      !loginClientSource.includes("catch {\n    return nextPath;") &&
       !loginClientSource.includes("router.replace(nextPath);\n        return;"),
-    "email/password terminal login must send non-members to the checkout account page instead of blindly returning to /terminal",
+    "email/password terminal login must only enter /terminal after confirmed active subscription; unknown or inactive users go to checkout",
   );
 
   assert(
     authCallbackSource.includes("resolvePostAuthRedirect") &&
       authCallbackSource.includes("TERMINAL_CHECKOUT_PATH") &&
       authCallbackSource.includes('"/account?checkout=1"') &&
-      authCallbackSource.includes("subscription_active === false") &&
+      authCallbackSource.includes("subscription_active === true") &&
       authCallbackSource.includes("NextResponse.redirect(redirectUrl)") &&
       authCallbackSource.includes("await resolvePostAuthRedirect"),
-    "OAuth terminal callback must send non-members to the checkout account page instead of blindly returning to /terminal",
+    "OAuth terminal callback must only enter /terminal after confirmed active subscription; unknown or inactive users go to checkout",
   );
 }

frontend/components/landing/InstitutionalLandingPage.tsx

@@ -659,7 +659,7 @@ function InstitutionalLandingScreen({ locale }: { locale: LandingLocale }) {
                   ))}
                 </ul>
                 <Link
-                  href="/account"
+                  href="/account?checkout=1"
                   className="mt-8 inline-flex h-11 items-center justify-center gap-2 rounded-md bg-slate-950 text-sm font-bold text-white hover:bg-slate-800"
                 >
                   {isEn ? "Subscribe monthly" : "订阅月付 Pro"}

frontend/components/landing/LandingAuthActions.tsx

@@ -126,7 +126,7 @@ export function LandingHeaderActions({ locale }: { locale: LandingLocale }) {
             <ArrowIcon />
           </Link>
           <Link
-            href="/account"
+            href="/account?checkout=1"
             className="grid h-9 w-9 place-items-center rounded-md border border-slate-200 bg-white text-slate-600 shadow-sm hover:border-slate-300 hover:text-slate-950"
             title={isEn ? "Account" : "账户"}
             aria-label={isEn ? "Account" : "账户"}
@@ -181,7 +181,7 @@ export function LandingHeroActions({ locale }: { locale: LandingLocale }) {
         <ArrowIcon />
       </Link>
       <Link
-        href="/account"
+        href="/account?checkout=1"
         className="inline-flex h-11 items-center justify-center gap-2 rounded-md border border-slate-200 bg-white px-5 text-sm font-bold text-slate-700 shadow-sm hover:border-slate-300 hover:text-slate-950"
       >
         {isEn ? "Subscribe / account" : "订阅 / 账户"}