Sync public snapshot from freebuff-private

Source: CodebuffAI/freebuff-private@89060a6324aca505419b0e16af5336a27cce1713

Author: github-actions[bot]

bun.lock

@@ -8,7 +8,7 @@ import { FreebuffSupersededScreen } from './components/freebuff-superseded-scree
 import { LoginModal } from './components/login-modal'
 import { ProjectPickerScreen } from './components/project-picker-screen'
 import { TerminalLink } from './components/terminal-link'
-import { WaitingRoomScreen } from './components/waiting-room-screen'
+import { FreebuffLandingScreen } from './components/freebuff-landing-screen'
 import { useAuthQuery } from './hooks/use-auth-query'
 import { useAuthState } from './hooks/use-auth-state'
 import { useFreebuffSession } from './hooks/use-freebuff-session'
@@ -264,7 +264,7 @@ export const App = ({
   }
 
   // Render project picker FIRST when at home directory or outside a project.
-  // This deliberately precedes the login/auth and waiting-room gates so the
+  // This deliberately precedes the login/auth and free-session gates so the
   // user always gets to pick a working directory before anything else — auth
   // failures or a banned freebuff session would otherwise replace the
   // picker mid-flash and look like being kicked out of the app.
@@ -343,7 +343,7 @@ interface AuthedSurfaceProps {
 }
 
 /**
- * Rendered only after auth is confirmed. Owns the freebuff waiting-room gate
+ * Rendered only after auth is confirmed. Owns the freebuff session gate
  * so `useFreebuffSession` runs exactly once per authed session (not before
  * we have a token).
  */
@@ -397,12 +397,12 @@ const AuthedSurface = ({
       session.status === 'rate_limited' ||
       session.status === 'takeover_prompt')
   ) {
-    return <WaitingRoomScreen session={session} error={sessionError} />
+    return <FreebuffLandingScreen session={session} error={sessionError} />
   }
 
   // Chat history renders inside AuthedSurface so the freebuff session stays
   // mounted while the user browses history. Unmounting this surface would
-  // DELETE the session row and drop the user back into the waiting room on
+  // DELETE the session row and drop the user back onto the landing screen on
   // return.
   if (showChatHistory) {
     return (

cli/src/app.tsx

@@ -577,8 +577,8 @@ const ALL_COMMANDS: CommandDefinition[] = [
   }),
   // /end-session (freebuff-only) — end the active session early and drop back
   // to the model picker. The hook flips status to 'none', which unmounts
-  // <Chat> and mounts <WaitingRoomScreen> on the landing view, where the
-  // user picks a model and hits Enter to rejoin the queue.
+  // <Chat> and mounts <FreebuffLandingScreen>, where the user picks a model
+  // and hits Enter to start a new session.
   defineCommand({
     name: 'end-session',
     aliases: ['model'],

cli/src/commands/command-registry.ts

@@ -64,7 +64,7 @@ function columnWidths(count: number, availableWidth: number): number[] {
 
 /**
  * A single ad card. Used full-width by {@link SingleAdBanner} (chat) and in a
- * row of columns by {@link ChoiceAdBanner} (waiting room). Manages its own
+ * row of columns by {@link ChoiceAdBanner} (landing screen). Manages its own
  * hover state so each card highlights independently.
  */
 const AdCard: React.FC<{
@@ -162,8 +162,8 @@ export const SingleAdBanner: React.FC<{
 }
 
 /**
- * Up to four ads shown in a row. Still used by the freebuff waiting room, which
- * intentionally fills the space with multiple ads.
+ * Up to four ads shown in a row. Still used by the freebuff landing screen,
+ * which intentionally fills the space with multiple ads.
  */
 export const ChoiceAdBanner: React.FC<ChoiceAdBannerProps> = ({
   ads,

cli/src/components/ad-banner.tsx

@@ -48,7 +48,7 @@ import type { FreebuffSessionResponse } from '../types/freebuff-session'
 import type { FreebuffIpPrivacySignal } from '@codebuff/common/types/freebuff-session'
 import type { KeyEvent } from '@opentui/core'
 
-interface WaitingRoomScreenProps {
+interface FreebuffLandingScreenProps {
   session: FreebuffSessionResponse | null
   error: string | null
 }
@@ -302,7 +302,7 @@ const StreakInlineLine: React.FC<{
   )
 }
 
-export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
+export const FreebuffLandingScreen: React.FC<FreebuffLandingScreenProps> = ({
   session,
   error,
 }) => {
@@ -368,14 +368,16 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
     maxHeight: logoMode === 'full' ? undefined : 1,
   })
 
-  // Always enable ads in the waiting room — this is where monetization lives.
+  // Always enable ads on the landing screen — this is where monetization lives.
   // forceStart bypasses the "wait for first user message" gate inside the hook,
   // which would otherwise block ads here since no conversation exists yet.
   // The server tries Gravity first, then falls back to ZeroClick and Carbon.
   const { ads, recordClick, recordImpression } = useGravityAd({
     enabled: true,
     forceStart: true,
     provider: 'gravity',
+    // Legacy wire name for this surface — the ads API maps it to placements,
+    // so it must not change with the component rename.
     surface: 'waiting_room',
   })
 
@@ -391,7 +393,7 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
     accessTier === 'limited' && !compact ? getLimitedModeNotice(session) : null
   // 'none' = user hasn't started a session yet. We're in the pre-chat landing
   // state: show the picker with a prompt. Picking a model triggers
-  // joinFreebuffQueue, which POSTs and transitions straight to 'active' (chat).
+  // startFreebuffSession, which POSTs and transitions straight to 'active' (chat).
   const isLanding = session?.status === 'none'
   const streakQuery = useFreebuffStreakQuery({
     enabled: FREEBUFF_ENABLE_STREAK_IN_UI && isLanding,
@@ -799,7 +801,7 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
       </box>
 
       {/* Reserve the ad banner slot before the async ad fetch resolves so the
-          waiting-room content does not jump when the banner fills. On very
+          landing content does not jump when the banner fills. On very
           short terminals the banner is dropped entirely to give the picker
           back its 5 rows. */}
       {showAds && (

…i/src/components/waiting-room-screen.tsx …c/components/freebuff-landing-screen.tsxcli/src/components/waiting-room-screen.tsx renamed to cli/src/components/freebuff-landing-screen.tsx cli/src/components/waiting-room-screen.tsx renamed to cli/src/components/freebuff-landing-screen.tsx

@@ -22,7 +22,7 @@ import {
 } from '@codebuff/common/constants/freebuff-models'
 import { getRateLimitsByModel } from '@codebuff/common/types/freebuff-session'
 
-import { joinFreebuffQueue } from '../hooks/use-freebuff-session'
+import { startFreebuffSession } from '../hooks/use-freebuff-session'
 import { useNow } from '../hooks/use-now'
 import { useFreebuffLandingFocusStore } from '../state/freebuff-landing-focus-store'
 import { useFreebuffModelStore } from '../state/freebuff-model-store'
@@ -106,7 +106,7 @@ interface FreebuffModelSelectorProps {
    *  this, the list scrolls (scrollbar shown, focused row kept in view);
    *  otherwise the scrollbox shrinks to fit and no scrollbar appears. */
   maxHeight: number
-  /** Notifies the parent whenever the picker expands/collapses. The waiting-room
+  /** Notifies the parent whenever the picker expands/collapses. The landing
    *  screen uses it to promote the wordmark to the full ASCII logo while the
    *  picker is collapsed (the freed rows make room). */
   onExpandedChange?: (expanded: boolean) => void
@@ -118,7 +118,7 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
 }) => {
   const theme = useTheme()
   // contentMaxWidth (not terminalWidth) is the real budget — the parent
-  // waiting-room screen wraps this picker in a `maxWidth: contentMaxWidth`
+  // landing screen wraps this picker in a `maxWidth: contentMaxWidth`
   // box (capped at 80 cols), so a wide terminal doesn't actually let us
   // sprawl the buttons across it.
   const { contentMaxWidth } = useTerminalDimensions()
@@ -164,7 +164,7 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
   const [expanded, setExpanded] = useState(
     () => !canCollapse || !isLanding || selectedModel !== recommendedModel.id,
   )
-  // Mirror the expanded state up to the waiting-room screen (collapsed → it
+  // Mirror the expanded state up to the landing screen (collapsed → it
   // promotes the wordmark to the full ASCII logo). useLayoutEffect so the
   // parent's logo decision settles before paint, both on mount and on toggle.
   useLayoutEffect(() => {
@@ -463,7 +463,7 @@ export const FreebuffModelSelector: React.FC<FreebuffModelSelectorProps> = ({
       if (modelId === committedModelId) return
       if (!isJoinable(modelId)) return
       setPending(modelId)
-      joinFreebuffQueue(modelId).finally(() => setPending(null))
+      startFreebuffSession(modelId).finally(() => setPending(null))
     },
     [pending, committedModelId, isJoinable],
   )

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

@@ -11,7 +11,7 @@ import { REFERRAL_CLI_DAILY_SESSION_BONUS_CAP } from '@codebuff/common/constants
 import { getReferralInfo } from '@codebuff/common/types/freebuff-session'
 import { pluralize } from '@codebuff/common/util/string'
 
-import { joinFreebuffQueue } from '../hooks/use-freebuff-session'
+import { startFreebuffSession } from '../hooks/use-freebuff-session'
 import { useNow } from '../hooks/use-now'
 import { useFreebuffLandingFocusStore } from '../state/freebuff-landing-focus-store'
 import { useFreebuffSessionStore } from '../state/freebuff-session-store'
@@ -96,7 +96,7 @@ const CopyInviteLinkButton: React.FC<{
 }
 
 /**
- * Advertises the "invite friends" reward on the waiting-room model screen. The
+ * Advertises the "invite friends" reward on the landing model screen. The
  * reward — and the presentation — depends on the session's access tier:
  *
  *   - LIMITED tier: referrals earn a daily free-session bonus (not GLM). One
@@ -132,7 +132,7 @@ export const FreebuffReferralBanner: React.FC = () => {
   const useGlm = useCallback(() => {
     setJoining((wasJoining) => {
       if (wasJoining) return wasJoining
-      joinFreebuffQueue(FREEBUFF_GLM_V52_MODEL_ID).finally(() =>
+      startFreebuffSession(FREEBUFF_GLM_V52_MODEL_ID).finally(() =>
         setJoining(false),
       )
       return true

cli/src/components/freebuff-referral-banner.tsx

@@ -33,7 +33,7 @@ export const SessionEndedBanner: React.FC<SessionEndedBannerProps> = ({
 }) => {
   const theme = useTheme()
   const [pendingAction, setPendingAction] = useState<
-    'waiting-room' | 'same-chat' | null
+    'landing' | 'same-chat' | null
   >(null)
 
   // All premium models share one daily pool; the server replicates the same
@@ -62,10 +62,10 @@ export const SessionEndedBanner: React.FC<SessionEndedBannerProps> = ({
   const canRestart = !isStreaming && pendingAction === null
   const pickNewModel = useCallback(() => {
     if (!canRestart) return
-    setPendingAction('waiting-room')
+    setPendingAction('landing')
     // Drop back to the landing picker (status: 'none') so the user picks a
-    // model and hits Enter again to commit, instead of being silently
-    // re-queued. app.tsx swaps us into <WaitingRoomScreen> on the
+    // model and hits Enter again to commit, instead of silently starting a
+    // new session. app.tsx swaps us into <FreebuffLandingScreen> on the
     // transition, unmounting this banner — no need to clear the pending state on
     // success.
     returnToFreebuffLanding({ resetChat: true }).catch(() =>
@@ -153,7 +153,7 @@ export const SessionEndedBanner: React.FC<SessionEndedBannerProps> = ({
             style={{
               borderStyle: 'single',
               borderColor:
-                pendingAction === 'waiting-room' ? theme.muted : theme.border,
+                pendingAction === 'landing' ? theme.muted : theme.border,
               customBorderChars: BORDER_CHARS,
               paddingLeft: 1,
               paddingRight: 1,
@@ -163,12 +163,12 @@ export const SessionEndedBanner: React.FC<SessionEndedBannerProps> = ({
             <text
               style={{
                 fg:
-                  pendingAction === 'waiting-room'
+                  pendingAction === 'landing'
                     ? theme.muted
                     : theme.foreground,
               }}
             >
-              {pendingAction === 'waiting-room' ? (
+              {pendingAction === 'landing' ? (
                 landingPendingLabel
               ) : (
                 <>

cli/src/components/session-ended-banner.tsx

@@ -552,9 +552,9 @@ export const handleRunError = (params: {
 }
 
 /**
- * Surface + recover from a waiting-room gate rejection. The server rejected
- * the request because our seat is no longer valid; update local state so the
- * UI reflects reality and we stop sending requests until we re-admit.
+ * Surface + recover from a session gate rejection. The server rejected
+ * the request because our session is no longer valid; update local state so
+ * the UI reflects reality and we stop sending requests until we re-admit.
  */
 function handleFreebuffGateError(
   kind: ReturnType<typeof getFreebuffGateErrorKind>,

cli/src/hooks/helpers/send-message.ts

@@ -341,18 +341,18 @@ export function refreshFreebuffLandingMetadata(): Promise<void> {
 }
 
 /**
- * Join (or re-queue for) `model`. Dual-purpose:
- *   - First join: called from the pre-chat landing picker. The session starts
+ * Start a session on `model` (admitted immediately server-side). Dual-purpose:
+ *   - First start: called from the pre-chat landing picker. The session starts
  *     at `none` (GET-only); this is the user's explicit commitment to enter.
- *   - Switch: called when the user picks a different model from within the
- *     waiting room. Server moves them to the back of the new model's queue.
+ *   - Switch: called when the user picks a different model from the landing
+ *     screen. The server admits them on the new model right away.
  *
  * If the server has already admitted them on a different model, it responds
  * with `model_locked`; the tick loop silently reverts the local selection to
  * the locked model so the active session stays intact. Users who really want
  * to switch can /end-session deliberately.
  */
-export function joinFreebuffQueue(model: string): Promise<void> {
+export function startFreebuffSession(model: string): Promise<void> {
   if (!IS_FREEBUFF) return Promise.resolve()
   // This is the only explicit user-pick path (called from the picker on
   // click / Enter), so persistence belongs here — and ONLY here. Server-
@@ -395,7 +395,7 @@ export function markFreebuffSessionSuperseded(): void {
  *  Used when the chat-completions gate rejects on country even though the
  *  session-level country check did not catch the request first.
  *  Transitioning the session state here unmounts the Chat surface in favor of
- *  the waiting-room's country_blocked message, so the user can't keep typing
+ *  the landing screen's country_blocked message, so the user can't keep typing
  *  and sending doomed requests. */
 export function markFreebuffSessionCountryBlocked(params: {
   countryCode: string
@@ -405,8 +405,8 @@ export function markFreebuffSessionCountryBlocked(params: {
   if (!IS_FREEBUFF) return
   controller?.abort()
   controller?.apply({ status: 'country_blocked', ...params })
-  // Best-effort DELETE so we don't hold a waiting-room seat on a session the
-  // server is already refusing to serve at chat time.
+  // Best-effort DELETE so we don't hold a session row the server is already
+  // refusing to serve at chat time.
   releaseFreebuffSlot().catch(() => {})
 }
 
@@ -435,7 +435,7 @@ interface UseFreebuffSessionResult {
 /**
  * Manages the freebuff session lifecycle:
  *   - GET on mount to probe state (no auto-join; the user picks a model in
- *     the landing screen, which calls joinFreebuffQueue)
+ *     the landing screen, which calls startFreebuffSession)
  *   - if the probe sees an existing seat, auto-takes-over when the prior
  *     local owner process is gone; otherwise asks before POSTing to rotate
  *     the instance id so any other CLI on the same account is superseded
@@ -525,7 +525,7 @@ export function useFreebuffSession(): UseFreebuffSessionResult {
         // need another POST.
         nextMethod = 'GET'
 
-        // Race recovery: user picked a different model in the waiting room at
+        // Race recovery: user picked a different model on the landing screen at
         // the exact moment the server admitted them with the original model.
         // Silently revert the local selection and re-tick so the next call
         // (a GET) lands the actual active session. Users who really want to
@@ -579,15 +579,15 @@ export function useFreebuffSession(): UseFreebuffSessionResult {
 
         // Bell on admission: the user committed to a model on the landing
         // screen (status 'none'), which POSTs and lands them straight on an
-        // active session now that there's no waiting room.
+        // active session (admission is immediate).
         if (previousStatus === 'none' && next.status === 'active') {
           playAdmissionSound()
         }
 
         // active|ended → none means we've passed the server's hard cutoff.
         // Synthesize a no-instanceId ended state so the chat surface stays
         // mounted with the Enter-to-rejoin banner instead of looping back
-        // through the waiting room. Carry forward whichever rate-limit
+        // through the landing screen. Carry forward whichever rate-limit
         // snapshot we have — preferring the fresh `none` snapshot, falling
         // back to whatever was on the prior active/ended row — so the
         // banner's "N of M used today" line stays populated.
@@ -642,7 +642,7 @@ export function useFreebuffSession(): UseFreebuffSessionResult {
           // prevent. But the picker still needs live quota snapshots, so kick
           // off a fire-and-forget GET and extract only picker metadata from
           // the response, ignoring whatever status it claims. Polling resumes
-          // when the user commits to a model via joinFreebuffQueue.
+          // when the user commits to a model via startFreebuffSession.
           const landingSession = toLandingSession(
             useFreebuffSessionStore.getState().session,
           )