Sync public snapshot from freebuff-private

Source: CodebuffAI/freebuff-private@609ea6ace699cd3fbf5beb7693e28c5c54ebd1a1

Author: github-actions[bot]

cli/src/components/__tests__/freebuff-model-selector.test.tsx

@@ -109,11 +109,11 @@ const renderSelector = async (
 }
 
 test.each([
-  ['2026-09-17T23:00:00Z', '2026-09-19T06:00:00Z', 10, 15, 'Off-peak 10/hr', 0],
-  ['2026-09-17T21:00:00Z', '2026-09-18T22:00:00Z', 15, 10, 'normally 15/hr', 0],
-  ['2026-09-17T23:00:00Z', '2026-09-19T06:00:00Z', 10, 15, 'Off-peak 10/hr', 10],
-  ['2026-09-17T21:00:00Z', '2026-09-18T22:00:00Z', 15, 10, 'normally 15/hr', 10],
-] as const)('the mounted CLI picker catches up after multi-day sleep from %s', async (issued, resumed, before, after, explanation, discount) => {
+  ['2026-09-17T23:00:00Z', '2026-09-19T06:00:00Z', 10, 15, 0],
+  ['2026-09-17T21:00:00Z', '2026-09-18T22:00:00Z', 15, 10, 0],
+  ['2026-09-17T23:00:00Z', '2026-09-19T06:00:00Z', 10, 15, 10],
+  ['2026-09-17T21:00:00Z', '2026-09-18T22:00:00Z', 15, 10, 10],
+] as const)('the mounted CLI picker catches up after multi-day sleep from %s', async (issued, resumed, before, after, discount) => {
   const now = Date.parse(issued)
   const clock = spyOn(Date, 'now').mockReturnValue(now)
   const realTimeout = globalThis.setTimeout
@@ -135,17 +135,19 @@ test.each([
     })
     useFreebuffModelStore.getState().setSelectedModel(id)
     const setup = await renderSelector(40, undefined, 100, now)
-    expect(setup.captureCharFrame()).toContain(`│ ${before - discount} Freebucks/hr`)
-    expect(setup.captureCharFrame()).toContain(before === 10 ? 'normally 15/hr' : 'Off-peak 10/hr')
+    expect(setup.captureCharFrame()).toMatch(new RegExp(`│ +${before - discount} Freebucks/hr`))
+    expect(setup.captureCharFrame()).not.toContain('Off-peak')
+    expect(setup.captureCharFrame()).not.toContain('normally 15/hr')
     expect(setup.captureCharFrame()).not.toContain('Server fallback price notice')
     expect(wake).toBeDefined()
     flushSync(() => {
       clock.mockReturnValue(Date.parse(resumed))
       wake!()
     })
     await setup.renderOnce()
-    expect(setup.captureCharFrame()).toContain(`│ ${after - discount} Freebucks/hr`)
-    expect(setup.captureCharFrame()).toContain(explanation)
+    expect(setup.captureCharFrame()).toMatch(new RegExp(`│ +${after - discount} Freebucks/hr`))
+    expect(setup.captureCharFrame()).not.toContain('Off-peak')
+    expect(setup.captureCharFrame()).not.toContain('normally 15/hr')
   } finally {
     cleanupRenderer?.()
     cleanupRenderer = undefined
@@ -154,6 +156,42 @@ test.each([
   }
 })
 
+test.each([
+  ['priceNotices', 40],
+  ['priceNotices', 100],
+  ['peak', 40],
+  ['peak', 100],
+] as const)('legacy %s copy stays hidden at %s columns while Flash remains selectable', async (payload, width) => {
+  const id = FREEBUFF_DEEPSEEK_V4_FLASH_MODEL_ID
+  const price = payload === 'peak' ? 25 : 10
+  useFreebuffSessionStore.getState().setSession({
+    status: 'none',
+    accessTier: 'full',
+    freebucks: {
+      ...freebucksFixture(25, { [id]: price }),
+      priceNotices: { [id]: 'Off-peak pricing · 15 Freebucks/hour at peak' },
+      ...(payload === 'peak' ? {
+        peak: {
+          modelIds: [id],
+          surcharge: 10,
+          endsAt: new Date(FIXED_NOW_MS + 3_600_000).toISOString(),
+        },
+      } : {}),
+    },
+  })
+  useFreebuffModelStore.getState().setSelectedModel(id)
+  const requested: string[] = []
+  const setup = await renderSelector(40, async (model) => { requested.push(model) }, width)
+  const frame = setup.captureCharFrame()
+  expect(frame).toContain('› DeepSeek V4.1 Flash')
+  expect(frame).toContain('Smart &')
+  expect(frame).toMatch(new RegExp(`│ +${price} Freebucks/hr`))
+  expect(frame).not.toMatch(/Off-peak|Peak pricing|charges double|Freebucks\/hour at peak/)
+  flushSync(() => setup.mockInput.pressEnter())
+  await setup.renderOnce()
+  expect(requested).toEqual([id])
+})
+
 /**
  * LIMITED tier, which since 2026-08-31 is the only tier where the reward is a
  * MODEL you can select. At full access the reward is an extra premium session
@@ -928,7 +966,7 @@ describe('GLM selection uses the applicable meter', () => {
   )
 
   test.each([true, false])(
-    'an available first-tab discount shows only the discounted price and is named limited-time, available=%s',
+    'first-tab discount availability changes the displayed price without extra copy, available=%s',
     async (available) => {
       useFreebuffSessionStore.getState().setSession({
         status: 'none',
@@ -950,14 +988,14 @@ describe('GLM selection uses the applicable meter', () => {
         expect(frame).toContain('5 Freebucks/hr')
         expect(frame).not.toContain('15 5 Freebucks/hr')
         expect(frame).not.toContain('15 Freebucks/hr')
-        expect(frame).toContain('Limited-time first-tab discount')
       } else {
         // In use elsewhere: the full price is the price, nothing struck, and
         // nothing advertised.
         expect(frame).toContain('15 Freebucks/hr')
         expect(frame).not.toContain('15 15 Freebucks/hr')
-        expect(frame).not.toContain('first-tab discount')
       }
+      expect(frame).not.toContain('first-tab discount')
+      expect(frame).not.toContain('Prices shown include the discount')
     },
   )
 
@@ -1142,6 +1180,34 @@ describe('a row the balance cannot cover', () => {
     }
   })
 
+  test('a pending paywall clears without discount prose when the balance refresh makes the row affordable', async () => {
+    const { setup, requested } = await renderUnaffordableLuna()
+    flushSync(() => setup.mockInput.pressEnter())
+    await setup.renderOnce()
+    expect(setup.captureCharFrame()).toContain(`Not enough ${FREEBUCKS_LABEL}`)
+    expect(requested).toEqual([])
+
+    flushSync(() => useFreebuffSessionStore.getState().setSession({
+      status: 'none',
+      accessTier: 'full',
+      freebucks: applyFirstTabDiscount(freebucksFixture(25, {
+        [FREEBUFF_GPT_5_6_LUNA_MODEL_ID]: 20,
+        [FREEBUFF_MIMO_V25_MODEL_ID]: 10,
+      }), { amount: 10, available: true }),
+    }))
+    await setup.renderOnce()
+    const frame = setup.captureCharFrame()
+    expect(frame).toContain('› GPT-5.6 Luna')
+    expect(frame).toMatch(/│ +10 Freebucks\/hr/)
+    expect(frame).not.toContain(`Not enough ${FREEBUCKS_LABEL}`)
+    expect(frame).not.toMatch(/first-tab discount|Prices shown include the discount/)
+    expect(requested).toEqual([])
+
+    flushSync(() => setup.mockInput.pressEnter())
+    await setup.renderOnce()
+    expect(requested).toEqual([FREEBUFF_GPT_5_6_LUNA_MODEL_ID])
+  })
+
   test('a row closed for the hour stays inert — no wall to raise', async () => {
     useFreebuffSessionStore.getState().setSession({
       status: 'none',

cli/src/components/freebuff-model-selector.tsx

@@ -1,13 +1,6 @@
-import {
-  freebucksPeakCopy,
-  isFreebucksPeakModel,
-} from '@codebuff/common/util/freebuff-peak-price'
+import { isFreebucksPeakModel } from '@codebuff/common/util/freebuff-peak-price'
 import { watchFreebucksPriceChanges } from '@codebuff/common/util/freebuff-price-changes'
-import { freebucksOffPeakCopy } from '@codebuff/common/util/freebuff-off-peak-price'
-import {
-  firstTabDiscountCopy,
-  firstTabListPriceFor,
-} from '@codebuff/common/util/freebuff-first-tab-discount'
+import { firstTabListPriceFor } from '@codebuff/common/util/freebuff-first-tab-discount'
 import { TextAttributes } from '@opentui/core'
 import { useKeyboard } from '@opentui/react'
 import React, {
@@ -38,6 +31,7 @@ const FREEBUCKS_PLANS_URL = 'https://freebuff.com/plans'
 
 import { FreebuffReferralBanner } from './freebuff-referral-banner'
 import {
+  FREEBUFF_DEEPSEEK_V4_FLASH_MODEL_ID,
   FREEBUFF_REWARD_MODEL_ID,
   getFreebuffDeploymentAvailabilityLabel,
   getFreebuffModelUnavailableLabel,
@@ -356,6 +350,7 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
   )
   const taglineFor = useCallback(
     (model: FreebuffModelOption) =>
+      model.id === FREEBUFF_DEEPSEEK_V4_FLASH_MODEL_ID ||
       isFreebucksPeakModel(freebucks, model.id) || freebucks?.offPeak?.[model.id]
         ? model.tagline
         : (freebucks?.priceNotices?.[model.id] ?? model.tagline),
@@ -450,41 +445,18 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
       // the balance cannot cover it — the same signal the dimmed price carries
       // on the other two surfaces.
       const rowPrice = freebucksPriceFor(freebucks, model.id)
-      const offPeakCopy = freebucksOffPeakCopy(freebucks, model.id, { now: nowMs ?? Date.now() })
       if (rowPrice !== undefined) {
         // Only the price that will be charged. The regular price is NOT
         // shown beside it: many terminals ignore the strikethrough attribute,
         // and "10 0 Freebucks/hr" then reads as two prices. A row the
-        // first-tab offer moved is drawn in the accent colour instead, next to
-        // the "Limited-time first-tab discount" chip that says why.
+        // first-tab offer moved is drawn in the accent colour instead.
         details.push({
           text: freebucksPriceLabel(rowPrice),
           warn: (freebucks?.balance ?? 0) < rowPrice,
           highlight: firstTabListPriceFor(freebucks, model.id) !== undefined,
         })
-        if (offPeakCopy) details.push({ text: offPeakCopy.detail, warn: false })
-        if (freebucks?.firstTabDiscount?.available) {
-          // A promotion, not a price: named as one so nobody plans around a
-          // row that will one day cost its regular price again.
-          details.push({ text: 'Limited-time first-tab discount', warn: false })
-        }
       }
       if (model.warning) details.push({ text: model.warning, warn: true })
-      // PEAK PRICING as its own detail chip, in the reader's zone. Line 1
-      // keeps the row's tagline (the server's prose notice is the same fact
-      // and is dropped for a peaked row, see taglineFor); the price above
-      // already moved, and this is the why and the when.
-      if (freebucks?.peak && isFreebucksPeakModel(freebucks, model.id)) {
-        const base = (rowPrice ?? 0) - freebucks.peak.surcharge
-        details.push({
-          text: freebucksPeakCopy({
-            peak: freebucks.peak,
-            basePrice: base,
-            now,
-          }).tooltip,
-          warn: true,
-        })
-      }
       if (model.availability === 'deployment_hours') {
         // Carries both the in-hours and out-of-hours signal, so a row with
         // hours never also needs the closed note below.
@@ -520,7 +492,6 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
     [
       deploymentAvailabilityLabel,
       now,
-      nowMs,
       premiumSectionQuotas,
       meterFor,
       freebucks,
@@ -690,7 +661,7 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
               intent.price,
             )}. Enter to confirm.`
       }
-      return freebucks ? firstTabDiscountCopy(freebucks) : undefined
+      return undefined
     },
     [pendingAsk, rowIntent, freebucks, activeSessionModel, upgradeOfferFor],
   )

common/src/util/freebuff-off-peak-price.ts

@@ -7,7 +7,7 @@ import { discountedSessionPrice } from './freebuff-first-tab-discount'
 import { offPeakPriceAt } from './freebuff-price-changes'
 
 /** Presentation only: prices and schedules come from the server, never the
- *  private rate card (this helper also ships in the public CLI). */
+ *  private rate card. */
 export function freebucksOffPeakCopy(
   info:
     | Pick<FreebuffFreebucksInfo, 'prices' | 'offPeak' | 'firstTabDiscount'>
@@ -39,10 +39,6 @@ export function freebucksOffPeakCopy(
   return {
     active,
     badge: 'Off-peak',
-    // Terminals have no hover: show a concise explanation inline.
-    detail: active
-      ? `Off-peak · normally ${offer.regularPrice}/hr · until ${fmt.format(end)} ${endZone}`
-      : `Off-peak ${offer.price}/hr · ${hours}`,
     tooltip: `Off-peak: ${offer.price} Freebucks/hour, daily ${hours}.`,
   }
 }