Simplify freebuff waiting-room implementation

Collapse client-side draining/ended into a single ended state, move freebuff
session state into zustand (replacing the module-level handle singleton),
host the Fireworks probe inside admitFromQueue, and share the wire types
between server and CLI. Drops ~150 lines net.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: jahooma

cli/src/app.tsx

@@ -376,9 +376,9 @@ const AuthedSurface = ({
   // Falling through to <Chat> on 'none' would leave the user unable to send
   // any free-mode request until the next poll cycle.
   //
-  // 'draining' and 'ended' deliberately fall through to <Chat>: the agent
-  // may still be finishing work under the server-side grace period, and the
-  // chat surface itself swaps the input box for the session-ended banner.
+  // 'ended' deliberately falls through to <Chat>: the agent may still be
+  // finishing work under the server-side grace period, and the chat surface
+  // itself swaps the input box for the session-ended banner.
   if (
     IS_FREEBUFF &&
     (session === null ||

cli/src/chat.tsx

@@ -1344,9 +1344,7 @@ export const Chat = ({
   const hasActiveFreebuffSession =
     IS_FREEBUFF && freebuffSession?.status === 'active'
   const isFreebuffSessionOver =
-    IS_FREEBUFF &&
-    (freebuffSession?.status === 'draining' ||
-      freebuffSession?.status === 'ended')
+    IS_FREEBUFF && freebuffSession?.status === 'ended'
   const shouldShowStatusLine =
     !feedbackMode &&
     (hasStatusIndicatorContent ||

cli/src/components/freebuff-superseded-screen.tsx

@@ -5,15 +5,11 @@ import React, { useCallback } from 'react'
 import { useLogo } from '../hooks/use-logo'
 import { useTerminalDimensions } from '../hooks/use-terminal-dimensions'
 import { useTheme } from '../hooks/use-theme'
-import { flushAnalytics } from '../utils/analytics'
-import { withTimeout } from '../utils/terminal-color-detection'
+import { exitFreebuffCleanly } from '../utils/freebuff-exit'
 import { getLogoAccentColor, getLogoBlockColor } from '../utils/theme-system'
 
 import type { KeyEvent } from '@opentui/core'
 
-/** Cap on analytics flush so a slow network doesn't block process exit. */
-const EXIT_CLEANUP_TIMEOUT_MS = 1000
-
 /**
  * Terminal state shown after a 409 session_superseded response. Another CLI on
  * the same account rotated our instance id and we've stopped polling — the
@@ -31,17 +27,12 @@ export const FreebuffSupersededScreen: React.FC = () => {
   })
 
   // Ctrl+C exits. Stdin is in raw mode, so SIGINT never fires — the key comes
-  // through as a normal OpenTUI key event. No DELETE needed here: the other
-  // CLI already rotated our instance id, so our seat (if any) belongs to them.
+  // through as a normal OpenTUI key event.
   useKeyboard(
     useCallback((key: KeyEvent) => {
       if (key.ctrl && key.name === 'c') {
         key.preventDefault?.()
-        withTimeout(flushAnalytics(), EXIT_CLEANUP_TIMEOUT_MS, undefined).finally(
-          () => {
-            process.exit(0)
-          },
-        )
+        exitFreebuffCleanly()
       }
     }, []),
   )

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

@@ -3,9 +3,8 @@ import { useKeyboard } from '@opentui/react'
 import React, { useCallback, useState } from 'react'
 
 import { Button } from './button'
-import { refreshFreebuffSession } from '../hooks/use-freebuff-session'
+import { rejoinFreebuffSession } from '../hooks/use-freebuff-session'
 import { useTheme } from '../hooks/use-theme'
-import { useChatStore } from '../state/chat-store'
 import { BORDER_CHARS } from '../utils/ui-constants'
 
 import type { KeyEvent } from '@opentui/core'
@@ -18,10 +17,9 @@ interface SessionEndedBannerProps {
 }
 
 /**
- * Replaces the chat input when the freebuff session has ended (client state
- * `draining` or `ended`). Captures Enter to re-queue the user; Esc keeps
- * falling through to the global stream-interrupt handler so in-flight work
- * can be cancelled.
+ * Replaces the chat input when the freebuff session has ended. Captures
+ * Enter to re-queue the user; Esc keeps falling through to the global
+ * stream-interrupt handler so in-flight work can be cancelled.
  */
 export const SessionEndedBanner: React.FC<SessionEndedBannerProps> = ({
   isStreaming,
@@ -40,13 +38,7 @@ export const SessionEndedBanner: React.FC<SessionEndedBannerProps> = ({
     // Once the POST lands, the hook flips status to 'queued' and app.tsx
     // swaps us into <WaitingRoomScreen>, unmounting this banner. No need to
     // clear `rejoining` on success — the component will be gone.
-    refreshFreebuffSession()
-      .then(() => {
-        // Wipe the prior conversation so the next admitted session starts
-        // with empty history instead of continuing the one that just ended.
-        useChatStore.getState().reset()
-      })
-      .catch(() => setRejoining(false))
+    rejoinFreebuffSession().catch(() => setRejoining(false))
   }, [canRejoin])
 
   useKeyboard(

cli/src/components/waiting-room-screen.tsx

@@ -6,23 +6,17 @@ import { AdBanner } from './ad-banner'
 import { Button } from './button'
 import { ChoiceAdBanner } from './choice-ad-banner'
 import { ShimmerText } from './shimmer-text'
-import { endFreebuffSessionBestEffort } from '../hooks/use-freebuff-session'
 import { useGravityAd } from '../hooks/use-gravity-ad'
 import { useLogo } from '../hooks/use-logo'
 import { useSheenAnimation } from '../hooks/use-sheen-animation'
 import { useTerminalDimensions } from '../hooks/use-terminal-dimensions'
 import { useTheme } from '../hooks/use-theme'
-import { flushAnalytics } from '../utils/analytics'
-import { withTimeout } from '../utils/terminal-color-detection'
+import { exitFreebuffCleanly } from '../utils/freebuff-exit'
 import { getLogoAccentColor, getLogoBlockColor } from '../utils/theme-system'
 
 import type { FreebuffSessionResponse } from '../types/freebuff-session'
 import type { KeyEvent } from '@opentui/core'
 
-/** Cap on exit cleanup (DELETE /session + flushAnalytics) so a slow network
- *  doesn't block process exit. */
-const EXIT_CLEANUP_TIMEOUT_MS = 1000
-
 interface WaitingRoomScreenProps {
   session: FreebuffSessionResponse | null
   error: string | null
@@ -82,30 +76,15 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
     forceStart: true,
   })
 
-  // Release the seat + flush analytics before exit. Used by both Ctrl+C and
-  // the top-right X button so they always do the same cleanup.
-  const handleExit = useCallback(() => {
-    const cleanup = Promise.allSettled([
-      flushAnalytics(),
-      endFreebuffSessionBestEffort(),
-    ])
-    withTimeout(cleanup, EXIT_CLEANUP_TIMEOUT_MS, undefined).finally(() => {
-      process.exit(0)
-    })
-  }, [])
-
   // Ctrl+C exits. Stdin is in raw mode, so SIGINT never fires — the key comes
-  // through as a normal OpenTUI key event.
+  // through as a normal OpenTUI key event. Shared with the top-right X button.
   useKeyboard(
-    useCallback(
-      (key: KeyEvent) => {
-        if (key.ctrl && key.name === 'c') {
-          key.preventDefault?.()
-          handleExit()
-        }
-      },
-      [handleExit],
-    ),
+    useCallback((key: KeyEvent) => {
+      if (key.ctrl && key.name === 'c') {
+        key.preventDefault?.()
+        exitFreebuffCleanly()
+      }
+    }, []),
   )
 
   const [exitHover, setExitHover] = useState(false)
@@ -148,7 +127,7 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
         }}
       >
         <Button
-          onClick={handleExit}
+          onClick={exitFreebuffCleanly}
           onMouseOver={() => setExitHover(true)}
           onMouseOut={() => setExitHover(false)}
           style={{ paddingLeft: 1, paddingRight: 1 }}
@@ -201,7 +180,9 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
           {isQueued && session && (
             <>
               <text style={{ fg: theme.foreground, marginBottom: 1 }}>
-                You're in the waiting room
+                {session.position === 1
+                  ? "You're next in line"
+                  : "You're in the waiting room"}
               </text>
 
               <box
@@ -211,34 +192,25 @@ export const WaitingRoomScreen: React.FC<WaitingRoomScreenProps> = ({
                   gap: 0,
                 }}
               >
-                {session.position === 1 ? (
-                  <>
-                    <text style={{ fg: theme.primary, alignSelf: 'flex-start' }}>
-                      <ShimmerText text="Next in line" />
-                    </text>
-                    <text style={{ fg: theme.muted, alignSelf: 'flex-start' }}>
-                      {session.queueDepth === 1
-                        ? 'just you in line right now'
-                        : `${session.queueDepth} people in line`}
-                    </text>
-                  </>
-                ) : (
-                  <text style={{ fg: theme.foreground, alignSelf: 'flex-start' }}>
-                    <span fg={theme.muted}>Position </span>
-                    <span fg={theme.primary} attributes={TextAttributes.BOLD}>
-                      {session.position}
-                    </span>
-                    <span fg={theme.muted}> / {session.queueDepth}</span>
-                  </text>
-                )}
-                {session.position !== 1 && (
-                  <text style={{ fg: theme.foreground, alignSelf: 'flex-start' }}>
-                    <span fg={theme.muted}>Wait     </span>
-                    <span fg={theme.primary}>
-                      <ShimmerText text={formatWait(session.estimatedWaitMs)} />
-                    </span>
-                  </text>
-                )}
+                <text style={{ fg: theme.foreground, alignSelf: 'flex-start' }}>
+                  <span fg={theme.muted}>Position </span>
+                  <span fg={theme.primary} attributes={TextAttributes.BOLD}>
+                    {session.position}
+                  </span>
+                  <span fg={theme.muted}> / {session.queueDepth}</span>
+                </text>
+                <text style={{ fg: theme.foreground, alignSelf: 'flex-start' }}>
+                  <span fg={theme.muted}>Wait     </span>
+                  <span fg={theme.primary}>
+                    <ShimmerText
+                      text={
+                        session.position === 1
+                          ? 'any moment now'
+                          : formatWait(session.estimatedWaitMs)
+                      }
+                    />
+                  </span>
+                </text>
                 <text style={{ fg: theme.muted, alignSelf: 'flex-start' }}>
                   <span>Elapsed  </span>
                   {formatElapsed(elapsedMs)}

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

@@ -510,11 +510,10 @@ function handleFreebuffGateError(
   switch (kind) {
     case 'session_expired':
     case 'waiting_room_required':
-      // Our seat is gone mid-chat. Flip to the client-only `ended` state
-      // instead of auto re-queuing: the Chat surface stays mounted so any
-      // in-flight agent work can finish under the server-side grace period,
-      // and the session-ended banner prompts the user to press Enter when
-      // they're ready to rejoin the waiting room.
+      // Our seat is gone mid-chat. Flip to `ended` instead of auto re-queuing:
+      // the Chat surface stays mounted so any in-flight agent work can finish
+      // under the server-side grace period, and the session-ended banner
+      // prompts the user to press Enter when they're ready to rejoin.
       markFreebuffSessionEnded()
       return
     case 'waiting_room_queued':