diff --git a/.specs/impact-referrals.md b/.specs/impact-referrals.md
index a30c81072b8..df8c37f450f 100644
--- a/.specs/impact-referrals.md
+++ b/.specs/impact-referrals.md
@@ -123,9 +123,9 @@ BCP 14 [RFC 2119] [RFC 8174] keywords apply only when they appear in all capital
   after the referral reward was earned. Annual subscription issuances and already-created issuances are not eligible.
 - **Kilo Pass bonus-like issuance item**: Kilo Pass issuance item of kind `bonus`, `promo_first_month_50pct`, or
   `referral_bonus`. At most one bonus-like item may exist for an issuance.
-- **Referral launch cutoff**: UTC instant configured for the Kilo Pass referral launch. First-time monthly subscribers
-  who started before the cutoff keep legacy month-2 welcome promo behavior; subscribers starting at or after the cutoff
-  receive only the first-month welcome promo.
+- **Kilo Pass welcome-month issuance**: Monthly base issuance that receives the 50% welcome promo under the
+  subscription-start schedule in `.specs/kilo-pass.md`. It is streak month 1 for starts before `2026-10-09T00:00:00Z`
+  and streak month 2 for starts at or after that cutoff.
 
 ## Overview
 
@@ -535,8 +535,8 @@ application, and Kilo Pass redeems after local referral bonus allocation.
 114.  A qualified Kilo Pass referral conversion MUST grant one Kilo Pass referral bonus reward to the referrer unless
       cap-limited or disqualified.
 
-115.  Kilo Pass first-time monthly subscribers MUST keep the first-month welcome promo when otherwise eligible. Referral
-      rewards MUST NOT replace, reduce, or retroactively alter the source conversion's first-month welcome issuance.
+115.  Kilo Pass first-time monthly subscribers MUST keep the welcome promo when otherwise eligible. Referral rewards MUST
+      NOT replace, reduce, or retroactively alter the beneficiary's welcome-month issuance.
 
 116.  Kilo Pass referral reward value MUST be snapshotted at conversion as 50% of the referee's eligible monthly tier.
       Later tier changes by either beneficiary MUST NOT change the reward amount.
@@ -551,7 +551,8 @@ application, and Kilo Pass redeems after local referral bonus allocation.
       rewards represent up to five future monthly referral bonus applications.
 
 120.  At eligible Kilo Pass base monthly issuance time, if the beneficiary has one or more pending unexpired Kilo Pass
-      referral rewards and no permanent application blocker applies, the system MUST consume exactly one reward.
+      referral rewards, no permanent application blocker applies, and the issuance is not the beneficiary's welcome-month
+      issuance (Rule 123), the system MUST consume exactly one reward.
 
 121.  At most one pending Kilo Pass referral reward MUST be consumed per eligible monthly Kilo Pass base issuance.
 
@@ -563,6 +564,8 @@ application, and Kilo Pass redeems after local referral bonus allocation.
 
 123.  A Kilo Pass referral reward MUST apply only to an eligible monthly base issuance after the reward is earned. It MUST
       NOT apply retroactively to the source conversion's base issuance or to any already-created issuance.
+      If the issuance is the beneficiary's welcome-month issuance, the reward MUST stay pending for a later issuance.
+      This applies to referee and referrer rewards.
 
 124.  A consumed Kilo Pass referral reward MUST create a distinct `referral_bonus` Kilo Pass issuance item.
 
@@ -587,9 +590,10 @@ application, and Kilo Pass redeems after local referral bonus allocation.
       rewards but only an annual Kilo Pass subscription, rewards remain pending until an eligible monthly subscription is
       available or the rewards expire.
 
-132.  Kilo Pass welcome bonus behavior MUST change at referral launch: first-time monthly subscribers who started before
-      the referral launch cutoff keep legacy month-2 promo eligibility; subscribers starting at or after the cutoff MUST
-      receive only the first-month welcome promo.
+132.  The monthly welcome schedule MUST follow the subscription-start cutoff in `.specs/kilo-pass.md`.
+      Eligible first-time subscribers starting before `2026-10-09T00:00:00Z` receive the welcome promo only in month 1.
+      Those starting at or after that cutoff receive the welcome promo only in month 2.
+      Returning subscribers MUST always use the normal monthly ramp.
 
 ### Shared Reward Granting
 
@@ -813,6 +817,12 @@ application, and Kilo Pass redeems after local referral bonus allocation.
 
 ## Changelog
 
+### 2026-10-08 -- Keep the welcome month free of referral rewards
+
+Defined the welcome-month issuance from the Kilo Pass subscription-start schedule. A pending referral reward now waits
+for the next eligible issuance when the current issuance is the beneficiary's welcome month, for both referees and
+referrers. This keeps the month-2 welcome promo for subscribers starting at or after `2026-10-09T00:00:00Z`.
+
 ### 2026-08-19 -- Retire the KiloClaw referral program
 
 Removed the KiloClaw Advocate referral program. New KiloClaw referral touches, participants, conversions, decisions, and
diff --git a/.specs/kilo-pass.md b/.specs/kilo-pass.md
index d88275e8084..e63b1665579 100644
--- a/.specs/kilo-pass.md
+++ b/.specs/kilo-pass.md
@@ -157,10 +157,14 @@ with welcome-promo overrides. Yearly subscriptions use a flat 50% monthly bonus.
     Bonus-decision paths MUST clamp streak to at least `1` before applying the ramp.
 14. Yearly cadence MUST use a flat monthly bonus of 50% of the monthly price and MUST NOT use the monthly ramp or
     welcome-promo branch.
-15. An eligible first-time monthly subscriber MUST receive a 50% bonus in streak month 1 instead of the monthly ramp
-    value.
-16. An eligible first-time monthly subscriber whose subscription start is strictly before `2026-05-07T00:00:00Z` MUST
-    receive a 50% bonus in streak month 2 instead of the monthly ramp value.
+15. For eligible first-time monthly subscribers started strictly before `2026-10-09T00:00:00Z`, streak month 1 MUST use
+    the 50% welcome bonus, month 2 MUST use the normal 10% ramp, and month 3 MUST use the normal 15% ramp.
+    This includes subscriptions started before May 7, 2026; no two-month welcome-promo grandfathering remains.
+16. For eligible first-time monthly subscribers started at or after `2026-10-09T00:00:00Z`, streak month 1 MUST use the
+    normal 5% ramp, month 2 MUST use the 50% welcome bonus, and month 3 MUST use the normal 15% ramp.
+    The subscription start timestamp MUST determine the schedule, with no persisted schedule flag.
+    Missing or invalid subscription starts MUST conservatively use the legacy month-1 schedule.
+    Non-first-time subscribers MUST always use the normal monthly ramp, regardless of subscription start.
 17. From streak month 3 onward, and in any month where the welcome promo does not apply, monthly cadence MUST use the
     monthly ramp value.
 18. New welcome-promo grants MUST use the `bonus` issuance-item kind with a 50% applied percent.
@@ -414,9 +418,8 @@ The following behavior or stronger guarantees are not implemented by current cod
 8. Explicit ended-state streak reset for reactivated store subscriptions.
 9. Guaranteed expiry for every granted bonus credit.
 10. Independent durable audit recording for every failed provider or issuance operation.
-11. Retirement of the grandfathered streak-month-2 promo branch after no eligible pre-cutoff subscriptions remain.
-12. Store-provider welcome-promo anti-abuse signals equivalent to Stripe fingerprint claims.
-13. Atomic prevention of concurrent or repeated active Kilo Pass purchases by the same user. Duplicate-card Rules 51-55
+11. Store-provider welcome-promo anti-abuse signals equivalent to Stripe fingerprint claims.
+12. Atomic prevention of concurrent or repeated active Kilo Pass purchases by the same user. Duplicate-card Rules 51-55
     intentionally exclude same-user purchases.
 
 ## Adjacent Spec Compatibility
@@ -431,6 +434,19 @@ promo or Kilo Pass referral conversion.
 
 ## Changelog
 
+### 2026-10-08 -- Timestamp-based monthly welcome bonus cutoff
+
+- Eligible first-time monthly starts strictly before October 9, 2026 at midnight UTC receive 50%, 10%, then 15%.
+- Starts at or after the cutoff receive 5%, 50%, then 15%; returning subscribers always use the normal ramp.
+- Removed the stored schedule flag and its unshipped migration; subscription start is the only schedule authority.
+- Removed the former pre-May-7 two-month welcome bonus, while keeping missing/invalid starts on the month-1 schedule.
+- Kept the regular monthly ramp, yearly bonuses, payment eligibility, and usage unlock unchanged.
+- Updated subscription offers, ramp previews, and KiloClaw upsells to show the new schedule.
+- Kept yearly upsell text at 50% every month and limited welcome callouts to the applicable promo window.
+- Kept the selected welcome month in ramp totals after the welcome callout disappears.
+- Pending referral rewards skip the welcome-month issuance and apply to the next eligible issuance
+  (`.specs/impact-referrals.md` Rule 123).
+
 ### 2026-06-08 -- Yearly duplicate-card enforcement
 
 - First paid yearly purchases are now subject to the same 24-hour cross-account card-reuse restriction as first paid
diff --git a/apps/web/src/app/(app)/claw/components/billing/PlanSelectionDialog.tsx b/apps/web/src/app/(app)/claw/components/billing/PlanSelectionDialog.tsx
index 74da8744c99..00ffad9268c 100644
--- a/apps/web/src/app/(app)/claw/components/billing/PlanSelectionDialog.tsx
+++ b/apps/web/src/app/(app)/claw/components/billing/PlanSelectionDialog.tsx
@@ -11,6 +11,7 @@ import { Badge } from '@/components/ui/badge';
 import { KiloPassIcon } from '@/components/icons/KiloPassIcon';
 import { cn } from '@/lib/utils';
 import { useTRPC } from '@/lib/trpc/utils';
