fix(kilo-pass): keep first month bonus for new subscribers

apps/web/src/components/profile/kilo-pass/KiloPassSubscribeCard.tsx

@@ -47,8 +47,10 @@ export function KiloPassSubscribeCard(props: {
     KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString()
   );
   const monthlyPromoDescription =
-    cadence === KiloPassCadence.Monthly && showSecondMonthPromo
-      ? `First-time subscribers receive 50% free bonus credits for the first two months. Offer expires ${promoCutoffLabel}.`
+    cadence === KiloPassCadence.Monthly && showFirstMonthPromo
+      ? showSecondMonthPromo
+        ? `First-time subscribers receive 50% free bonus credits for the first two months when they start before ${promoCutoffLabel}.`
+        : 'First-time subscribers receive 50% free bonus credits for the first month.'
       : null;
   const cadenceOptions = [
     { value: KiloPassCadence.Monthly, label: 'Monthly' },

apps/web/src/components/subscriptions/kilo-pass/KiloPassDetail.tsx

@@ -103,6 +103,18 @@ export function KiloPassDetail() {
     return promoPercent === KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT;
   }, [subscription]);
 
+  const showSecondMonthPromoInDialog = useMemo(() => {
+    if (!subscription || subscription.cadence !== 'monthly') return false;
+    if (subscription.currentStreakMonths > 2) return false;
+    const month2Percent = computeMonthlyCadenceBonusPercent({
+      tier: subscription.tier,
+      streakMonths: 2,
+      isFirstTimeSubscriberEver: subscription.isFirstTimeSubscriberEver,
+      subscriptionStartedAtIso: subscription.startedAt,
+    });
+    return month2Percent === KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT;
+  }, [subscription]);
+
   async function refreshData() {
     await Promise.all([
       queryClient.invalidateQueries({ queryKey: trpc.kiloPass.getState.queryKey() }),
@@ -236,7 +248,7 @@ export function KiloPassDetail() {
                 <KiloPassBonusRampDialog
                   tier={subscription.tier}
                   showFirstMonthPromo={showFirstMonthPromoInDialog}
-                  showSecondMonthPromo={subscription.currentStreakMonths === 1}
+                  showSecondMonthPromo={showSecondMonthPromoInDialog}
                   streakMonths={subscription.currentStreakMonths}
                   subscriptionStartedAtIso={subscription.startedAt ?? undefined}
                 />

apps/web/src/lib/kilo-pass/bonus.test.ts

@@ -165,6 +165,12 @@ describe('kilo pass bonus utilities', () => {
   });
 
   describe('computeMonthlyCadenceBonusPercent', () => {
+    it('keeps the second-month grandfather cutoff at midnight May 9 UTC', () => {
+      expect(KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString()).toBe(
+        '2026-05-09T00:00:00.000Z'
+      );
+    });
+
     it('applies the 50% promo for streak months 1 and 2 when eligible (strictly before cutoff)', () => {
       expect(
         computeMonthlyCadenceBonusPercent({
@@ -197,6 +203,19 @@ describe('kilo pass bonus utilities', () => {
       );
     });
 
+    it('applies the first-month promo for first-time subscribers after the grandfather cutoff', () => {
+      expect(
+        computeMonthlyCadenceBonusPercent({
+          tier: KiloPassTier.Tier19,
+          streakMonths: 1,
+          isFirstTimeSubscriberEver: true,
+          subscriptionStartedAtIso: new Date(
+            KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.valueOf() + 1
+          ).toISOString(),
+        })
+      ).toBeCloseTo(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT);
+    });
+
     it('does not apply the override when isFirstTimeSubscriberEver is false', () => {
       expect(
         computeMonthlyCadenceBonusPercent({
@@ -223,26 +242,29 @@ describe('kilo pass bonus utilities', () => {
       });
     };
 
-    it('is ineligible at cutoff and returns the fallback value (month 1)', () => {
+    it('applies the first-month promo at the second-month grandfather cutoff', () => {
       expect(
         computeMonthlyCadenceBonusPercent({
           tier,
           streakMonths: 1,
           isFirstTimeSubscriberEver: true,
           subscriptionStartedAtIso: KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString(),
         })
-      ).toBe(computeFallback({ streakMonths: 1, isFirstTimeSubscriberEver: true }));
+      ).toBe(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT);
     });
 
-    it('is ineligible at cutoff and returns the fallback value (month 2)', () => {
+    it('does not apply the second-month promo at the grandfather cutoff', () => {
       expect(
         computeMonthlyCadenceBonusPercent({
           tier,
           streakMonths: 2,
           isFirstTimeSubscriberEver: true,
           subscriptionStartedAtIso: KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString(),
         })
-      ).toBe(computeFallback({ streakMonths: 2, isFirstTimeSubscriberEver: true }));
+      ).toBeCloseTo(
+        KILO_PASS_TIER_CONFIG.tier_49.monthlyBaseBonusPercent +
+          KILO_PASS_TIER_CONFIG.tier_49.monthlyStepBonusPercent
+      );
     });
 
     it('does not apply promo when isFirstTimeSubscriberEver is false', () => {

apps/web/src/lib/kilo-pass/bonus.ts

@@ -36,9 +36,13 @@ export const computeMonthlyCadenceBonusPercent = (params: {
     throw new Error('streakMonths must be >= 1');
   }
 
-  // Limited-time promo: first-time subscribers who started strictly before the cutoff
-  // get a 50% bonus for streak months 1 and 2.
-  if (streakMonths <= 2 && isFirstTimeSubscriberEver) {
+  if (streakMonths === 1 && isFirstTimeSubscriberEver) {
+    return KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT;
+  }
+
+  // Limited-time grandfathered promo: first-time subscribers who started strictly before the
+  // cutoff keep the 50% bonus for streak month 2.
+  if (streakMonths === 2 && isFirstTimeSubscriberEver) {
     const startedAt = subscriptionStartedAtIso ?? null;
     if (startedAt != null) {
       const startedAtUtc = dayjs(startedAt).utc();
@@ -50,11 +54,6 @@ export const computeMonthlyCadenceBonusPercent = (params: {
         return KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT;
       }
     }
-
-    // Back-compat: if we don't have a start timestamp, still show the first month promo.
-    if (streakMonths === 1) {
-      return KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT;
-    }
   }
 
   const config = KILO_PASS_TIER_CONFIG[tier];

apps/web/src/lib/kilo-pass/constants.ts

@@ -10,9 +10,9 @@ type KiloPassTierConfig = {
 
 export const KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT = 0.5;
 
-// First-time subscribers receive a 50% bonus for the first 2 months if they started
-// strictly before this cutoff. (For PST, Incorporating DST)
-export const KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF = dayjs('2026-05-07T15:53:43Z').utc();
+// First-time subscribers receive a 50% bonus for month 2 only if they started
+// strictly before this grandfather cutoff. Month 1 remains 50% for new subscribers.
+export const KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF = dayjs('2026-05-09T00:00:00Z').utc();
 
 export const KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT = 0.5;
 

apps/web/src/routers/kilo-pass-router.test.ts

@@ -297,8 +297,7 @@ describe('kiloPassRouter', () => {
 
       expect(result).toEqual({
         subscription: null,
-        isEligibleForFirstMonthPromo:
-          new Date() < KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toDate(),
+        isEligibleForFirstMonthPromo: true,
       });
     });
 
@@ -744,28 +743,20 @@ describe('kiloPassRouter', () => {
       const caller = await createCallerForUser(user.id);
       const result = await caller.kiloPass.getState();
 
-      expect(result.isEligibleForFirstMonthPromo).toBe(
-        new Date() < KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toDate()
-      );
+      expect(result.isEligibleForFirstMonthPromo).toBe(true);
       expect(result.subscription).toBeNull();
     });
 
-    it('returns isEligibleForFirstMonthPromo=false after the promo cutoff', async () => {
-      // If the current time is at or after the cutoff, even a user with no subscriptions
-      // should see isEligibleForFirstMonthPromo=false.
-      const now = new Date();
-      const cutoff = KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toDate();
-      if (now >= cutoff) {
-        const user = await insertTestUser({
-          google_user_email: 'kilo-pass-promo-cutoff-ineligible@example.com',
-        });
-
-        const caller = await createCallerForUser(user.id);
-        const result = await caller.kiloPass.getState();
-
-        expect(result.isEligibleForFirstMonthPromo).toBe(false);
-        expect(result.subscription).toBeNull();
-      }
+    it('keeps isEligibleForFirstMonthPromo=true for a never-subscribed user', async () => {
+      const user = await insertTestUser({
+        google_user_email: 'kilo-pass-promo-cutoff-still-eligible@example.com',
+      });
+
+      const caller = await createCallerForUser(user.id);
+      const result = await caller.kiloPass.getState();
+
+      expect(result.isEligibleForFirstMonthPromo).toBe(true);
+      expect(result.subscription).toBeNull();
     });
 
     it('returns isEligibleForFirstMonthPromo=false when user has a canceled subscription', async () => {

apps/web/src/routers/kilo-pass-router.ts

@@ -32,11 +32,7 @@ import { KiloPassError } from '@/lib/kilo-pass/errors';
 import { isStripeSubscriptionEnded } from '@/lib/kilo-pass/stripe-subscription-status';
 import { releaseScheduledChangeForSubscription } from '@/lib/kilo-pass/scheduled-change-release';
 import { appendKiloPassAuditLog } from '@/lib/kilo-pass/issuance';
-import {
-  KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT,
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF,
-  KILO_PASS_TIER_CONFIG,
-} from '@/lib/kilo-pass/constants';
+import { KILO_PASS_TIER_CONFIG } from '@/lib/kilo-pass/constants';
 import { fromMicrodollars } from '@/lib/utils';
 import { timedUsageQuery } from '@/lib/usage-query';
 import {
@@ -131,10 +127,6 @@ const GetAverageMonthlyUsageLast3MonthsOutputSchema = z.object({
   averageMonthlyUsageUsd: z.number(),
 });
 
-function isTwoMonthPromoOfferActive(): boolean {
-  return dayjs().utc().isBefore(KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF);
-}
-
 function roundToCents(usd: number): number {
   return Math.round(usd * 100) / 100;
 }
@@ -384,7 +376,7 @@ export const kiloPassRouter = createTRPCRouter({
   getState: baseProcedure.output(GetStateOutputSchema).query(async ({ ctx }) => {
     const subscriptionBase = await getKiloPassStateForUser(db, ctx.user.id);
     if (!subscriptionBase) {
-      return { subscription: null, isEligibleForFirstMonthPromo: isTwoMonthPromoOfferActive() };
+      return { subscription: null, isEligibleForFirstMonthPromo: true };
     }
 
     const stripeCustomerId = ctx.user.stripe_customer_id;
@@ -478,22 +470,14 @@ export const kiloPassRouter = createTRPCRouter({
       currentPeriodBonusCreditsUsd = roundToCents(usd);
     } else {
       const streakMonths = Math.max(1, subscriptionBase.currentStreakMonths);
-      const shouldShowFirstMonthPromo =
-        streakMonths === 1 && isFirstTimeSubscriberEver && isTwoMonthPromoOfferActive();
-
-      if (shouldShowFirstMonthPromo) {
-        const cents = Math.round(baseAmountUsd * KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT * 100);
-        currentPeriodBonusCreditsUsd = cents / 100;
-      } else {
-        const bonusPercentApplied = computeMonthlyCadenceBonusPercent({
-          tier: subscriptionBase.tier,
-          streakMonths,
-          isFirstTimeSubscriberEver,
-          subscriptionStartedAtIso: subscriptionBase.startedAt,
-        });
-        const cents = Math.round(baseAmountUsd * bonusPercentApplied * 100);
-        currentPeriodBonusCreditsUsd = cents / 100;
-      }
+      const bonusPercentApplied = computeMonthlyCadenceBonusPercent({
+        tier: subscriptionBase.tier,
+        streakMonths,
+        isFirstTimeSubscriberEver,
+        subscriptionStartedAtIso: subscriptionBase.startedAt,
+      });
+      const cents = Math.round(baseAmountUsd * bonusPercentApplied * 100);
+      currentPeriodBonusCreditsUsd = cents / 100;
     }
 
     const nowUtc = dayjs().utc();