+import { getMonthlyWelcomePromoMonth } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import {
   createKiloClawSignupDisplay,
   formatMicrodollars,
@@ -92,11 +93,15 @@ function TierCard({
   cadence,
   isSelected,
   onSelect,
+  showFirstMonthPromo,
+  subscriptionStartedAtIso,
 }: {
   tier: Tier;
   cadence: Cadence;
   isSelected: boolean;
   onSelect: () => void;
+  showFirstMonthPromo: boolean;
+  subscriptionStartedAtIso: string;
 }) {
   const data = TIER_DATA[tier];
   const isYearly = cadence === 'yearly';
@@ -105,6 +110,7 @@ function TierCard({
   const creditsLabel = isYearly
     ? `$${data.yearlyPrice}/year paid credits`
     : `$${data.monthlyPrice}/month paid credits`;
+  const promoMonth = getMonthlyWelcomePromoMonth(subscriptionStartedAtIso);
 
   return (
     <button
@@ -130,11 +136,19 @@ function TierCard({
         <div className="text-muted-foreground text-xs leading-relaxed">
           <span className="text-amber-300">{creditsLabel}</span>
         </div>
-        <div className="text-muted-foreground text-xs leading-relaxed">
-          Up to <span className="text-emerald-300">40%</span> free bonus credits
-        </div>
+        {!isYearly && (
+          <div className="text-muted-foreground text-xs leading-relaxed">
+            Up to <span className="text-emerald-300">40%</span> free bonus credits
+          </div>
+        )}
         <div className="text-xs leading-relaxed text-emerald-300">
-          First month: +50% free bonus credits
+          {isYearly
+            ? '+50% free bonus credits every month'
+            : !showFirstMonthPromo
+              ? 'Month 1: +5%; month 2: +10% free bonus credits'
+              : promoMonth === 1
+                ? 'Month 1: +50%; month 2: +10% free bonus credits'
+                : 'Month 1: +5%; month 2: +50% free bonus credits'}
         </div>
       </div>
 
@@ -289,8 +303,17 @@ function HostingOnlyPlanCard({
   );
 }
 
-function CreditsHowItWorks() {
+function CreditsHowItWorks({
+  cadence,
+  showFirstMonthPromo,
+  subscriptionStartedAtIso,
+}: {
+  cadence: Cadence;
+  showFirstMonthPromo: boolean;
+  subscriptionStartedAtIso: string;
+}) {
   const [open, setOpen] = useState(false);
+  const promoMonth = getMonthlyWelcomePromoMonth(subscriptionStartedAtIso);
   return (
     <div className="border-border/50 mb-3.5 overflow-hidden rounded-lg border">
       <button
@@ -319,8 +342,26 @@ function CreditsHowItWorks() {
           <div className="text-muted-foreground flex items-start gap-2 py-0.5 text-xs">
             <Check className="mt-0.5 h-3.5 w-3.5 shrink-0 text-emerald-400" />
             <span>
-              First-time subscribers receive <span className="text-emerald-300">50%</span> free
-              bonus credits for the first month.
+              {cadence === 'yearly' ? (
+                <>Yearly subscribers receive 50% free bonus credits every month.</>
+              ) : !showFirstMonthPromo ? (
+                <>
+                  Monthly subscribers start with 5% free bonus credits, increasing by 5 percentage
+                  points each consecutive month up to 40%.
+                </>
+              ) : promoMonth === 1 ? (
+                <>
+                  First-time monthly subscribers receive{' '}
+                  <span className="text-emerald-300">50%</span> free bonus credits for the first
+                  month, then the regular 10% bonus in the second month.
+                </>
+              ) : (
+                <>
+                  First-time monthly subscribers receive{' '}
+                  <span className="text-emerald-300">50%</span> free bonus credits for the second
+                  month, with the regular 5% bonus in the first month.
+                </>
+              )}
             </span>
           </div>
         </div>
@@ -509,6 +550,9 @@ export function PlanSelectionDialog({ open, onOpenChange }: PlanSelectionDialogP
   const { data: billing, isPending: billingSummaryPending } = useQuery(
     trpc.kiloclaw.getPersonalBillingSummary.queryOptions()
   );
+  const { data: kiloPassState } = useQuery(trpc.kiloPass.getState.queryOptions());
+  const showFirstMonthPromo = kiloPassState?.isEligibleForFirstMonthPromo === true;
+  const subscriptionStartedAtIso = new Date().toISOString();
   const checkout = useMutation(trpc.kiloclaw.createSubscriptionCheckout.mutationOptions());
   const kiloPassUpsell = useMutation(
     trpc.kiloclaw.createKiloPassUpsellCheckout.mutationOptions({
@@ -729,13 +773,19 @@ export function PlanSelectionDialog({ open, onOpenChange }: PlanSelectionDialogP
                       key={tier}
                       tier={tier}
                       cadence={cadence}
+                      showFirstMonthPromo={showFirstMonthPromo}
+                      subscriptionStartedAtIso={subscriptionStartedAtIso}
                       isSelected={selectedTier === tier}
                       onSelect={() => handleTierSelect(tier)}
                     />
                   ))}
                 </div>
 
-                <CreditsHowItWorks />
+                <CreditsHowItWorks
+                  cadence={cadence}
+                  showFirstMonthPromo={showFirstMonthPromo}
+                  subscriptionStartedAtIso={subscriptionStartedAtIso}
+                />
 
                 {/* Warning */}
                 <div className="mb-4 flex items-start gap-2 rounded-lg border border-amber-500/30 bg-amber-500/10 px-3 py-2.5">
diff --git a/apps/web/src/app/(app)/claw/components/billing/WelcomePage.tsx b/apps/web/src/app/(app)/claw/components/billing/WelcomePage.tsx
index a7496e90878..64278f2c4d0 100644
--- a/apps/web/src/app/(app)/claw/components/billing/WelcomePage.tsx
+++ b/apps/web/src/app/(app)/claw/components/billing/WelcomePage.tsx
@@ -10,6 +10,7 @@ import { Badge } from '@/components/ui/badge';
 import { KiloPassIcon } from '@/components/icons/KiloPassIcon';
 import { cn } from '@/lib/utils';
 import { useTRPC } from '@/lib/trpc/utils';
+import { getMonthlyWelcomePromoMonth } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import {
   createKiloClawSignupDisplay,
   formatMicrodollars,
@@ -85,11 +86,15 @@ function TierCard({
   cadence,
   isSelected,
   onSelect,
+  showFirstMonthPromo,
+  subscriptionStartedAtIso,
 }: {
   tier: Tier;
   cadence: Cadence;
   isSelected: boolean;
   onSelect: () => void;
+  showFirstMonthPromo: boolean;
+  subscriptionStartedAtIso: string;
 }) {
   const data = TIER_DATA[tier];
   const isYearly = cadence === 'yearly';
@@ -98,6 +103,7 @@ function TierCard({
   const creditsLabel = isYearly
     ? `$${data.yearlyPrice}/year paid credits`
     : `$${data.monthlyPrice}/month paid credits`;
+  const promoMonth = getMonthlyWelcomePromoMonth(subscriptionStartedAtIso);
 
   return (
     <button
@@ -123,11 +129,19 @@ function TierCard({
         <div className="text-muted-foreground text-xs leading-relaxed">
           <span className="text-amber-300">{creditsLabel}</span>
         </div>
-        <div className="text-muted-foreground text-xs leading-relaxed">
-          Up to <span className="text-emerald-300">40%</span> free bonus credits
-        </div>
+        {!isYearly && (
+          <div className="text-muted-foreground text-xs leading-relaxed">
+            Up to <span className="text-emerald-300">40%</span> free bonus credits
+          </div>
+        )}
         <div className="text-xs leading-relaxed text-emerald-300">
-          First month: +50% free bonus credits
+          {isYearly
+            ? '+50% free bonus credits every month'
+            : !showFirstMonthPromo
+              ? 'Month 1: +5%; month 2: +10% free bonus credits'
+              : promoMonth === 1
+                ? 'Month 1: +50%; month 2: +10% free bonus credits'
+                : 'Month 1: +5%; month 2: +50% free bonus credits'}
         </div>
       </div>
 
@@ -282,8 +296,17 @@ function HostingOnlyPlanCard({
   );
 }
 
-function CreditsHowItWorks() {
+function CreditsHowItWorks({
+  cadence,
+  showFirstMonthPromo,
+  subscriptionStartedAtIso,
+}: {
+  cadence: Cadence;
+  showFirstMonthPromo: boolean;
+  subscriptionStartedAtIso: string;
+}) {
   const [open, setOpen] = useState(false);
+  const promoMonth = getMonthlyWelcomePromoMonth(subscriptionStartedAtIso);
   return (
     <div className="border-border/50 mb-3.5 overflow-hidden rounded-lg border">
       <button
@@ -312,8 +335,26 @@ function CreditsHowItWorks() {
           <div className="text-muted-foreground flex items-start gap-2 py-0.5 text-xs">
             <Check className="mt-0.5 h-3.5 w-3.5 shrink-0 text-emerald-400" />
             <span>
-              First-time subscribers receive <span className="text-emerald-300">50%</span> free
-              bonus credits for the first month.
+              {cadence === 'yearly' ? (
+                <>Yearly subscribers receive 50% free bonus credits every month.</>
+              ) : !showFirstMonthPromo ? (
+                <>
+                  Monthly subscribers start with 5% free bonus credits, increasing by 5 percentage
+                  points each consecutive month up to 40%.
+                </>
+              ) : promoMonth === 1 ? (
+                <>
+                  First-time monthly subscribers receive{' '}
+                  <span className="text-emerald-300">50%</span> free bonus credits for the first
+                  month, then the regular 10% bonus in the second month.
+                </>
+              ) : (
+                <>
+                  First-time monthly subscribers receive{' '}
+                  <span className="text-emerald-300">50%</span> free bonus credits for the second
+                  month, with the regular 5% bonus in the first month.
+                </>
+              )}
             </span>
           </div>
         </div>
@@ -502,6 +543,9 @@ export function WelcomePage() {
   const { data: billing, isPending: billingSummaryPending } = useQuery(
     trpc.kiloclaw.getPersonalBillingSummary.queryOptions()
   );
+  const { data: kiloPassState } = useQuery(trpc.kiloPass.getState.queryOptions());
+  const showFirstMonthPromo = kiloPassState?.isEligibleForFirstMonthPromo === true;
+  const subscriptionStartedAtIso = new Date().toISOString();
   const checkoutMutation = useMutation(trpc.kiloclaw.createSubscriptionCheckout.mutationOptions());
   const kiloPassUpsell = useMutation(
     trpc.kiloclaw.createKiloPassUpsellCheckout.mutationOptions({
@@ -720,13 +764,19 @@ export function WelcomePage() {
                     key={tier}
                     tier={tier}
                     cadence={cadence}
+                    showFirstMonthPromo={showFirstMonthPromo}
+                    subscriptionStartedAtIso={subscriptionStartedAtIso}
                     isSelected={selectedTier === tier}
                     onSelect={() => handleTierSelect(tier)}
                   />
                 ))}
               </div>
 
-              <CreditsHowItWorks />
+              <CreditsHowItWorks
+                cadence={cadence}
+                showFirstMonthPromo={showFirstMonthPromo}
+                subscriptionStartedAtIso={subscriptionStartedAtIso}
+              />
 
               {/* Warning */}
               <div className="mb-4 flex items-start gap-2 rounded-lg border border-amber-500/30 bg-amber-500/10 px-3 py-2.5">
diff --git a/apps/web/src/components/profile/ProfileKiloPassSection.tsx b/apps/web/src/components/profile/ProfileKiloPassSection.tsx
index bb6309a3ebe..340f1591591 100644
--- a/apps/web/src/components/profile/ProfileKiloPassSection.tsx
+++ b/apps/web/src/components/profile/ProfileKiloPassSection.tsx
@@ -12,14 +12,6 @@ import { KiloPassSubscribeCard } from '@/components/profile/kilo-pass/KiloPassSu
 import { KiloPassReferralButton } from '@/components/referrals/KiloPassReferralButton';
 import { isStripeSubscriptionEnded } from '@kilocode/web-shared/lib/kilo-pass/stripe-subscription-status';
 import { recommendKiloPassTierFromAverageMonthlyUsageUsd } from '@/lib/kilo-pass/recommend-tier';
-import { KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF } from '@kilocode/web-shared/lib/kilo-pass/constants';
-import { dayjs } from '@kilocode/web-shared/lib/kilo-pass/dayjs';
-
-function getShowKiloPassTwoMonthPromo(showFirstMonthPromo: boolean): boolean {
-  return (
-    showFirstMonthPromo && dayjs().utc().isBefore(KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF)
-  );
-}
 
 export function ProfileKiloPassSection() {
   const trpc = useTRPC();
@@ -66,7 +58,6 @@ export function ProfileKiloPassSection() {
   if (!activeSubscription) {
     const pending = checkoutMutation.isPending;
     const showFirstMonthPromo = query.data.isEligibleForFirstMonthPromo;
-    const showSecondMonthPromo = getShowKiloPassTwoMonthPromo(showFirstMonthPromo);
     const averageMonthlyUsageUsd = averageMonthlyUsageQuery.data?.averageMonthlyUsageUsd;
     const recommendedTier =
       typeof averageMonthlyUsageUsd === 'number'
@@ -79,7 +70,6 @@ export function ProfileKiloPassSection() {
         setCadence={setCadence}
         pending={pending}
         showFirstMonthPromo={showFirstMonthPromo}
-        showSecondMonthPromo={showSecondMonthPromo}
         headerAction={
           <KiloPassReferralButton className="w-full sm:w-auto" source="profile_kilo_pass_section" />
         }
diff --git a/apps/web/src/components/profile/kilo-pass/KiloPassActiveSubscriptionCard.test.ts b/apps/web/src/components/profile/kilo-pass/KiloPassActiveSubscriptionCard.test.ts
index eaeab6a99f1..cd2abad2fcf 100644
--- a/apps/web/src/components/profile/kilo-pass/KiloPassActiveSubscriptionCard.test.ts
+++ b/apps/web/src/components/profile/kilo-pass/KiloPassActiveSubscriptionCard.test.ts
@@ -59,6 +59,46 @@ function buildScheduledChange(
 
 describe('KiloPassActiveSubscriptionCard.logic', () => {
   describe('computeRenewInfoRowModel()', () => {
+    test.each([
+      ['2026-10-08T23:59:59.999Z', true, 0, 9.5],
+      ['2026-10-08T23:59:59.999Z', true, 1, 1.9],
+      ['2026-10-08T23:59:59.999Z', true, 2, 2.85],
+      ['2026-10-09T00:00:00Z', true, 0, 0.95],
+      ['2026-10-09T00:00:00Z', true, 1, 9.5],
+      ['2026-10-09T00:00:00Z', true, 2, 2.85],
+      ['2026-05-06T00:00:00Z', true, 0, 9.5],
+      ['2026-05-06T00:00:00Z', true, 1, 1.9],
+      [null, true, 0, 9.5],
+      [null, true, 1, 1.9],
+      ['invalid', true, 0, 9.5],
+      ['invalid', true, 1, 1.9],
+      ['2026-10-08T23:59:59.999Z', false, 0, 0.95],
+      ['2026-10-08T23:59:59.999Z', false, 1, 1.9],
+      ['2026-10-09T00:00:00Z', false, 0, 0.95],
+      ['2026-10-09T00:00:00Z', false, 1, 1.9],
+      ['2026-10-09T00:00:00Z', false, 2, 2.85],
+    ])(
+      'projects the monthly schedule for start %s, first-time eligibility %s and streak %i',
+      (startedAt, isFirstTimeSubscriberEver, currentStreakMonths, expectedBonusUsd) => {
+        const rows = computeRenewInfoRowModel({
+          subscription: buildSubscription({
+            startedAt,
+            currentStreakMonths,
+            isFirstTimeSubscriberEver,
+            refillAt: '2026-11-08T10:16:13Z',
+          }),
+          isPendingCancellation: false,
+          scheduledChange: null,
+          nowIso: '2026-10-09T00:00:00Z',
+        });
+        const row = rows.find(row => row.kind === 'renews_and_adds_bonus');
+        if (row?.kind !== 'renews_and_adds_bonus') {
+          throw new Error('expected renews_and_adds_bonus');
+        }
+        expect(row.bonusUsd).toBeCloseTo(expectedBonusUsd);
+      }
+    );
+
     test('returns active_until when pending cancellation and refillAt exists', () => {
       const rows = computeRenewInfoRowModel({
         subscription: buildSubscription({
diff --git a/apps/web/src/components/profile/kilo-pass/KiloPassBonusRampDialog.tsx b/apps/web/src/components/profile/kilo-pass/KiloPassBonusRampDialog.tsx
index 440eebc1e2c..a08108099aa 100644
--- a/apps/web/src/components/profile/kilo-pass/KiloPassBonusRampDialog.tsx
+++ b/apps/web/src/components/profile/kilo-pass/KiloPassBonusRampDialog.tsx
@@ -11,7 +11,10 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/components/ui/dialog';
-import { computeMonthlyCadenceBonusPercent } from '@kilocode/web-shared/lib/kilo-pass/bonus';
+import {
+  computeMonthlyCadenceBonusPercent,
+  getMonthlyWelcomePromoMonth,
+} from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import {
   KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT,
   KILO_PASS_TIER_CONFIG,
@@ -26,41 +29,33 @@ const clampMonth = (month: number) => Math.min(12, Math.max(1, Math.round(month)
 export function KiloPassBonusRampDialog(props: {
   tier: KiloPassTier;
   showFirstMonthPromo?: boolean;
-  showSecondMonthPromo?: boolean;
   streakMonths?: number;
   showSlider?: boolean;
-  subscriptionStartedAtIso?: string;
+  subscriptionStartedAtIso?: string | null;
 }) {
   const {
     tier,
     showFirstMonthPromo = false,
-    showSecondMonthPromo = false,
     streakMonths,
     showSlider = true,
     subscriptionStartedAtIso,
   } = props;
   const [open, setOpen] = useState(false);
 
-  const fallbackSubscriptionStartedAtIso = useMemo(() => {
-    const now = new Date();
-    now.setSeconds(0, 0);
-    return now.toISOString();
-  }, []);
-
-  const resolvedSubscriptionStartedAtIso =
-    subscriptionStartedAtIso ?? fallbackSubscriptionStartedAtIso;
   const resolvedMonth =
     typeof streakMonths === 'number' && !Number.isNaN(streakMonths) ? clampMonth(streakMonths) : 1;
   const [sliderMonth, setSliderMonth] = useState(resolvedMonth);
   const effectiveMonth = showSlider ? sliderMonth : resolvedMonth;
   const config = KILO_PASS_TIER_CONFIG[tier];
-  const showPromoCallout = showSlider && showFirstMonthPromo;
+  const promoMonth = getMonthlyWelcomePromoMonth(subscriptionStartedAtIso);
+  const showPromoCallout = showSlider && showFirstMonthPromo && resolvedMonth <= promoMonth;
+  const promoMonthLabel = promoMonth === 1 ? 'first paid month' : 'second paid month';
 
   const sliderPercent = computeMonthlyCadenceBonusPercent({
     tier,
     streakMonths: effectiveMonth,
     isFirstTimeSubscriberEver: showFirstMonthPromo,
-    subscriptionStartedAtIso: resolvedSubscriptionStartedAtIso,
+    subscriptionStartedAtIso,
   });
 
   const totalBonusUsd = useMemo(
@@ -71,7 +66,7 @@ export function KiloPassBonusRampDialog(props: {
               tier,
               streakMonths: index + 1,
               isFirstTimeSubscriberEver: showFirstMonthPromo,
-              subscriptionStartedAtIso: resolvedSubscriptionStartedAtIso,
+              subscriptionStartedAtIso,
             })
           ).reduce((total, percent) => total + config.monthlyPriceUsd * percent, 0)
         : 0,
@@ -80,7 +75,7 @@ export function KiloPassBonusRampDialog(props: {
       effectiveMonth,
       showFirstMonthPromo,
       showSlider,
-      resolvedSubscriptionStartedAtIso,
+      subscriptionStartedAtIso,
       tier,
     ]
   );
@@ -172,9 +167,7 @@ export function KiloPassBonusRampDialog(props: {
 
             {showPromoCallout && (
               <div className="rounded-lg border border-emerald-500/20 bg-emerald-500/10 px-3 py-2 text-emerald-100">
-                As a new subscriber, your{' '}
-                <strong>first {showSecondMonthPromo ? '2 paid months' : 'paid month'}</strong> get a
-                one-time promo of{' '}
+                Your welcome promo applies to the <strong>{promoMonthLabel}</strong>:{' '}
                 <strong>
                   +{formatPercent(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT)} free bonus credits
                 </strong>{' '}
diff --git a/apps/web/src/components/profile/kilo-pass/KiloPassSubscribeCard.tsx b/apps/web/src/components/profile/kilo-pass/KiloPassSubscribeCard.tsx
index bc95d28bf66..c33553ac501 100644
--- a/apps/web/src/components/profile/kilo-pass/KiloPassSubscribeCard.tsx
+++ b/apps/web/src/components/profile/kilo-pass/KiloPassSubscribeCard.tsx
@@ -9,12 +9,9 @@ import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { KiloPassCadence } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import type { KiloPassTier } from '@kilocode/web-shared/lib/kilo-pass/enums';
-import {
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF,
-  KILO_PASS_TIER_CONFIG,
-} from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { KILO_PASS_TIER_CONFIG } from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { getMonthlyWelcomePromoMonth } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import { cn } from '@/lib/utils';
-import { formatIsoDateString_UsaDateOnlyFormat } from '@/lib/utils';
 
 import { KiloPassTierCard } from './KiloPassTierCard';
 
@@ -23,7 +20,6 @@ export function KiloPassSubscribeCard(props: {
   setCadence: (cadence: KiloPassCadence) => void;
   pending: boolean;
   showFirstMonthPromo?: boolean;
-  showSecondMonthPromo: boolean;
   showHeader?: boolean;
   headerAction?: ReactNode;
   unframed?: boolean;
@@ -37,7 +33,6 @@ export function KiloPassSubscribeCard(props: {
     setCadence,
     pending,
     showFirstMonthPromo = false,
-    showSecondMonthPromo,
     showHeader = true,
     headerAction,
     unframed = false,
@@ -48,15 +43,14 @@ export function KiloPassSubscribeCard(props: {
   } = props;
 
   const tiers = Object.keys(KILO_PASS_TIER_CONFIG) as KiloPassTier[];
+  const subscriptionStartedAtIso = new Date().toISOString();
+  const promoMonth = getMonthlyWelcomePromoMonth(subscriptionStartedAtIso);
 
-  const promoCutoffLabel = formatIsoDateString_UsaDateOnlyFormat(
-    KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString()
-  );
   const monthlyPromoDescription =
     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.'
+      ? promoMonth === 1
+        ? 'First-time subscribers receive 50% free bonus credits for the first month, then the regular 10% bonus in the second month.'
+        : 'First-time subscribers receive 50% free bonus credits for the second month, with the regular 5% bonus in the first month.'
       : null;
   const cadenceOptions = [
     { value: KiloPassCadence.Monthly, label: 'Monthly' },
@@ -97,7 +91,7 @@ export function KiloPassSubscribeCard(props: {
             cadence={cadence}
             pending={pending}
             showFirstMonthPromo={showFirstMonthPromo}
-            showSecondMonthPromo={showSecondMonthPromo}
+            subscriptionStartedAtIso={subscriptionStartedAtIso}
             isRecommended={recommendedTier != null && tier === recommendedTier}
             onSelect={onSelectTier}
           />
diff --git a/apps/web/src/components/profile/kilo-pass/KiloPassTierCard.tsx b/apps/web/src/components/profile/kilo-pass/KiloPassTierCard.tsx
index e6fe37838be..63b1884132b 100644
--- a/apps/web/src/components/profile/kilo-pass/KiloPassTierCard.tsx
+++ b/apps/web/src/components/profile/kilo-pass/KiloPassTierCard.tsx
@@ -5,10 +5,8 @@ import { ArrowRight, Check } from 'lucide-react';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
-import {
-  KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT,
-  KILO_PASS_TIER_CONFIG,
-} from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { KILO_PASS_TIER_CONFIG } from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { computeMonthlyCadenceBonusPercent } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import { cn } from '@/lib/utils';
 
 import { KiloPassBonusRampDialog } from './KiloPassBonusRampDialog';
@@ -26,7 +24,7 @@ export function KiloPassTierCard(props: {
   cadence: KiloPassCadence;
   pending: boolean;
   showFirstMonthPromo?: boolean;
-  showSecondMonthPromo?: boolean;
+  subscriptionStartedAtIso: string;
   isRecommended: boolean;
   onSelect: (tier: KiloPassTier) => void;
 }) {
@@ -35,11 +33,23 @@ export function KiloPassTierCard(props: {
     cadence,
     pending,
     showFirstMonthPromo = false,
-    showSecondMonthPromo = false,
+    subscriptionStartedAtIso,
     isRecommended,
     onSelect,
   } = props;
   const config = KILO_PASS_TIER_CONFIG[tier];
+  const firstMonthPercent = computeMonthlyCadenceBonusPercent({
+    tier,
+    streakMonths: 1,
+    isFirstTimeSubscriberEver: showFirstMonthPromo,
+    subscriptionStartedAtIso,
+  });
+  const secondMonthPercent = computeMonthlyCadenceBonusPercent({
+    tier,
+    streakMonths: 2,
+    isFirstTimeSubscriberEver: showFirstMonthPromo,
+    subscriptionStartedAtIso,
+  });
   const handleSelect = () => {
     if (pending) return;
     onSelect(tier);
@@ -103,14 +113,14 @@ export function KiloPassTierCard(props: {
               <KiloPassBonusRampDialog
                 tier={tier}
                 showFirstMonthPromo={showFirstMonthPromo}
-                showSecondMonthPromo={showSecondMonthPromo}
+                subscriptionStartedAtIso={subscriptionStartedAtIso}
               />
             </div>
 
             {showFirstMonthPromo && (
               <div className="text-xs leading-5 text-emerald-300">
-                {showSecondMonthPromo ? 'First 2 months:' : 'First month:'} +
-                {formatPercent(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT)} free bonus credits
+                Month 1: +{formatPercent(firstMonthPercent)}; month 2: +
+                {formatPercent(secondMonthPercent)} free bonus credits
               </div>
             )}
           </>
diff --git a/apps/web/src/components/subscriptions/kilo-pass/KiloPassDetail.tsx b/apps/web/src/components/subscriptions/kilo-pass/KiloPassDetail.tsx
index 2986056f4fe..19218ae2a87 100644
--- a/apps/web/src/components/subscriptions/kilo-pass/KiloPassDetail.tsx
+++ b/apps/web/src/components/subscriptions/kilo-pass/KiloPassDetail.tsx
@@ -33,9 +33,7 @@ import { useKiloPassChurnkeyCancelFlow } from '@/components/profile/kilo-pass/us
 import type { KiloPassSubscription } from '@/components/profile/kilo-pass/kiloPassSubscription';
 import { KiloPassSubscriptionSettingsModal } from '@/components/profile/kilo-pass/KiloPassSubscriptionSettingsModal';
 import { KiloPassBonusRampDialog } from '@/components/profile/kilo-pass/KiloPassBonusRampDialog';
-import { computeMonthlyCadenceBonusPercent } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import { KiloPassCadence } from '@kilocode/web-shared/lib/kilo-pass/enums';
-import { KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT } from '@kilocode/web-shared/lib/kilo-pass/constants';
 import {
   computeUsageProgressModel,
   computeRenewInfoRowModel,
@@ -102,25 +100,6 @@ export function KiloPassDetail() {
 
   const scheduledChange = scheduledChangeQuery.data?.scheduledChange ?? null;
 
-  const showFirstMonthPromoInDialog =
-    subscription?.cadence === 'monthly' &&
-    computeMonthlyCadenceBonusPercent({
-      tier: subscription.tier,
-      streakMonths: Math.max(1, subscription.currentStreakMonths),
-      isFirstTimeSubscriberEver: subscription.isFirstTimeSubscriberEver,
-      subscriptionStartedAtIso: subscription.startedAt,
-    }) === KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT;
-
-  const showSecondMonthPromoInDialog =
-    subscription?.cadence === 'monthly' &&
-    subscription.currentStreakMonths <= 2 &&
-    computeMonthlyCadenceBonusPercent({
-      tier: subscription.tier,
-      streakMonths: 2,
-      isFirstTimeSubscriberEver: subscription.isFirstTimeSubscriberEver,
-      subscriptionStartedAtIso: subscription.startedAt,
-    }) === KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT;
-
   async function refreshData() {
     await Promise.all([
       queryClient.invalidateQueries({ queryKey: trpc.kiloPass.getState.queryKey() }),
@@ -256,10 +235,11 @@ export function KiloPassDetail() {
                 Bonus streak
                 <KiloPassBonusRampDialog
                   tier={subscription.tier}
-                  showFirstMonthPromo={showFirstMonthPromoInDialog}
-                  showSecondMonthPromo={showSecondMonthPromoInDialog}
+                  showFirstMonthPromo={
+                    subscription.cadence === 'monthly' && subscription.isFirstTimeSubscriberEver
+                  }
                   streakMonths={subscription.currentStreakMonths}
-                  subscriptionStartedAtIso={subscription.startedAt ?? undefined}
+                  subscriptionStartedAtIso={subscription.startedAt}
                 />
               </CardTitle>
             </CardHeader>
diff --git a/apps/web/src/components/subscriptions/kilo-pass/KiloPassGroup.tsx b/apps/web/src/components/subscriptions/kilo-pass/KiloPassGroup.tsx
index 5797bc6a259..476294d7dd7 100644
--- a/apps/web/src/components/subscriptions/kilo-pass/KiloPassGroup.tsx
+++ b/apps/web/src/components/subscriptions/kilo-pass/KiloPassGroup.tsx
@@ -5,8 +5,6 @@ import { useState } from 'react';
 import { toast } from 'sonner';
 import { KiloPassIcon } from '@/components/icons/KiloPassIcon';
 import { useTRPC } from '@/lib/trpc/utils';
-import { KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF } from '@kilocode/web-shared/lib/kilo-pass/constants';
-import { dayjs } from '@kilocode/web-shared/lib/kilo-pass/dayjs';
 import { KiloPassCadence } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import type { KiloPassTier } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import { recommendKiloPassTierFromAverageMonthlyUsageUsd } from '@/lib/kilo-pass/recommend-tier';
@@ -28,12 +26,6 @@ import {
   getKiloPassSubscriptionDisplayModel,
 } from './KiloPassDetail.logic';
 
-function getShowKiloPassTwoMonthPromo(showFirstMonthPromo: boolean): boolean {
-  return (
-    showFirstMonthPromo && dayjs().utc().isBefore(KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF)
-  );
-}
-
 export function KiloPassGroup({
   showTerminal,
   accordionValue,
@@ -76,7 +68,6 @@ export function KiloPassGroup({
   }
 
   const showFirstMonthPromo = query.data?.isEligibleForFirstMonthPromo ?? false;
-  const showSecondMonthPromo = getShowKiloPassTwoMonthPromo(showFirstMonthPromo);
   const averageMonthlyUsageUsd = averageMonthlyUsageQuery.data?.averageMonthlyUsageUsd;
   const recommendedTier =
     typeof averageMonthlyUsageUsd === 'number'
@@ -153,7 +144,6 @@ export function KiloPassGroup({
             setCadence={setCadence}
             pending={checkout.isPending}
             showFirstMonthPromo={showFirstMonthPromo}
-            showSecondMonthPromo={showSecondMonthPromo}
             recommendedTier={recommendedTier}
             onSelectTier={tier => void startCheckout(tier)}
             showHeader={false}
diff --git a/apps/web/src/lib/kilo-pass/google-play-notifications.test.ts b/apps/web/src/lib/kilo-pass/google-play-notifications.test.ts
index d7679b21179..21966861615 100644
--- a/apps/web/src/lib/kilo-pass/google-play-notifications.test.ts
+++ b/apps/web/src/lib/kilo-pass/google-play-notifications.test.ts
@@ -2061,22 +2061,23 @@ describe('processGooglePlayKiloPassNotification', () => {
       toMicrodollars(19)
     );
   });
-  it.each([
-    [19, false, false],
-    [49, false, false],
-    [199, false, false],
-    [19, true, false],
-    [49, true, false],
-    [199, true, false],
-    [19, false, true],
-    [49, false, true],
-    [199, false, true],
-    [19, true, true],
-    [49, true, true],
-    [199, true, true],
-  ] as const)(
-    'grants tier %i bonus once and refunds spent credits (returning=%s, canceled=%s)',
-    async (tier, returning, canceled) => {
+  it.each(
+    ([19, 49, 199] as const).flatMap(tier =>
+      [false, true].flatMap(returning =>
+        [false, true].flatMap(canceled =>
+          ['2026-10-08T23:59:59.999Z', '2026-10-09T00:00:00.000Z'].map(start => ({
+            tier,
+            returning,
+            canceled,
+            start,
+            bonusPercent: returning || start === '2026-10-09T00:00:00.000Z' ? 0.05 : 0.5,
+          }))
+        )
+      )
+    )
+  )(
+    'grants tier $tier bonus once and refunds spent credits (returning=$returning, canceled=$canceled, start=$start)',
+    async ({ tier, returning, canceled, start, bonusPercent }) => {
       const { user, obfsAccountId } = await insertGooglePlayUser();
       if (returning)
         await db.insert(kilo_pass_subscriptions).values({
@@ -2088,9 +2089,8 @@ describe('processGooglePlayKiloPassNotification', () => {
           status: 'canceled',
           ended_at: '2025-01-01T00:00:00Z',
         });
-      const now = new Date();
+      const now = new Date(start);
       dateNowSpy.mockReturnValue(now.valueOf());
-      const start = now.toISOString();
       const end = new Date(now.valueOf() + 31 * 86400000).toISOString();
       const token = crypto.randomUUID();
       const orderId = crypto.randomUUID();
@@ -2150,7 +2150,7 @@ describe('processGooglePlayKiloPassNotification', () => {
       const bonus = await db.query.kilocode_users.findFirst({
         where: eq(kilocode_users.id, user.id),
       });
-      const bonusUsd = tier * (returning ? 0.05 : 0.5);
+      const bonusUsd = tier * bonusPercent;
       expect(bonus!.total_microdollars_acquired - paid!.total_microdollars_acquired).toBe(
         toMicrodollars(bonusUsd)
       );
diff --git a/apps/web/src/lib/kilo-pass/store-subscription-completion.test.ts b/apps/web/src/lib/kilo-pass/store-subscription-completion.test.ts
index ffbf6e156a9..47ed106d935 100644
--- a/apps/web/src/lib/kilo-pass/store-subscription-completion.test.ts
+++ b/apps/web/src/lib/kilo-pass/store-subscription-completion.test.ts
@@ -137,6 +137,51 @@ describe('completeStoreKiloPassPurchase', () => {
     );
   });
 
+  it.each([KiloPassPaymentProvider.AppStore, KiloPassPaymentProvider.GooglePlay] as const)(
+    '%s subscription start survives tier/cadence changes and purchase replay',
+    async paymentProvider => {
+      const user = await insertTestUser();
+      const providerSubscriptionId = crypto.randomUUID();
+      const [legacy] = await db
+        .insert(kilo_pass_subscriptions)
+        .values({
+          kilo_user_id: user.id,
+          payment_provider: paymentProvider,
+          provider_subscription_id: providerSubscriptionId,
+          tier: KiloPassTier.Tier19,
+          cadence: KiloPassCadence.Monthly,
+          status: 'active',
+          started_at: '2026-01-01T00:00:00.000Z',
+        })
+        .returning();
+      const purchase = applePurchase({
+        paymentProvider,
+        providerSubscriptionId,
+        providerOriginalTransactionId: providerSubscriptionId,
+        tier: KiloPassTier.Tier49,
+        cadence: KiloPassCadence.Yearly,
+        productId: 'kilopass.tier49.yearly.v1',
+        purchasedAtIso: '2026-06-01T00:00:00.000Z',
+        expiresAtIso: '2027-06-01T00:00:00.000Z',
+      });
+
+      const changed = await completeStoreKiloPassPurchase({ user, purchase });
+      const replayed = await completeStoreKiloPassPurchase({ user, purchase });
+      expect(replayed).toMatchObject({ subscriptionId: legacy?.id, alreadyProcessed: true });
+      expect(changed.subscriptionId).toBe(legacy?.id);
+      const subscription = await db.query.kilo_pass_subscriptions.findFirst({
+        where: eq(kilo_pass_subscriptions.id, changed.subscriptionId),
+      });
+      expect(subscription).toMatchObject({
+        tier: KiloPassTier.Tier49,
+        cadence: KiloPassCadence.Yearly,
+      });
+      expect(
+        subscription?.started_at ? new Date(subscription.started_at).toISOString() : null
+      ).toBe('2026-01-01T00:00:00.000Z');
+    }
+  );
+
   it('persists nulls when a Google Play order carries no money', async () => {
     const user = await insertTestUser({ total_microdollars_acquired: 0, microdollars_used: 0 });
     const order = googlePlayOrder();
@@ -564,6 +609,13 @@ describe('completeStoreKiloPassPurchase', () => {
       alreadyProcessed: true,
     });
 
+    const subscription = await db.query.kilo_pass_subscriptions.findFirst({
+      where: eq(kilo_pass_subscriptions.id, first.subscriptionId),
+    });
+    expect(subscription?.started_at ? new Date(subscription.started_at).toISOString() : null).toBe(
+      purchase.subscriptionStartedAtIso ?? purchase.purchasedAtIso
+    );
+
     const storePurchases = await db
       .select()
       .from(kilo_pass_store_purchases)
diff --git a/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.test.ts b/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.test.ts
index 8c7cd039a7e..83a8b0a1859 100644
--- a/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.test.ts
+++ b/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.test.ts
@@ -3,6 +3,9 @@ import { beforeEach, describe, expect, jest, test } from '@jest/globals';
 import { db, cleanupDbForTest } from '@kilocode/web-shared/lib/drizzle';
 import {
   credit_transactions,
+  impact_referral_conversions,
+  impact_referral_reward_decisions,
+  impact_referral_rewards,
   kilocode_users,
   kilo_pass_audit_log,
   kilo_pass_issuance_items,
@@ -14,6 +17,16 @@ import {
   user_affiliate_attributions,
   user_affiliate_events,
 } from '@kilocode/db/schema';
+import {
+  ImpactReferralBeneficiaryRole,
+  ImpactReferralDecisionOutcome,
+  ImpactReferralPaymentProvider,
+  ImpactReferralProduct,
+  ImpactReferralRewardKind,
+  ImpactReferralRewardStatus,
+  ImpactReferralWinningTouchType,
+} from '@kilocode/db/schema-types';
+import { maybeIssueKiloPassBonusFromUsageThreshold } from '@kilocode/web-shared/lib/kilo-pass/usage-triggered-bonus';
 import { KiloPassAuditLogAction } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import { KiloPassAuditLogResult } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import { KiloPassIssuanceItemKind } from '@kilocode/web-shared/lib/kilo-pass/enums';
@@ -27,7 +40,7 @@ import {
   KiloPassWelcomePromoPaymentFingerprintType,
 } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import { insertTestUser } from '@kilocode/web-shared/tests/helpers/user.helper';
-import { and, eq } from 'drizzle-orm';
+import { and, eq, inArray } from 'drizzle-orm';
 import type Stripe from 'stripe';
 import type * as affiliateEventsModule from '@/lib/impact/affiliate-events';
 import { randomUUID } from 'node:crypto';
@@ -335,6 +348,60 @@ async function seedBaseIssuance(params: {
   });
 }
 
+async function seedPendingKiloPassReferralReward(params: {
+  beneficiaryUserId: string;
+  role: ImpactReferralBeneficiaryRole;
+  sourcePaymentId: string;
+}): Promise<{ rewardId: string }> {
+  const otherUser = await insertTestUser({ total_microdollars_acquired: 0, microdollars_used: 0 });
+  const isReferee = params.role === ImpactReferralBeneficiaryRole.Referee;
+  const earnedAt = new Date(Date.now() - 86_400_000).toISOString();
+  const [conversion] = await db
+    .insert(impact_referral_conversions)
+    .values({
+      product: ImpactReferralProduct.KiloPass,
+      referee_user_id: isReferee ? params.beneficiaryUserId : otherUser.id,
+      referrer_user_id: isReferee ? otherUser.id : params.beneficiaryUserId,
+      winning_touch_type: ImpactReferralWinningTouchType.Referral,
+      payment_provider: ImpactReferralPaymentProvider.Stripe,
+      source_payment_id: params.sourcePaymentId,
+      qualified: true,
+      converted_at: earnedAt,
+    })
+    .returning({ id: impact_referral_conversions.id });
+  if (!conversion) throw new Error('Failed to create impact_referral_conversion');
+
+  const rewardFields = {
+    product: ImpactReferralProduct.KiloPass,
+    conversion_id: conversion.id,
+    beneficiary_user_id: params.beneficiaryUserId,
+    beneficiary_role: params.role,
+    reward_kind: ImpactReferralRewardKind.KiloPassBonus,
+    reward_percent: 0.5,
+    source_tier: KiloPassTier.Tier19,
+    reward_amount_usd: 9.5,
+  };
+  const [decision] = await db
+    .insert(impact_referral_reward_decisions)
+    .values({ ...rewardFields, outcome: ImpactReferralDecisionOutcome.Granted })
+    .returning({ id: impact_referral_reward_decisions.id });
+  if (!decision) throw new Error('Failed to create impact_referral_reward_decision');
+
+  const [reward] = await db
+    .insert(impact_referral_rewards)
+    .values({
+      ...rewardFields,
+      decision_id: decision.id,
+      months_granted: 0,
+      status: ImpactReferralRewardStatus.Pending,
+      earned_at: earnedAt,
+      expires_at: new Date(Date.now() + 365 * 86_400_000).toISOString(),
+    })
+    .returning({ id: impact_referral_rewards.id });
+  if (!reward) throw new Error('Failed to create impact_referral_reward');
+  return { rewardId: reward.id };
+}
+
 async function persistPersonalKiloPassAssessment(params: {
   invoiceId: string;
   kiloUserId: string;
@@ -2694,6 +2761,15 @@ describe('handleKiloPassInvoicePaid', () => {
     });
     expect(issuance).toBeTruthy();
 
+    const replayedSubscription = await db.query.kilo_pass_subscriptions.findFirst({
+      where: eq(kilo_pass_subscriptions.stripe_subscription_id, stripeSubId),
+    });
+    expect(
+      replayedSubscription?.started_at
+        ? new Date(replayedSubscription.started_at).toISOString()
+        : null
+    ).toBe(new Date(subscription.start_date * 1000).toISOString());
+
     const kinds = await db
       .select({ kind: kilo_pass_issuance_items.kind })
       .from(kilo_pass_issuance_items)
@@ -2701,95 +2777,284 @@ describe('handleKiloPassInvoicePaid', () => {
     expect(kinds.map(k => k.kind).sort()).toEqual([KiloPassIssuanceItemKind.Base]);
   });
 
-  test('monthly: streak counts consecutive months (no bonus is issued on invoice.paid)', async () => {
-    const { handleKiloPassInvoicePaid } =
-      await import('@/lib/kilo-pass/stripe-handlers-invoice-paid');
+  test.each(['2026-10-08T23:59:59.999Z', '2026-10-09T00:00:00.000Z'])(
+    'monthly: renewal and replay preserve subscription start %s and count consecutive months',
+    async startedAt => {
+      const { handleKiloPassInvoicePaid } =
+        await import('@/lib/kilo-pass/stripe-handlers-invoice-paid');
 
-    const user = await insertTestUser({ total_microdollars_acquired: 0, microdollars_used: 0 });
-    const stripeSubId = `sub_${Math.random()}`;
-    const meta = kiloPassMetadata({
-      kiloUserId: user.id,
-      tier: KiloPassTier.Tier19,
-      cadence: KiloPassCadence.Monthly,
-    });
-    const subscription = makeStripeSubscription({
-      id: stripeSubId,
-      start_date_seconds: 1_735_689_600,
-      metadata: meta,
-    });
+      const user = await insertTestUser({ total_microdollars_acquired: 0, microdollars_used: 0 });
+      const stripeSubId = `sub_${Math.random()}`;
+      const meta = kiloPassMetadata({
+        kiloUserId: user.id,
+        tier: KiloPassTier.Tier19,
+        cadence: KiloPassCadence.Monthly,
+      });
+      const subscription = makeStripeSubscription({
+        id: stripeSubId,
+        start_date_seconds: Math.floor(new Date(startedAt).valueOf() / 1000),
+        metadata: meta,
+      });
 
-    const retrieve = jest.fn(async () => subscription);
-    const stripe = {
-      subscriptions: {
-        retrieve,
-      },
-    };
+      const retrieve = jest.fn(async () => subscription);
+      const stripe = {
+        subscriptions: {
+          retrieve,
+        },
+      };
 
-    // Seed an earlier month issuance for this subscription so the handler computes a 2-month streak.
-    // We can't insert issuances before the subscription exists, so insert a minimal subscription row first.
-    const inserted = await db
-      .insert(kilo_pass_subscriptions)
-      .values({
-        kilo_user_id: user.id,
-        provider_subscription_id: stripeSubId,
-        stripe_subscription_id: stripeSubId,
+      // Seed an earlier month issuance for this subscription so the handler computes a 2-month streak.
+      // We can't insert issuances before the subscription exists, so insert a minimal subscription row first.
+      const inserted = await db
+        .insert(kilo_pass_subscriptions)
+        .values({
+          kilo_user_id: user.id,
+          provider_subscription_id: stripeSubId,
+          stripe_subscription_id: stripeSubId,
+          tier: KiloPassTier.Tier19,
+          cadence: KiloPassCadence.Monthly,
+          status: 'active',
+          started_at: startedAt,
+          ended_at: null,
+          current_streak_months: 1,
+        })
+        .returning({ subscriptionId: kilo_pass_subscriptions.id });
+
+      const subscriptionId = inserted[0]?.subscriptionId;
+      expect(subscriptionId).toBeTruthy();
+      if (!subscriptionId) throw new Error('Failed to insert kilo_pass_subscriptions row');
+
+      await db.insert(kilo_pass_issuances).values({
+        kilo_pass_subscription_id: subscriptionId,
+        issue_month: '2026-10-01',
+        source: KiloPassIssuanceSource.Cron,
+        stripe_invoice_id: null,
+      });
+
+      const priceId = await getKiloPassPriceId({
         tier: KiloPassTier.Tier19,
         cadence: KiloPassCadence.Monthly,
-        status: 'active',
-        started_at: new Date(subscription.start_date * 1000).toISOString(),
-        ended_at: null,
-        current_streak_months: 1,
-      })
-      .returning({ subscriptionId: kilo_pass_subscriptions.id });
+      });
+      const invoiceId = `inv_streak_${Math.random()}`;
+      const invoice = makeStripeInvoice({
+        id: invoiceId,
+        amount_paid_cents: 1900,
+        period_start_seconds: Date.parse('2026-11-01T00:00:00Z') / 1000,
+        created_seconds: Date.parse('2026-11-01T00:00:00Z') / 1000,
+        priceId,
+        subscriptionIdOrExpanded: stripeSubId,
+        metadata: meta,
+      });
 
-    const subscriptionId = inserted[0]?.subscriptionId;
-    expect(subscriptionId).toBeTruthy();
-    if (!subscriptionId) throw new Error('Failed to insert kilo_pass_subscriptions row');
+      await handleKiloPassInvoicePaid({
+        eventId: 'evt_test_5',
+        invoice,
+        stripe: stripe as unknown as Stripe,
+      });
+      await handleKiloPassInvoicePaid({
+        eventId: 'evt_test_5_replay',
+        invoice,
+        stripe: stripe as unknown as Stripe,
+      });
 
-    await db.insert(kilo_pass_issuances).values({
-      kilo_pass_subscription_id: subscriptionId,
-      issue_month: '2025-12-01',
-      source: KiloPassIssuanceSource.Cron,
-      stripe_invoice_id: null,
-    });
+      const updatedSub = await db.query.kilo_pass_subscriptions.findFirst({
+        where: eq(kilo_pass_subscriptions.id, subscriptionId),
+      });
+      expect(updatedSub?.current_streak_months).toBe(2);
+      expect(updatedSub?.started_at ? new Date(updatedSub.started_at).toISOString() : null).toBe(
+        new Date(startedAt).toISOString()
+      );
 
-    const priceId = await getKiloPassPriceId({
-      tier: KiloPassTier.Tier19,
-      cadence: KiloPassCadence.Monthly,
-    });
-    const invoiceId = `inv_streak_${Math.random()}`;
-    const invoice = makeStripeInvoice({
-      id: invoiceId,
-      amount_paid_cents: 1900,
-      period_start_seconds: 1_767_225_600, // 2026-01-01T00:00:00Z
-      created_seconds: 1_767_225_600,
-      priceId,
-      subscriptionIdOrExpanded: stripeSubId,
-      metadata: meta,
-    });
+      const issuance = await db.query.kilo_pass_issuances.findFirst({
+        where: eq(kilo_pass_issuances.stripe_invoice_id, invoiceId),
+      });
+      expect(issuance).toBeTruthy();
 
-    await handleKiloPassInvoicePaid({
-      eventId: 'evt_test_5',
-      invoice,
-      stripe: stripe as unknown as Stripe,
-    });
+      const issuanceItemKinds = await db
+        .select({ kind: kilo_pass_issuance_items.kind })
+        .from(kilo_pass_issuance_items)
+        .where(eq(kilo_pass_issuance_items.kilo_pass_issuance_id, issuance?.id ?? ''));
+      expect(issuanceItemKinds.map(i => i.kind).sort()).toEqual([KiloPassIssuanceItemKind.Base]);
+    }
+  );
 
-    const updatedSub = await db.query.kilo_pass_subscriptions.findFirst({
-      where: eq(kilo_pass_subscriptions.id, subscriptionId),
-    });
-    expect(updatedSub?.current_streak_months).toBe(2);
+  test.each([
+    {
+      label: 'referee starting at the cutoff',
+      startedAt: '2026-10-09T00:00:00.000Z',
+      role: ImpactReferralBeneficiaryRole.Referee,
+      returning: false,
+      monthTwoGetsReferral: false,
+    },
+    {
+      label: 'referrer starting at the cutoff',
+      startedAt: '2026-10-09T00:00:00.000Z',
+      role: ImpactReferralBeneficiaryRole.Referrer,
+      returning: false,
+      monthTwoGetsReferral: false,
+    },
+    {
+      label: 'referee starting before the cutoff',
+      startedAt: '2026-10-08T23:59:59.000Z',
+      role: ImpactReferralBeneficiaryRole.Referee,
+      returning: false,
+      monthTwoGetsReferral: true,
+    },
+    {
+      label: 'returning referrer starting at the cutoff',
+      startedAt: '2026-10-09T00:00:00.000Z',
+      role: ImpactReferralBeneficiaryRole.Referrer,
+      returning: true,
+      monthTwoGetsReferral: true,
+    },
+  ])(
+    'monthly: $label applies a pending referral reward in month two=$monthTwoGetsReferral',
+    async ({ startedAt, role, returning, monthTwoGetsReferral }) => {
+      const { handleKiloPassInvoicePaid } =
+        await import('@/lib/kilo-pass/stripe-handlers-invoice-paid');
 
-    const issuance = await db.query.kilo_pass_issuances.findFirst({
-      where: eq(kilo_pass_issuances.stripe_invoice_id, invoiceId),
-    });
-    expect(issuance).toBeTruthy();
+      const user = await insertTestUser({ total_microdollars_acquired: 0, microdollars_used: 0 });
+      if (returning) {
+        const priorSubscriptionId = `sub_prior_${Math.random()}`;
+        await db.insert(kilo_pass_subscriptions).values({
+          kilo_user_id: user.id,
+          provider_subscription_id: priorSubscriptionId,
+          stripe_subscription_id: priorSubscriptionId,
+          tier: KiloPassTier.Tier19,
+          cadence: KiloPassCadence.Monthly,
+          status: 'canceled',
+          started_at: '2025-01-01T00:00:00.000Z',
+          ended_at: '2025-02-01T00:00:00.000Z',
+        });
+      }
 
-    const issuanceItemKinds = await db
-      .select({ kind: kilo_pass_issuance_items.kind })
-      .from(kilo_pass_issuance_items)
-      .where(eq(kilo_pass_issuance_items.kilo_pass_issuance_id, issuance?.id ?? ''));
-    expect(issuanceItemKinds.map(i => i.kind).sort()).toEqual([KiloPassIssuanceItemKind.Base]);
-  });
+      const stripeSubId = `sub_referral_welcome_${Math.random()}`;
+      const meta = kiloPassMetadata({
+        kiloUserId: user.id,
+        tier: KiloPassTier.Tier19,
+        cadence: KiloPassCadence.Monthly,
+      });
+      const subscription = makeStripeSubscription({
+        id: stripeSubId,
+        start_date_seconds: Math.floor(Date.parse(startedAt) / 1000),
+        metadata: meta,
+      });
+      const stripe = {
+        subscriptions: { retrieve: jest.fn(async () => subscription) },
+      } as unknown as Stripe;
+
+      const [subscriptionRow] = await db
+        .insert(kilo_pass_subscriptions)
+        .values({
+          kilo_user_id: user.id,
+          provider_subscription_id: stripeSubId,
+          stripe_subscription_id: stripeSubId,
+          tier: KiloPassTier.Tier19,
+          cadence: KiloPassCadence.Monthly,
+          status: 'active',
+          started_at: startedAt,
+          current_streak_months: 1,
+        })
+        .returning({ id: kilo_pass_subscriptions.id });
+      if (!subscriptionRow) throw new Error('Failed to insert kilo_pass_subscriptions row');
+
+      const monthOneInvoiceId = `inv_referral_welcome_m1_${Math.random()}`;
+      await db.insert(kilo_pass_issuances).values({
+        kilo_pass_subscription_id: subscriptionRow.id,
+        issue_month: '2026-10-01',
+        source: KiloPassIssuanceSource.StripeInvoice,
+        stripe_invoice_id: monthOneInvoiceId,
+        initial_welcome_promo_eligibility_reason:
+          KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim,
+      });
+      const reward = await seedPendingKiloPassReferralReward({
+        beneficiaryUserId: user.id,
+        role,
+        sourcePaymentId:
+          role === ImpactReferralBeneficiaryRole.Referee
+            ? monthOneInvoiceId
+            : `inv_referee_${Math.random()}`,
+      });
+
+      const priceId = await getKiloPassPriceId({
+        tier: KiloPassTier.Tier19,
+        cadence: KiloPassCadence.Monthly,
+      });
+      const payMonth = async (periodStartIso: string): Promise<string> => {
+        const invoiceId = `inv_referral_welcome_${Math.random()}`;
+        await handleKiloPassInvoicePaid({
+          eventId: `evt_${invoiceId}`,
+          invoice: makeStripeInvoice({
+            id: invoiceId,
+            amount_paid_cents: 1900,
+            period_start_seconds: Date.parse(periodStartIso) / 1000,
+            created_seconds: Date.parse(periodStartIso) / 1000,
+            priceId,
+            subscriptionIdOrExpanded: stripeSubId,
+            metadata: meta,
+          }),
+          stripe,
+        });
+        return invoiceId;
+      };
+      const getBonusLikeItems = async (invoiceId: string) =>
+        await db
+          .select({
+            kind: kilo_pass_issuance_items.kind,
+            bonusPercentApplied: kilo_pass_issuance_items.bonus_percent_applied,
+          })
+          .from(kilo_pass_issuance_items)
+          .innerJoin(
+            kilo_pass_issuances,
+            eq(kilo_pass_issuances.id, kilo_pass_issuance_items.kilo_pass_issuance_id)
+          )
+          .where(
+            and(
+              eq(kilo_pass_issuances.stripe_invoice_id, invoiceId),
+              inArray(kilo_pass_issuance_items.kind, [
+                KiloPassIssuanceItemKind.Bonus,
+                KiloPassIssuanceItemKind.ReferralBonus,
+              ])
+            )
+          );
+      const getRewardStatus = async () =>
+        (
+          await db.query.impact_referral_rewards.findFirst({
+            where: eq(impact_referral_rewards.id, reward.rewardId),
+          })
+        )?.status;
+
+      const monthTwoInvoiceId = await payMonth('2026-11-09T00:00:00.000Z');
+      if (monthTwoGetsReferral) {
+        expect(await getBonusLikeItems(monthTwoInvoiceId)).toEqual([
+          { kind: KiloPassIssuanceItemKind.ReferralBonus, bonusPercentApplied: 0.5 },
+        ]);
+        expect(await getRewardStatus()).toBe(ImpactReferralRewardStatus.Applied);
+        return;
+      }
+
+      expect(await getBonusLikeItems(monthTwoInvoiceId)).toEqual([]);
+      expect(await getRewardStatus()).toBe(ImpactReferralRewardStatus.Pending);
+
+      await db
+        .update(kilocode_users)
+        .set({ microdollars_used: 1_000_000_000 })
+        .where(eq(kilocode_users.id, user.id));
+      await maybeIssueKiloPassBonusFromUsageThreshold({
+        kiloUserId: user.id,
+        nowIso: '2026-11-10T00:00:00.000Z',
+      });
+      expect(await getBonusLikeItems(monthTwoInvoiceId)).toEqual([
+        { kind: KiloPassIssuanceItemKind.Bonus, bonusPercentApplied: 0.5 },
+      ]);
+
+      const monthThreeInvoiceId = await payMonth('2026-12-09T00:00:00.000Z');
+      expect(await getBonusLikeItems(monthThreeInvoiceId)).toEqual([
+        { kind: KiloPassIssuanceItemKind.ReferralBonus, bonusPercentApplied: 0.5 },
+      ]);
+      expect(await getRewardStatus()).toBe(ImpactReferralRewardStatus.Applied);
+    }
+  );
 
   test('yearly: first invoice issues base credits (bonus is issued later on usage); retry is idempotent', async () => {
     const { handleKiloPassInvoicePaid } =
diff --git a/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.ts b/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.ts
index e8f3b4d986d..6a498f816f7 100644
--- a/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.ts
+++ b/apps/web/src/lib/kilo-pass/stripe-handlers-invoice-paid.ts
@@ -22,6 +22,8 @@ import {
   createOrGetIssuanceHeader,
   issueBaseCreditsForIssuance,
 } from '@kilocode/web-shared/lib/kilo-pass/issuance';
+import { computeMonthlyKiloPassBonusDecision } from '@kilocode/web-shared/lib/kilo-pass/bonus-decision';
+import { getMonthlyWelcomePromoAccountContext } from '@kilocode/web-shared/lib/kilo-pass/welcome-promo-context';
 import { forceImmediateExpirationRecomputation } from '@kilocode/web-shared/lib/balanceCache';
 import {
   getKiloPassMetadataFromStripeMetadata,
@@ -835,12 +837,36 @@ export async function handleKiloPassInvoicePaid(params: {
       didMutateBalance ||= baseCreditsResult.wasIssued;
 
       let referralBonusBlocksNormalBonus = false;
+      let monthlyStreakMonths = 1;
       if (cadence === KiloPassCadence.Monthly) {
+        const wasInactivePreviously =
+          priorStatus !== null && isStripeSubscriptionEnded(priorStatus);
+        const computedStreak = await computeMonthlyKiloPassStreak(tx, {
+          subscriptionId: kiloPassSubscriptionId,
+          issueMonth,
+        });
+        monthlyStreakMonths = wasInactivePreviously ? 1 : Math.max(1, computedStreak);
+
+        // A referral bonus fills the issuance bonus slot. Keep the slot free for the welcome promo.
+        const welcomePromoAccountContext = await getMonthlyWelcomePromoAccountContext(tx, {
+          kiloUserId,
+          subscriptionId: kiloPassSubscriptionId,
+          paymentProvider: KiloPassPaymentProvider.Stripe,
+        });
+        const isWelcomePromoIssuance = computeMonthlyKiloPassBonusDecision({
+          tier,
+          startedAtIso: dayjs.unix(subscription.start_date).utc().toISOString(),
+          streakMonths: monthlyStreakMonths,
+          ...welcomePromoAccountContext,
+          issueMonth,
+        }).shouldIssueFirstMonthPromo;
+
         const referralBonusResult = await applyPendingKiloPassReferralBonusForIssuance(tx, {
           issuanceId: issuanceHeader.issuanceId,
           subscriptionId: kiloPassSubscriptionId,
           kiloUserId,
           stripeInvoiceId: invoice.id,
+          deferForWelcomePromo: isWelcomePromoIssuance,
         });
         referralBonusBlocksNormalBonus =
           referralBonusResult.wasIssued || referralBonusResult.issuanceItemId !== null;
@@ -883,17 +909,9 @@ export async function handleKiloPassInvoicePaid(params: {
         return null;
       }
 
-      const wasInactivePreviously = priorStatus !== null && isStripeSubscriptionEnded(priorStatus);
-
-      const computedStreak = await computeMonthlyKiloPassStreak(tx, {
-        subscriptionId: kiloPassSubscriptionId,
-        issueMonth,
-      });
-      const newStreakMonths = wasInactivePreviously ? 1 : Math.max(1, computedStreak);
-
       await tx
         .update(kilo_pass_subscriptions)
-        .set({ current_streak_months: newStreakMonths, next_yearly_issue_at: null })
+        .set({ current_streak_months: monthlyStreakMonths, next_yearly_issue_at: null })
         .where(eq(kilo_pass_subscriptions.id, kiloPassSubscriptionId));
 
       return null;
diff --git a/apps/web/src/lib/kilo-pass/stripe-handlers-subscription-events.test.ts b/apps/web/src/lib/kilo-pass/stripe-handlers-subscription-events.test.ts
index 2268420e0d2..255311e9094 100644
--- a/apps/web/src/lib/kilo-pass/stripe-handlers-subscription-events.test.ts
+++ b/apps/web/src/lib/kilo-pass/stripe-handlers-subscription-events.test.ts
@@ -171,6 +171,12 @@ describe('handleKiloPassSubscriptionEvent', () => {
       resourceMissing: false,
       staleDelivery: false,
     });
+
+    await handleKiloPassSubscriptionEvent({ eventId, eventType, subscription });
+    const replayed = await db.query.kilo_pass_subscriptions.findFirst({
+      where: eq(kilo_pass_subscriptions.stripe_subscription_id, stripeSubId),
+    });
+    expect(toIso(replayed?.started_at)).toBe(new Date(startDateSeconds * 1000).toISOString());
   });
 
   test('active subscription with cancel_at_period_end=true stores cancel_at_period_end flag', async () => {
@@ -326,51 +332,67 @@ describe('handleKiloPassSubscriptionEvent', () => {
     expect(endedAtSeconds).toBeLessThanOrEqual(afterSeconds + 1);
   });
 
-  test('non-ended updates do not reset current_streak_months', async () => {
-    const { handleKiloPassSubscriptionEvent } =
-      await import('@/lib/kilo-pass/stripe-handlers-subscription-events');
+  test.each(['2026-10-08T23:59:59.000Z', '2026-10-09T00:00:00.000Z'])(
+    'tier/cadence updates and replay preserve start %s and streak',
+    async startedAt => {
+      const { handleKiloPassSubscriptionEvent } =
+        await import('@/lib/kilo-pass/stripe-handlers-subscription-events');
 
-    const user = await insertTestUser();
-    const stripeSubId = `sub_${Math.random()}`;
+      const user = await insertTestUser();
+      const stripeSubId = `sub_${Math.random()}`;
 
-    await db.insert(kilo_pass_subscriptions).values({
-      kilo_user_id: user.id,
-      provider_subscription_id: stripeSubId,
-      stripe_subscription_id: stripeSubId,
-      tier: KiloPassTier.Tier49,
-      cadence: KiloPassCadence.Monthly,
-      status: 'active',
-      cancel_at_period_end: false,
-      started_at: new Date('2026-01-01T00:00:00.000Z').toISOString(),
-      ended_at: null,
-      current_streak_months: 7,
-    });
-
-    const subscription = makeStripeSubscription({
-      id: stripeSubId,
-      start_date_seconds: 1_767_225_600,
-      status: 'active',
-      cancel_at_period_end: true,
-      metadata: kiloPassMetadata({
-        kiloUserId: user.id,
+      await db.insert(kilo_pass_subscriptions).values({
+        kilo_user_id: user.id,
+        provider_subscription_id: stripeSubId,
+        stripe_subscription_id: stripeSubId,
         tier: KiloPassTier.Tier49,
         cadence: KiloPassCadence.Monthly,
-      }),
-    });
+        status: 'active',
+        cancel_at_period_end: false,
+        started_at: startedAt,
+        ended_at: null,
+        current_streak_months: 7,
+      });
 
-    await handleKiloPassSubscriptionEvent({
-      eventId: `evt_${Math.random()}`,
-      eventType: 'customer.subscription.updated',
-      subscription,
-    });
+      const subscription = makeStripeSubscription({
+        id: stripeSubId,
+        start_date_seconds: new Date(startedAt).valueOf() / 1000,
+        status: 'active',
+        cancel_at_period_end: true,
+        metadata: kiloPassMetadata({
+          kiloUserId: user.id,
+          tier: KiloPassTier.Tier199,
+          cadence: KiloPassCadence.Yearly,
+        }),
+      });
 
-    const updated = await db.query.kilo_pass_subscriptions.findFirst({
-      where: eq(kilo_pass_subscriptions.stripe_subscription_id, stripeSubId),
-    });
-    expect(updated?.status).toBe('active');
-    expect(updated?.cancel_at_period_end).toBe(true);
-    expect(updated?.current_streak_months).toBe(7);
-  });
+      await handleKiloPassSubscriptionEvent({
+        eventId: `evt_${Math.random()}`,
+        eventType: 'customer.subscription.updated',
+        subscription,
+      });
+
+      const updated = await db.query.kilo_pass_subscriptions.findFirst({
+        where: eq(kilo_pass_subscriptions.stripe_subscription_id, stripeSubId),
+      });
+      expect(updated?.status).toBe('active');
+      expect(updated?.cancel_at_period_end).toBe(true);
+      expect(updated?.current_streak_months).toBe(7);
+      expect(toIso(updated?.started_at)).toBe(startedAt);
+      expect(updated?.tier).toBe(KiloPassTier.Tier199);
+      expect(updated?.cadence).toBe(KiloPassCadence.Yearly);
+
+      await handleKiloPassSubscriptionEvent({
+        eventId: `evt_${Math.random()}`,
+        eventType: 'customer.subscription.updated',
+        subscription,
+      });
+      const replayed = await db.query.kilo_pass_subscriptions.findFirst({
+        where: eq(kilo_pass_subscriptions.stripe_subscription_id, stripeSubId),
+      });
+      expect(toIso(replayed?.started_at)).toBe(startedAt);
+    }
+  );
 
   test('creates pause event when subscription has pause_collection set', async () => {
     const { handleKiloPassSubscriptionEvent } =
diff --git a/apps/web/src/routers/kilo-pass-router.test.ts b/apps/web/src/routers/kilo-pass-router.test.ts
index 1f8e84eff1f..717c23659e5 100644
--- a/apps/web/src/routers/kilo-pass-router.test.ts
+++ b/apps/web/src/routers/kilo-pass-router.test.ts
@@ -48,8 +48,8 @@ import {
   getMonthlyPriceUsd,
 } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import {
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT,
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF,
+  KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT,
+  KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF,
   KILO_PASS_WELCOME_PROMO_FINGERPRINT_POLICY_ROLLOUT,
 } from '@kilocode/web-shared/lib/kilo-pass/constants';
 
@@ -87,9 +87,6 @@ jest.mock('@/lib/kilo-pass/google-play-sdk', () => ({
   acknowledgeGooglePlaySubscriptionPurchase: mockAcknowledgePlay,
 }));
 
-const PROMO_OFFER_ACTIVE_TEST_TIME = '2026-05-06T12:00:00.000Z';
-const PROMO_OFFER_EXPIRED_TEST_TIME = '2026-05-07T00:00:00.000Z';
-
 let mockKiloPassNowIso: string | null = null;
 
 type StripeMock = {
@@ -565,7 +562,7 @@ async function insertSubscription(params: {
     params.status === 'unpaid' ||
     params.status === 'incomplete_expired';
 
-  const startedAt = params.startedAt ?? now;
+  const startedAt = params.startedAt === undefined ? '2026-06-01T00:00:00.000Z' : params.startedAt;
   const paymentProvider = params.paymentProvider ?? KiloPassPaymentProvider.Stripe;
   const stripeSubscriptionId = params.stripeSubscriptionId ?? null;
   const providerSubscriptionId =
@@ -1886,8 +1883,6 @@ describe('kiloPassRouter', () => {
 
   describe('getState', () => {
     it('returns null subscription when user has no Kilo Pass subscription', async () => {
-      freezeKiloPassClock(PROMO_OFFER_ACTIVE_TEST_TIME);
-
       const user = await insertTestUser({
         google_user_email: 'kilo-pass-get-state-empty@example.com',
       });
@@ -2042,6 +2037,7 @@ describe('kiloPassRouter', () => {
         cadence: KiloPassCadence.Monthly,
         status: 'active',
         currentStreakMonths: 0,
+        startedAt: new Date(currentPeriodStartSeconds * 1000).toISOString(),
       });
       await insertBaseCreditsIssuance({
         subscriptionId,
@@ -2055,19 +2051,10 @@ describe('kiloPassRouter', () => {
       const result = await caller.kiloPass.getState();
 
       const expectedNextBillingAt = new Date(currentPeriodEndSeconds * 1000).toISOString();
-      const predictedStreakMonths = 1;
-      const bonusPercentApplied = computeMonthlyCadenceBonusPercent({
-        tier: KiloPassTier.Tier19,
-        streakMonths: predictedStreakMonths,
-        isFirstTimeSubscriberEver: true,
-      });
       const baseAmountUsd = getMonthlyPriceUsd(KiloPassTier.Tier19);
-      const baseCents = Math.round(baseAmountUsd * 100);
-      const bonusCents = Math.round(baseCents * bonusPercentApplied);
-      const expectedNextBonusUsd = bonusCents / 100;
 
       expect(result.subscription?.nextBillingAt).toBe(expectedNextBillingAt);
-      expect(result.subscription?.nextBonusCreditsUsd).toBe(expectedNextBonusUsd);
+      expect(result.subscription?.nextBonusCreditsUsd).toBe(9.5);
       expect(result.subscription?.currentPeriodBaseCreditsUsd).toBe(baseAmountUsd);
       expect(result.subscription?.currentPeriodUsageUsd).toBe(0);
       expect(result.subscription?.isBonusUnlocked).toBe(false);
@@ -2237,54 +2224,64 @@ describe('kiloPassRouter', () => {
       }
     );
 
-    it('keeps first-month current bonus visible for first-time subscribers with a new card', async () => {
-      const stripeMock = getStripeMock();
-      const currentPeriodEndSeconds = 1_700_123_456;
-      const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
-      stripeMock.subscriptions.retrieve.mockResolvedValue({
-        id: 'sub_test_monthly_new_card_current_bonus',
-        status: 'active',
-        items: {
-          data: [
-            {
-              current_period_end: currentPeriodEndSeconds,
-              current_period_start: currentPeriodStartSeconds,
-            },
-          ],
-        },
-      });
-
-      const user = await insertTestUser({
-        google_user_email: 'kilo-pass-get-state-new-card-current-bonus@example.com',
-      });
-      const { id: subscriptionId } = await insertSubscription({
-        kiloUserId: user.id,
-        stripeSubscriptionId: 'sub_test_monthly_new_card_current_bonus',
-        tier: KiloPassTier.Tier199,
-        cadence: KiloPassCadence.Monthly,
-        status: 'active',
-        currentStreakMonths: 1,
-        startedAt: '2026-06-01T00:00:00.000Z',
-      });
-      await insertBaseCreditsIssuance({
-        subscriptionId,
-        kiloUserId: user.id,
-        welcomePromoEligibilityReason:
-          KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim,
-      });
+    it.each([
+      { startedAt: '2026-10-08T23:59:59.999Z', currentPercent: 0.5, nextPercent: 0.1 },
+      { startedAt: '2026-10-09T00:00:00.000Z', currentPercent: 0.05, nextPercent: 0.5 },
+      { startedAt: '2026-10-09T00:00:00.001Z', currentPercent: 0.05, nextPercent: 0.5 },
+      { startedAt: null, currentPercent: 0.5, nextPercent: 0.1 },
+    ])(
+      'projects monthly bonuses using subscription start $startedAt',
+      async ({ startedAt, currentPercent, nextPercent }) => {
+        const stripeMock = getStripeMock();
+        const stripeSubscriptionId = `sub_test_monthly_cutoff_${startedAt}`;
+        const currentPeriodEndSeconds = 1_700_123_456;
+        const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
+        stripeMock.subscriptions.retrieve.mockResolvedValue({
+          id: stripeSubscriptionId,
+          status: 'active',
+          items: {
+            data: [
+              {
+                current_period_end: currentPeriodEndSeconds,
+                current_period_start: currentPeriodStartSeconds,
+              },
+            ],
+          },
+        });
 
-      const caller = await createCallerForUser(user.id);
-      const result = await caller.kiloPass.getState();
+        const user = await insertTestUser({
+          google_user_email: `kilo-pass-cutoff-${startedAt}@example.com`,
+        });
+        const { id: subscriptionId } = await insertSubscription({
+          kiloUserId: user.id,
+          stripeSubscriptionId,
+          tier: KiloPassTier.Tier199,
+          cadence: KiloPassCadence.Monthly,
+          status: 'active',
+          currentStreakMonths: 1,
+          startedAt,
+        });
+        await insertBaseCreditsIssuance({
+          subscriptionId,
+          kiloUserId: user.id,
+          welcomePromoEligibilityReason:
+            KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim,
+        });
 
-      const baseAmountUsd = getMonthlyPriceUsd(KiloPassTier.Tier199);
-      const expectedCurrentBonusUsd =
-        Math.round(baseAmountUsd * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT * 100) /
-        100;
+        const caller = await createCallerForUser(user.id);
+        const result = await caller.kiloPass.getState();
 
-      expect(result.subscription?.currentPeriodBonusCreditsUsd).toBe(expectedCurrentBonusUsd);
-    });
+        const baseAmountUsd = getMonthlyPriceUsd(KiloPassTier.Tier199);
+        expect(result.subscription?.currentPeriodBonusCreditsUsd).toBe(
+          Math.round(baseAmountUsd * currentPercent * 100) / 100
+        );
+        expect(result.subscription?.nextBonusCreditsUsd).toBe(
+          Math.round(baseAmountUsd * nextPercent * 100) / 100
+        );
+      }
+    );
 
-    it('uses ramp current bonus instead of grandfathered month-2 promo for reused cards', async () => {
+    it('uses the month-2 ramp for reused cards', async () => {
       const stripeMock = getStripeMock();
       const currentPeriodEndSeconds = 1_700_123_456;
       const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
@@ -2311,7 +2308,7 @@ describe('kiloPassRouter', () => {
         cadence: KiloPassCadence.Monthly,
         status: 'active',
         currentStreakMonths: 2,
-        startedAt: '2026-01-01T00:00:00.000Z',
+        startedAt: '2026-10-09T00:00:00.000Z',
       });
       await insertBaseCreditsIssuance({
         subscriptionId,
@@ -2336,13 +2333,13 @@ describe('kiloPassRouter', () => {
         tier: KiloPassTier.Tier199,
         streakMonths: 2,
         isFirstTimeSubscriberEver: false,
-        subscriptionStartedAtIso: '2026-01-01T00:00:00.000Z',
+        subscriptionStartedAtIso: '2026-10-09T00:00:00.000Z',
       });
       const expectedCurrentBonusUsd = Math.round(baseAmountUsd * rampBonusPercent * 100) / 100;
 
       expect(result.subscription?.currentPeriodBonusCreditsUsd).toBe(expectedCurrentBonusUsd);
       expect(result.subscription?.currentPeriodBonusCreditsUsd).not.toBe(
-        Math.round(baseAmountUsd * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT * 100) / 100
+        Math.round(baseAmountUsd * KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT * 100) / 100
       );
     });
 
@@ -2747,7 +2744,7 @@ describe('kiloPassRouter', () => {
       );
     });
 
-    it('keeps App Store month-2 grandfather bonus after a post-cutoff renewal', async () => {
+    it('uses App Store month-2 normal ramp after a May 1 subscription start', async () => {
       freezeKiloPassClock('2026-06-15T00:00:00.000Z');
 
       const user = await insertTestUser({
@@ -2807,10 +2804,7 @@ describe('kiloPassRouter', () => {
       const result = await caller.kiloPass.getState();
 
       const baseAmountUsd = getMonthlyPriceUsd(KiloPassTier.Tier19);
-      const expectedCurrentBonusUsd =
-        Math.round(
-          Math.round(baseAmountUsd * 100) * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT
-        ) / 100;
+      const expectedCurrentBonusUsd = Math.round(Math.round(baseAmountUsd * 100) * 0.1) / 100;
 
       expect(result.subscription).toEqual(
         expect.objectContaining({
@@ -2823,7 +2817,7 @@ describe('kiloPassRouter', () => {
       );
     });
 
-    it('predicts monthly nextBonusCreditsUsd as 50% for promo month 2 (streak=1 -> predicted=2)', async () => {
+    it('predicts monthly nextBonusCreditsUsd as 10% before cutoff (streak=1 -> predicted=2)', async () => {
       const stripeMock = getStripeMock();
       const currentPeriodEndSeconds = 1_700_123_456;
       const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
@@ -2867,8 +2861,7 @@ describe('kiloPassRouter', () => {
 
       const baseAmountUsd = getMonthlyPriceUsd(KiloPassTier.Tier19);
       const baseCents = Math.round(baseAmountUsd * 100);
-      const expectedNextBonusUsd =
-        Math.round(baseCents * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT) / 100;
+      const expectedNextBonusUsd = Math.round(baseCents * 0.1) / 100;
 
       expect(result.subscription?.nextBonusCreditsUsd).toBe(expectedNextBonusUsd);
     });
@@ -2880,7 +2873,7 @@ describe('kiloPassRouter', () => {
           KILO_PASS_WELCOME_PROMO_FINGERPRINT_POLICY_ROLLOUT.valueOf() - 1
         ).toISOString(),
         expectedCurrentPercent: 0.5,
-        expectedNextPercent: 0.5,
+        expectedNextPercent: 0.1,
       },
       {
         label: 'at the fingerprint-policy rollout',
@@ -2971,7 +2964,7 @@ describe('kiloPassRouter', () => {
         cadence: KiloPassCadence.Monthly,
         status: 'active',
         currentStreakMonths: 1,
-        startedAt: '2026-01-01T00:00:00.000Z',
+        startedAt: '2026-10-09T00:00:00.000Z',
       });
       await insertBaseCreditsIssuance({
         subscriptionId,
@@ -2990,17 +2983,17 @@ describe('kiloPassRouter', () => {
         tier: KiloPassTier.Tier19,
         streakMonths: 2,
         isFirstTimeSubscriberEver: false,
-        subscriptionStartedAtIso: '2026-01-01T00:00:00.000Z',
+        subscriptionStartedAtIso: '2026-10-09T00:00:00.000Z',
       });
       const expectedNextBonusUsd = Math.round(baseAmountUsd * expectedPercent * 100) / 100;
 
       expect(result.subscription?.nextBonusCreditsUsd).toBe(expectedNextBonusUsd);
       expect(result.subscription?.nextBonusCreditsUsd).not.toBe(
-        Math.round(baseAmountUsd * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT * 100) / 100
+        Math.round(baseAmountUsd * KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT * 100) / 100
       );
     });
 
-    it('computes monthly currentPeriodBonusCreditsUsd as 50% for promo month 2 (streak=2)', async () => {
+    it('computes monthly currentPeriodBonusCreditsUsd as 10% before cutoff (streak=2)', async () => {
       const stripeMock = getStripeMock();
       const currentPeriodEndSeconds = 1_700_123_456;
       const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
@@ -3049,15 +3042,12 @@ describe('kiloPassRouter', () => {
       const result = await caller.kiloPass.getState();
 
       const baseAmountUsd = getMonthlyPriceUsd(KiloPassTier.Tier19);
-      const expectedCurrentBonusUsd =
-        Math.round(
-          Math.round(baseAmountUsd * 100) * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT
-        ) / 100;
+      const expectedCurrentBonusUsd = Math.round(Math.round(baseAmountUsd * 100) * 0.1) / 100;
 
       expect(result.subscription?.currentPeriodBonusCreditsUsd).toBe(expectedCurrentBonusUsd);
     });
 
-    it('does not apply 50% month-2 promo when started_at is at/after the cutoff (streak=2)', async () => {
+    it('applies 50% month-2 promo when started_at is at cutoff (streak=2)', async () => {
       const stripeMock = getStripeMock();
       const currentPeriodEndSeconds = 1_700_123_456;
       const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
@@ -3085,7 +3075,7 @@ describe('kiloPassRouter', () => {
         cadence: KiloPassCadence.Monthly,
         status: 'active',
         currentStreakMonths: 2,
-        startedAt: KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString(),
+        startedAt: KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.toISOString(),
       });
       await insertBaseCreditsIssuance({
         subscriptionId,
@@ -3110,18 +3100,18 @@ describe('kiloPassRouter', () => {
         tier: KiloPassTier.Tier19,
         streakMonths: 2,
         isFirstTimeSubscriberEver: true,
+        subscriptionStartedAtIso: KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.toISOString(),
       });
       const expectedCurrentBonusUsd = Math.round(baseAmountUsd * expectedPercent * 100) / 100;
 
       expect(result.subscription?.currentPeriodBonusCreditsUsd).toBe(expectedCurrentBonusUsd);
-      expect(result.subscription?.currentPeriodBonusCreditsUsd).not.toBe(
-        Math.round(
-          Math.round(baseAmountUsd * 100) * KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT
-        ) / 100
+      expect(result.subscription?.currentPeriodBonusCreditsUsd).toBe(
+        Math.round(Math.round(baseAmountUsd * 100) * KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT) /
+          100
       );
     });
 
-    it('keeps month 3+ bonus ramp unchanged even for grandfathered subscriptions (streak=3)', async () => {
+    it('keeps month 3+ bonus ramp unchanged for pre-cutoff subscriptions (streak=3)', async () => {
       const stripeMock = getStripeMock();
       const currentPeriodEndSeconds = 1_700_123_456;
       const currentPeriodStartSeconds = currentPeriodEndSeconds - 2_592_000;
@@ -3284,8 +3274,6 @@ describe('kiloPassRouter', () => {
 
   describe('isEligibleForFirstMonthPromo in getState', () => {
     it('returns isEligibleForFirstMonthPromo=true when user has no subscriptions', async () => {
-      freezeKiloPassClock(PROMO_OFFER_ACTIVE_TEST_TIME);
-
       const user = await insertTestUser({
         google_user_email: 'kilo-pass-promo-eligible-no-sub@example.com',
       });
@@ -3297,34 +3285,6 @@ describe('kiloPassRouter', () => {
       expect(result.subscription).toBeNull();
     });
 
-    it('returns isEligibleForFirstMonthPromo=false after the promo cutoff', async () => {
-      freezeKiloPassClock(PROMO_OFFER_EXPIRED_TEST_TIME);
-
-      const user = await insertTestUser({
-        google_user_email: 'kilo-pass-promo-expired-no-sub@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 () => {
-      freezeKiloPassClock(PROMO_OFFER_ACTIVE_TEST_TIME);
-
-      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 () => {
       const stripeMock = getStripeMock();
       stripeMock.subscriptions.retrieve.mockResolvedValue({
diff --git a/apps/web/src/routers/kilo-pass-router.ts b/apps/web/src/routers/kilo-pass-router.ts
index e56f00716d6..f984237364c 100644
--- a/apps/web/src/routers/kilo-pass-router.ts
+++ b/apps/web/src/routers/kilo-pass-router.ts
@@ -87,10 +87,7 @@ import {
   KILO_PASS_BONUS_LIKE_ITEM_KINDS,
   appendKiloPassAuditLog,
 } from '@kilocode/web-shared/lib/kilo-pass/issuance';
-import {
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF,
-  KILO_PASS_TIER_CONFIG,
-} from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { KILO_PASS_TIER_CONFIG } from '@kilocode/web-shared/lib/kilo-pass/constants';
 import { fromMicrodollars } from '@kilocode/app-shared/utils';
 import { timedUsageQuery } from '@/lib/usage-query';
 import {
@@ -405,10 +402,6 @@ function mapPlayCompletionError(error: unknown, userId: string): TRPCError {
   });
 }
 
-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;
 }
@@ -1737,7 +1730,7 @@ export const kiloPassRouter = createTRPCRouter({
     if (!subscriptionBase) {
       return {
         subscription: null,
-        isEligibleForFirstMonthPromo: isTwoMonthPromoOfferActive(),
+        isEligibleForFirstMonthPromo: true,
       };
     }
 
diff --git a/packages/web-shared/src/lib/kilo-pass/bonus.test.ts b/packages/web-shared/src/lib/kilo-pass/bonus.test.ts
index 9f87c0bf80f..18e06077ebe 100644
--- a/packages/web-shared/src/lib/kilo-pass/bonus.test.ts
+++ b/packages/web-shared/src/lib/kilo-pass/bonus.test.ts
@@ -1,12 +1,13 @@
 import { KiloPassCadence, KiloPassTier } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import {
   computeMonthlyCadenceBonusPercent,
+  getMonthlyWelcomePromoMonth,
+  computeYearlyCadenceMonthlyBonusUsd,
   isKiloPassSelectionEligibleForKiloclawCommitUpsell,
 } from './bonus';
 
 import {
-  KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT,
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF,
+  KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF,
   KILO_PASS_TIER_CONFIG,
 } from './constants';
 
@@ -37,119 +38,75 @@ describe('kilo pass bonus utilities', () => {
     });
   });
 
-  describe('computeMonthlyCadenceBonusPercent', () => {
-    it('keeps the second-month grandfather cutoff at midnight May 7 UTC', () => {
-      expect(KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString()).toBe(
-        '2026-05-07T00:00:00.000Z'
-      );
+  describe('monthly welcome promo cutoff', () => {
+    it.each([
+      ['2026-05-01T00:00:00Z', 1],
+      ['2026-10-08T23:59:59.999Z', 1],
+      ['2026-10-09T00:00:00.000Z', 2],
+      ['2026-10-09T00:00:00.001Z', 2],
+      ['2027-01-01T00:00:00Z', 2],
+      ['2026-10-08 23:59:59.999+00', 1],
+      ['2026-10-09 00:00:00+00', 2],
+      ['2026-10-08T20:00:00-04:00', 2],
+      [null, 1],
+      [undefined, 1],
+      ['', 1],
+      ['not-a-timestamp', 1],
+      ['2026-13-01T00:00:00Z', 1],
+      ['2026-10-99T00:00:00Z', 1],
+    ] as const)('selects promo month %s => %s', (startedAtIso, expectedMonth) => {
+      expect(getMonthlyWelcomePromoMonth(startedAtIso)).toBe(expectedMonth);
     });
 
-    it('applies the 50% promo for streak months 1 and 2 when eligible (strictly before cutoff)', () => {
-      expect(
-        computeMonthlyCadenceBonusPercent({
-          tier: KiloPassTier.Tier19,
-          streakMonths: 1,
-          isFirstTimeSubscriberEver: true,
-          subscriptionStartedAtIso: '2026-01-26T23:59:59.000Z',
-        })
-      ).toBeCloseTo(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT);
-
-      expect(
-        computeMonthlyCadenceBonusPercent({
-          tier: KiloPassTier.Tier19,
-          streakMonths: 2,
-          isFirstTimeSubscriberEver: true,
-          subscriptionStartedAtIso: '2026-01-26T23:59:59.000Z',
-        })
-      ).toBeCloseTo(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT);
-
-      expect(
-        computeMonthlyCadenceBonusPercent({
-          tier: KiloPassTier.Tier19,
-          streakMonths: 3,
-          isFirstTimeSubscriberEver: true,
-          subscriptionStartedAtIso: '2026-01-26T23:59:59.000Z',
-        })
-      ).toBeCloseTo(
-        KILO_PASS_TIER_CONFIG.tier_19.monthlyBaseBonusPercent +
-          KILO_PASS_TIER_CONFIG.tier_19.monthlyStepBonusPercent * 2
-      );
-    });
-
-    it('applies the first-month promo for first-time subscribers after the grandfather cutoff', () => {
-      expect(
+    it.each([KiloPassTier.Tier19, KiloPassTier.Tier49, KiloPassTier.Tier199])(
+      'uses the start timestamp and normal ramp for %s',
+      tier => {
+        for (const subscriptionStartedAtIso of [
+          '2026-05-01T00:00:00Z',
+          '2026-10-08T23:59:59.999Z',
+          KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.toISOString(),
+          '2026-10-09T00:00:00.001Z',
+          null,
+          'not-a-timestamp',
+        ]) {
+          for (const isFirstTimeSubscriberEver of [false, true]) {
+            const bonuses = [1, 2, 3].map(streakMonths =>
+              computeMonthlyCadenceBonusPercent({
+                tier,
+                streakMonths,
+                isFirstTimeSubscriberEver,
+                subscriptionStartedAtIso,
+              })
+            );
+            const expected = !isFirstTimeSubscriberEver
+              ? [0.05, 0.1, 0.15]
+              : getMonthlyWelcomePromoMonth(subscriptionStartedAtIso) === 1
+                ? [0.5, 0.1, 0.15]
+                : [0.05, 0.5, 0.15];
+            bonuses.forEach((bonus, index) => expect(bonus).toBeCloseTo(expected[index]));
+          }
+        }
+      }
+    );
+
+    it('rejects streak months below 1', () => {
+      expect(() =>
         computeMonthlyCadenceBonusPercent({
           tier: KiloPassTier.Tier19,
-          streakMonths: 1,
+          streakMonths: 0,
           isFirstTimeSubscriberEver: true,
-          subscriptionStartedAtIso: new Date(
-            KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.valueOf() + 1
-          ).toISOString(),
         })
-      ).toBeCloseTo(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT);
+      ).toThrow('streakMonths must be >= 1');
     });
 
-    it('does not apply the override when isFirstTimeSubscriberEver is false', () => {
-      expect(
-        computeMonthlyCadenceBonusPercent({
-          tier: KiloPassTier.Tier49,
-          streakMonths: 1,
-          isFirstTimeSubscriberEver: false,
-        })
-      ).toBeCloseTo(KILO_PASS_TIER_CONFIG.tier_49.monthlyBaseBonusPercent);
-    });
-  });
-
-  describe('computeMonthlyCadenceBonusPercent (promo cutoff behavior)', () => {
-    const tier = KiloPassTier.Tier49;
-
-    const computeFallback = (params: {
-      streakMonths: number;
-      isFirstTimeSubscriberEver: boolean;
-    }): number => {
-      return computeMonthlyCadenceBonusPercent({
-        tier,
-        streakMonths: params.streakMonths,
-        isFirstTimeSubscriberEver: params.isFirstTimeSubscriberEver,
-        subscriptionStartedAtIso: KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString(),
-      });
-    };
-
-    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(KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT);
-    });
-
-    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(),
-        })
-      ).toBeCloseTo(
-        KILO_PASS_TIER_CONFIG.tier_49.monthlyBaseBonusPercent +
-          KILO_PASS_TIER_CONFIG.tier_49.monthlyStepBonusPercent
-      );
-    });
-
-    it('does not apply promo when isFirstTimeSubscriberEver is false', () => {
-      expect(
-        computeMonthlyCadenceBonusPercent({
-          tier,
-          streakMonths: 1,
-          isFirstTimeSubscriberEver: false,
-          subscriptionStartedAtIso: '2026-01-26T23:59:59.000Z',
-        })
-      ).toBe(computeFallback({ streakMonths: 1, isFirstTimeSubscriberEver: false }));
-    });
+    it.each([KiloPassTier.Tier19, KiloPassTier.Tier49, KiloPassTier.Tier199])(
+      'leaves yearly %s bonuses at 50%',
+      tier => {
+        expect(computeYearlyCadenceMonthlyBonusUsd(tier)).toBe(
+          KILO_PASS_TIER_CONFIG[tier].monthlyPriceUsd * 0.5
+        );
+      }
+    );
   });
 
   describe('isKiloPassSelectionEligibleForKiloclawCommitUpsell', () => {
diff --git a/packages/web-shared/src/lib/kilo-pass/bonus.ts b/packages/web-shared/src/lib/kilo-pass/bonus.ts
index c73db9d8098..7d8e769ffb1 100644
--- a/packages/web-shared/src/lib/kilo-pass/bonus.ts
+++ b/packages/web-shared/src/lib/kilo-pass/bonus.ts
@@ -1,12 +1,10 @@
 import { KiloPassCadence, type KiloPassTier } from '@kilocode/web-shared/lib/kilo-pass/enums';
 import {
   KILO_PASS_FIRST_MONTH_PROMO_BONUS_PERCENT,
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT,
-  KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF,
+  KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF,
   KILO_PASS_TIER_CONFIG,
   KILO_PASS_YEARLY_MONTHLY_BONUS_PERCENT,
 } from '@kilocode/web-shared/lib/kilo-pass/constants';
-import { dayjs } from '@kilocode/web-shared/lib/kilo-pass/dayjs';
 
 export const getMonthlyPriceUsd = (tier: KiloPassTier): number => {
   return KILO_PASS_TIER_CONFIG[tier].monthlyPriceUsd;
@@ -24,6 +22,16 @@ export const isKiloPassSelectionEligibleForKiloclawCommitUpsell = (params: {
   return getMonthlyPriceUsd(params.tier) * 1_000_000 >= params.commitCostMicrodollars;
 };
 
+export const getMonthlyWelcomePromoMonth = (
+  subscriptionStartedAtIso: string | null | undefined
+): 1 | 2 => {
+  const startedAtMillis = subscriptionStartedAtIso ? Date.parse(subscriptionStartedAtIso) : NaN;
+  return Number.isFinite(startedAtMillis) &&
+    startedAtMillis >= KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.valueOf()
+    ? 2
+    : 1;
+};
+
 export const computeMonthlyCadenceBonusPercent = (params: {
   tier: KiloPassTier;
   streakMonths: number;
@@ -36,26 +44,14 @@ export const computeMonthlyCadenceBonusPercent = (params: {
     throw new Error('streakMonths must be >= 1');
   }
 
-  if (streakMonths === 1 && isFirstTimeSubscriberEver) {
+  if (
+    isFirstTimeSubscriberEver &&
+    streakMonths <= 2 &&
+    streakMonths === getMonthlyWelcomePromoMonth(subscriptionStartedAtIso)
+  ) {
     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();
-
-      if (
-        startedAtUtc.isValid() &&
-        startedAtUtc.isBefore(KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF)
-      ) {
-        return KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT;
-      }
-    }
-  }
-
   const config = KILO_PASS_TIER_CONFIG[tier];
   const nMinus1 = streakMonths - 1;
   const uncapped = config.monthlyBaseBonusPercent + config.monthlyStepBonusPercent * nMinus1;
diff --git a/packages/web-shared/src/lib/kilo-pass/constants.ts b/packages/web-shared/src/lib/kilo-pass/constants.ts
index f9e483a4e9e..a47c38e9415 100644
--- a/packages/web-shared/src/lib/kilo-pass/constants.ts
+++ b/packages/web-shared/src/lib/kilo-pass/constants.ts
@@ -15,8 +15,6 @@ export const KILO_PASS_WELCOME_PROMO_FINGERPRINT_POLICY_ROLLOUT = dayjs(
   '2026-05-28T12:06:20.000Z'
 ).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-07T00:00:00Z').utc();
-
-export const KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_BONUS_PERCENT = 0.5;
+// Eligible monthly subscriptions starting at this boundary receive their welcome promo in month 2.
+export const KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF =
+  dayjs('2026-10-09T00:00:00Z').utc();
diff --git a/packages/web-shared/src/lib/kilo-pass/issuance.ts b/packages/web-shared/src/lib/kilo-pass/issuance.ts
index 6d9444ea7db..5e3089bd07e 100644
--- a/packages/web-shared/src/lib/kilo-pass/issuance.ts
+++ b/packages/web-shared/src/lib/kilo-pass/issuance.ts
@@ -502,9 +502,11 @@ export async function applyPendingKiloPassReferralBonusForIssuance(
     subscriptionId: string;
     kiloUserId: string;
     stripeInvoiceId?: string | null;
+    /** The issuance pays the welcome promo, so pending referral rewards wait for a later issuance. */
+    deferForWelcomePromo?: boolean;
   }
 ): Promise<KiloPassReferralBonusApplicationResult> {
-  const { issuanceId, subscriptionId, kiloUserId, stripeInvoiceId } = params;
+  const { issuanceId, subscriptionId, kiloUserId, stripeInvoiceId, deferForWelcomePromo } = params;
 
   await lockIssuanceRow(tx, issuanceId);
 
@@ -563,6 +565,18 @@ export async function applyPendingKiloPassReferralBonusForIssuance(
     };
   }
 
+  if (deferForWelcomePromo) {
+    return {
+      wasIssued: false,
+      rewardId: null,
+      expiredRewardIds: expiredRewards.map(reward => reward.id),
+      issuanceItemId: null,
+      creditTransactionId: null,
+      amountUsd: 0,
+      amountMicrodollars: 0,
+    };
+  }
+
   const rewardRows = await tx
     .select({
       id: impact_referral_rewards.id,
diff --git a/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.test.ts b/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.test.ts
index e1e804ce13e..e5473eb5b63 100644
--- a/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.test.ts
+++ b/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.test.ts
@@ -23,7 +23,7 @@ import {
   computeMonthlyCadenceBonusPercent,
   getMonthlyPriceUsd,
 } from '@kilocode/web-shared/lib/kilo-pass/bonus';
-import { KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF } from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF } from '@kilocode/web-shared/lib/kilo-pass/constants';
 import { maybeIssueKiloPassBonusFromUsageThreshold } from '@kilocode/web-shared/lib/kilo-pass/usage-triggered-bonus';
 import { and, eq } from 'drizzle-orm';
 
@@ -155,10 +155,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
       stripeInvoiceId: 'inv_test_monthly',
       currentStreakMonths: 2,
       nextYearlyIssueAt: null,
-      // Ensure this test remains a "regular ramp" case, not eligible for the month-2 grandfathered promo.
-      startedAtIso: new Date(
-        KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.valueOf() + 1
-      ).toISOString(),
+      startedAtIso: '2026-05-01T00:00:00.000Z',
     });
 
     await maybeIssueKiloPassBonusFromUsageThreshold({
@@ -188,6 +185,48 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     expect(userRow?.kilo_pass_threshold).toBeNull();
   });
 
+  test.each([
+    [1, '2026-10-01', 950_000],
+    [2, '2026-11-01', 9_500_000],
+  ])(
+    'new monthly subscription issues the month %s bonus after usage',
+    async (currentStreakMonths, issueMonth, expectedMicrodollars) => {
+      const user = await insertTestUser({
+        microdollars_used: 20_000_000,
+        kilo_pass_threshold: 19_000_000,
+      });
+      const { issuanceId } = await seedBaseIssuance({
+        kiloUserId: user.id,
+        cadence: KiloPassCadence.Monthly,
+        tier: KiloPassTier.Tier19,
+        issueMonth,
+        stripeInvoiceId: `inv_new_monthly_${currentStreakMonths}`,
+        currentStreakMonths,
+        nextYearlyIssueAt: null,
+        startedAtIso: '2026-10-09T00:00:00.000Z',
+        initialWelcomePromoEligibilityReason:
+          KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim,
+      });
+
+      await maybeIssueKiloPassBonusFromUsageThreshold({
+        kiloUserId: user.id,
+        nowIso: currentStreakMonths === 1 ? '2026-10-15T00:00:00Z' : '2026-11-15T00:00:00Z',
+        db,
+      });
+
+      const bonusItem = await db.query.kilo_pass_issuance_items.findFirst({
+        where: and(
+          eq(kilo_pass_issuance_items.kilo_pass_issuance_id, issuanceId),
+          eq(kilo_pass_issuance_items.kind, KiloPassIssuanceItemKind.Bonus)
+        ),
+      });
+      const bonusTx = await db.query.credit_transactions.findFirst({
+        where: eq(credit_transactions.id, bonusItem?.credit_transaction_id ?? ''),
+      });
+      expect(bonusTx?.amount_microdollars).toBe(expectedMicrodollars);
+    }
+  );
+
   test('monthly: bases the bonus on the credited base when the subscription tier is higher', async () => {
     const user = await insertTestUser({
       microdollars_used: 20_000_000,
@@ -284,7 +323,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     expect(userRow?.kilo_pass_threshold).toBeNull();
   });
 
-  test('monthly: first-2-months promo eligible => 50% bonus (tier_49, streak=2)', async () => {
+  test('monthly: pre-May 7 start uses the 10% month-2 ramp (tier_49, streak=2)', async () => {
     const user = await insertTestUser({
       microdollars_used: 55_000_000,
       kilo_pass_threshold: 49_000_000,
@@ -295,7 +334,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
       cadence: KiloPassCadence.Monthly,
       tier: KiloPassTier.Tier49,
       issueMonth: '2026-02-01',
-      stripeInvoiceId: 'inv_test_monthly_month2_grandfathered_eligible',
+      stripeInvoiceId: 'inv_test_monthly_month2_legacy',
       currentStreakMonths: 2,
       nextYearlyIssueAt: null,
       startedAtIso: '2026-01-26T23:59:59.000Z',
@@ -320,8 +359,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     const bonusTx = await db.query.credit_transactions.findFirst({
       where: eq(credit_transactions.id, bonusItem?.credit_transaction_id ?? ''),
     });
-    // tier_49 monthly price is $49, 50% => $24.50.
-    expect(bonusTx?.amount_microdollars).toBe(24_500_000);
+    expect(bonusTx?.amount_microdollars).toBe(4_900_000);
 
     const auditRows = await db
       .select({ payload: kilo_pass_audit_log.payload_json })
@@ -348,7 +386,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     expect(decision.issueMonth).toBe('2026-02-01');
   });
 
-  test('monthly: first-2-months promo ineligible at cutoff => ramp applies (not 50%)', async () => {
+  test('monthly: first-time start at cutoff => month 2 welcome promo', async () => {
     const user = await insertTestUser({
       microdollars_used: 55_000_000,
       kilo_pass_threshold: 49_000_000,
@@ -359,10 +397,10 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
       cadence: KiloPassCadence.Monthly,
       tier: KiloPassTier.Tier49,
       issueMonth: '2026-02-01',
-      stripeInvoiceId: 'inv_test_monthly_month2_grandfathered_ineligible_cutoff',
+      stripeInvoiceId: 'inv_test_monthly_month2_at_cutoff',
       currentStreakMonths: 2,
       nextYearlyIssueAt: null,
-      startedAtIso: KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString(),
+      startedAtIso: KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.toISOString(),
       initialWelcomePromoEligibilityReason:
         KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim,
     });
@@ -384,11 +422,10 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     const bonusTx = await db.query.credit_transactions.findFirst({
       where: eq(credit_transactions.id, bonusItem?.credit_transaction_id ?? ''),
     });
-    // tier_49 at streak=2 => base 5% + step 5% * 1 = 10% of $49.00 = $4.90.
-    expect(bonusTx?.amount_microdollars).toBe(4_900_000);
+    expect(bonusTx?.amount_microdollars).toBe(24_500_000);
   });
 
-  test('monthly: first-2-months promo started AFTER cutoff => ramp applies (not 50%)', async () => {
+  test('monthly: first-time start after cutoff => month 2 welcome promo', async () => {
     const user = await insertTestUser({
       microdollars_used: 55_000_000,
       kilo_pass_threshold: 49_000_000,
@@ -397,7 +434,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     const tier = KiloPassTier.Tier49;
     const streakMonths = 2;
     const startedAtIso = new Date(
-      KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.valueOf() + 1
+      KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.valueOf() + 1
     ).toISOString();
 
     const { issuanceId } = await seedBaseIssuance({
@@ -405,7 +442,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
       cadence: KiloPassCadence.Monthly,
       tier,
       issueMonth: '2026-02-01',
-      stripeInvoiceId: 'inv_test_monthly_month2_grandfathered_ineligible_after_cutoff',
+      stripeInvoiceId: 'inv_test_monthly_month2_after_cutoff',
       currentStreakMonths: streakMonths,
       nextYearlyIssueAt: null,
       startedAtIso,
@@ -435,6 +472,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
       tier,
       streakMonths,
       isFirstTimeSubscriberEver: true,
+      subscriptionStartedAtIso: startedAtIso,
     });
     const expectedMonthlyPriceUsd = getMonthlyPriceUsd(tier);
     const expectedBonusMicrodollars = Math.round(
@@ -442,7 +480,7 @@ describe('maybeIssueKiloPassBonusFromUsageThreshold', () => {
     );
 
     expect(bonusTx?.amount_microdollars).toBe(expectedBonusMicrodollars);
-    expect(bonusTx?.amount_microdollars).not.toBe(24_500_000);
+    expect(bonusTx?.amount_microdollars).toBe(24_500_000);
 
     const auditRows = await db
       .select({ payload: kilo_pass_audit_log.payload_json })
diff --git a/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.ts b/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.ts
index bd10ebd2933..79211631f86 100644
--- a/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.ts
+++ b/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.ts
@@ -4,7 +4,6 @@ import {
   credit_transactions,
   kilo_pass_issuance_items,
   kilo_pass_issuances,
-  kilo_pass_subscriptions,
   kilocode_users,
 } from '@kilocode/db/schema';
 import { db as defaultDb } from '@kilocode/web-shared/lib/drizzle';
@@ -33,11 +32,10 @@ import {
 } from '@kilocode/web-shared/lib/kilo-pass/state';
 import { getEffectiveKiloPassThreshold } from '@kilocode/web-shared/lib/kilo-pass/threshold';
 import {
-  getInitialWelcomePromoContextForSubscription,
-  getKiloPassWelcomePromoPolicy,
+  getMonthlyWelcomePromoAccountContext,
   type KiloPassWelcomePromoPolicy,
 } from '@kilocode/web-shared/lib/kilo-pass/welcome-promo-context';
-import { and, desc, eq, inArray, like, ne } from 'drizzle-orm';
+import { and, desc, eq, inArray, like } from 'drizzle-orm';
 
 type Db = typeof defaultDb;
 type Tx = Parameters<Db['transaction']>[0] extends (tx: infer T) => unknown ? T : never;
@@ -272,35 +270,16 @@ async function maybeIssueBonusFromUsageThreshold(
       };
     }
 
-    const otherSubscription = await tx
-      .select({ id: kilo_pass_subscriptions.id })
-      .from(kilo_pass_subscriptions)
-      .where(
-        and(
-          eq(kilo_pass_subscriptions.kilo_user_id, kiloUserId),
-          ne(kilo_pass_subscriptions.id, subscription.subscriptionId)
-        )
-      )
-      .limit(1);
-
-    const isFirstTimeSubscriberEver = otherSubscription.length === 0;
-    const initialWelcomePromoContext =
-      subscription.paymentProvider === KiloPassPaymentProvider.Stripe
-        ? await getInitialWelcomePromoContextForSubscription(tx, {
-            subscriptionId: subscription.subscriptionId,
-          })
-        : null;
-    const welcomePromoPolicy = getKiloPassWelcomePromoPolicy({
+    const welcomePromoAccountContext = await getMonthlyWelcomePromoAccountContext(tx, {
+      kiloUserId,
+      subscriptionId: subscription.subscriptionId,
       paymentProvider: subscription.paymentProvider,
-      initialIssuanceCreatedAt: initialWelcomePromoContext?.createdAt ?? null,
     });
     const monthlyDecision = computeUsageTriggeredMonthlyBonusDecision({
       tier: subscription.tier,
       startedAtIso: subscription.startedAt,
       currentStreakMonths: subscription.currentStreakMonths,
-      isFirstTimeSubscriberEver,
-      welcomePromoPolicy,
-      welcomePromoEligibilityReason: initialWelcomePromoContext?.eligibilityReason ?? null,
+      ...welcomePromoAccountContext,
       issueMonth: issuance.issueMonth,
     });
 
diff --git a/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.unit.test.ts b/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.unit.test.ts
index fd8f51d9a09..e69ede16256 100644
--- a/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.unit.test.ts
+++ b/packages/web-shared/src/lib/kilo-pass/usage-triggered-bonus.unit.test.ts
@@ -1,8 +1,10 @@
 import { describe, expect, test } from '@jest/globals';
 
-import { KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF } from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF } from '@kilocode/web-shared/lib/kilo-pass/constants';
+import { getMonthlyPriceUsd } from '@kilocode/web-shared/lib/kilo-pass/bonus';
 import {
   KiloPassPaymentProvider,
+  KiloPassCadence,
   KiloPassTier,
   KiloPassWelcomePromoEligibilityReason,
 } from '@kilocode/web-shared/lib/kilo-pass/enums';
@@ -10,6 +12,7 @@ import {
   computeUsageTriggeredMonthlyBonusDecision,
   computeUsageTriggeredYearlyIssueMonth,
 } from '@kilocode/web-shared/lib/kilo-pass/usage-triggered-bonus';
+import { computeKiloPassBonusCreditsUsd } from '@kilocode/web-shared/lib/kilo-pass/bonus-decision';
 import { getKiloPassWelcomePromoPolicy } from '@kilocode/web-shared/lib/kilo-pass/welcome-promo-context';
 
 describe('usage-triggered-bonus (unit)', () => {
@@ -121,7 +124,7 @@ describe('usage-triggered-bonus (unit)', () => {
       }
     );
 
-    test('first-time month 2 before cutoff retains promo and bonusKind=promo-50pct', () => {
+    test('first-time month 2 before cutoff uses the normal ramp', () => {
       const d = computeUsageTriggeredMonthlyBonusDecision({
         tier: KiloPassTier.Tier49,
         startedAtIso: '2026-01-01T00:00:00.000Z',
@@ -131,29 +134,90 @@ describe('usage-triggered-bonus (unit)', () => {
         issueMonth: '2026-02-01',
       });
 
-      expect(d.shouldIssueFirstMonthPromo).toBe(true);
-      expect(d.bonusPercentApplied).toBe(0.5);
-      expect(d.description).toBe('Kilo Pass promo 50% bonus (tier_49, streak=2)');
-      expect(d.auditPayload).toEqual(expect.objectContaining({ bonusKind: 'promo-50pct' }));
+      expect(d.shouldIssueFirstMonthPromo).toBe(false);
+      expect(d.bonusPercentApplied).toBe(0.1);
+      expect(d.description).toBe('Kilo Pass monthly bonus (tier_49, streak=2)');
+      expect(d.auditPayload).toEqual(expect.objectContaining({ bonusKind: 'monthly-ramp' }));
     });
 
-    test('first-time month 2 at cutoff uses ramp and bonusKind=monthly-ramp', () => {
+    test('first-time month 2 at cutoff receives the welcome promo', () => {
       const d = computeUsageTriggeredMonthlyBonusDecision({
         tier: KiloPassTier.Tier49,
-        startedAtIso: KILO_PASS_MONTHLY_FIRST_2_MONTHS_PROMO_CUTOFF.toISOString(),
+        startedAtIso: KILO_PASS_MONTHLY_WELCOME_PROMO_SECOND_MONTH_CUTOFF.toISOString(),
         currentStreakMonths: 2,
         isFirstTimeSubscriberEver: true,
         welcomePromoPolicy: 'account-history-only',
         issueMonth: '2026-06-01',
       });
 
-      expect(d.shouldIssueFirstMonthPromo).toBe(false);
-      expect(d.bonusPercentApplied).toBe(0.1);
-      expect(d.description).toBe('Kilo Pass monthly bonus (tier_49, streak=2)');
-      expect(d.auditPayload).toEqual(expect.objectContaining({ bonusKind: 'monthly-ramp' }));
+      expect(d.shouldIssueFirstMonthPromo).toBe(true);
+      expect(d.bonusPercentApplied).toBe(0.5);
+      expect(d.description).toBe('Kilo Pass promo 50% bonus (tier_49, streak=2)');
+      expect(d.auditPayload).toEqual(expect.objectContaining({ bonusKind: 'promo-50pct' }));
     });
+
+    test.each([
+      [1, KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim, true, 0.05],
+      [2, KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim, true, 0.5],
+      [2, KiloPassWelcomePromoEligibilityReason.MissingFingerprint, true, 0.5],
+      [2, KiloPassWelcomePromoEligibilityReason.NoSupportedFingerprint, true, 0.5],
+      [2, KiloPassWelcomePromoEligibilityReason.FingerprintPreviouslyClaimed, true, 0.1],
+      [2, KiloPassWelcomePromoEligibilityReason.NoPositiveSettlement, true, 0.1],
+      [2, KiloPassWelcomePromoEligibilityReason.SettlementUnresolved, true, 0.1],
+      [2, null, true, 0.1],
+      [2, KiloPassWelcomePromoEligibilityReason.FirstPaymentFingerprintClaim, false, 0.1],
+    ] as const)(
+      'new subscription month %s with reason %s and first-time status %s receives %s',
+      (currentStreakMonths, welcomePromoEligibilityReason, isFirstTimeSubscriberEver, expected) => {
+        const decision = computeUsageTriggeredMonthlyBonusDecision({
+          tier: KiloPassTier.Tier19,
+          startedAtIso: '2026-10-09T00:00:00.000Z',
+          currentStreakMonths,
+          isFirstTimeSubscriberEver,
+          welcomePromoPolicy: 'settled-payment-required',
+          welcomePromoEligibilityReason,
+          issueMonth: currentStreakMonths === 1 ? '2026-10-01' : '2026-11-01',
+        });
+
+        expect(decision.bonusPercentApplied).toBeCloseTo(expected);
+        expect(decision.auditPayload).toEqual(
+          expect.objectContaining({
+            bonusKind: expected === 0.5 ? 'promo-50pct' : 'monthly-ramp',
+          })
+        );
+      }
+    );
   });
 
+  test.each([KiloPassTier.Tier19, KiloPassTier.Tier49, KiloPassTier.Tier199])(
+    'yearly %s remains at 50% across start cohorts and subscriber history',
+    tier => {
+      for (const startedAtIso of [
+        null,
+        'not-a-timestamp',
+        '2026-05-01T00:00:00Z',
+        '2026-10-09T00:00:00Z',
+      ]) {
+        for (const isFirstTimeSubscriberEver of [false, true]) {
+          for (const streakMonths of [1, 2, 3]) {
+            expect(
+              computeKiloPassBonusCreditsUsd({
+                tier,
+                cadence: KiloPassCadence.Yearly,
+                startedAtIso,
+                streakMonths,
+                isFirstTimeSubscriberEver,
+                welcomePromoPolicy: 'settled-payment-required',
+                welcomePromoEligibilityReason:
+                  KiloPassWelcomePromoEligibilityReason.FingerprintPreviouslyClaimed,
+              })
+            ).toBe(getMonthlyPriceUsd(tier) * 0.5);
+          }
+        }
+      }
+    }
+  );
+
   describe('getKiloPassWelcomePromoPolicy', () => {
     test.each([
       ['2026-05-28T12:06:19.999Z', 'account-history-only'],
diff --git a/packages/web-shared/src/lib/kilo-pass/welcome-promo-context.ts b/packages/web-shared/src/lib/kilo-pass/welcome-promo-context.ts
index f2cc4b0298d..3dd34de02f4 100644
--- a/packages/web-shared/src/lib/kilo-pass/welcome-promo-context.ts
+++ b/packages/web-shared/src/lib/kilo-pass/welcome-promo-context.ts
@@ -1,7 +1,7 @@
 import 'server-only';
 
-import { kilo_pass_issuances } from '@kilocode/db/schema';
-import { asc, eq } from 'drizzle-orm';
+import { kilo_pass_issuances, kilo_pass_subscriptions } from '@kilocode/db/schema';
+import { and, asc, eq, ne } from 'drizzle-orm';
 
 import type { DrizzleTransaction, db as defaultDb } from '@kilocode/web-shared/lib/drizzle';
 import {
@@ -54,3 +54,44 @@ export async function getInitialWelcomePromoContextForSubscription(
 
   return initialIssuance[0] ?? null;
 }
+
+export type MonthlyWelcomePromoAccountContext = {
+  isFirstTimeSubscriberEver: boolean;
+  welcomePromoPolicy: KiloPassWelcomePromoPolicy;
+  welcomePromoEligibilityReason: KiloPassWelcomePromoEligibilityReason | null;
+};
+
+export async function getMonthlyWelcomePromoAccountContext(
+  db: DbOrTx,
+  params: {
+    kiloUserId: string;
+    subscriptionId: string;
+    paymentProvider: KiloPassPaymentProvider;
+  }
+): Promise<MonthlyWelcomePromoAccountContext> {
+  const otherSubscription = await db
+    .select({ id: kilo_pass_subscriptions.id })
+    .from(kilo_pass_subscriptions)
+    .where(
+      and(
+        eq(kilo_pass_subscriptions.kilo_user_id, params.kiloUserId),
+        ne(kilo_pass_subscriptions.id, params.subscriptionId)
+      )
+    )
+    .limit(1);
+  const initialWelcomePromoContext =
+    params.paymentProvider === KiloPassPaymentProvider.Stripe
+      ? await getInitialWelcomePromoContextForSubscription(db, {
+          subscriptionId: params.subscriptionId,
+        })
+      : null;
+
+  return {
+    isFirstTimeSubscriberEver: otherSubscription.length === 0,
+    welcomePromoPolicy: getKiloPassWelcomePromoPolicy({
+      paymentProvider: params.paymentProvider,
+      initialIssuanceCreatedAt: initialWelcomePromoContext?.createdAt ?? null,
+    }),
+    welcomePromoEligibilityReason: initialWelcomePromoContext?.eligibilityReason ?? null,
+  };
+}