Simplify freebuff end-session button: merge StopButton+EndSessionButton, remove redundant IS_FREEBUFF guard, extract END_SESSION_MESSAGE constant

Author: jahooma

cli/src/chat.tsx

@@ -57,7 +57,9 @@ import { reportActivity } from './utils/activity-tracker'
 import { trackEvent } from './utils/analytics'
 import { showClipboardMessage } from './utils/clipboard'
 import { readClipboardImage } from './utils/clipboard-image'
-import { IS_FREEBUFF } from './utils/constants'
+import { endAndRejoinFreebuffSession } from './hooks/use-freebuff-session'
+import { END_SESSION_MESSAGE, IS_FREEBUFF } from './utils/constants'
+import { getSystemMessage } from './utils/message-history'
 import { getInputModeConfig } from './utils/input-modes'
 
 import {
@@ -1453,6 +1455,13 @@ export const Chat = ({
             scrollToLatest={scrollToLatest}
             statusIndicatorState={statusIndicatorState}
             onStop={chatKeyboardHandlers.onInterruptStream}
+            onEndSession={() => {
+              setMessages((prev) => [
+                ...prev,
+                getSystemMessage(END_SESSION_MESSAGE),
+              ])
+              endAndRejoinFreebuffSession().catch(() => {})
+            }}
             freebuffSession={freebuffSession}
           />
         )}

cli/src/commands/command-registry.ts

@@ -16,7 +16,7 @@ import { useChatStore } from '../state/chat-store'
 import { useFeedbackStore } from '../state/feedback-store'
 import { useLoginStore } from '../state/login-store'
 import { getChatGptOAuthStatus } from '../utils/chatgpt-oauth'
-import { AGENT_MODES, IS_FREEBUFF } from '../utils/constants'
+import { AGENT_MODES, END_SESSION_MESSAGE, IS_FREEBUFF } from '../utils/constants'
 import { getSystemMessage, getUserMessage } from '../utils/message-history'
 import { capturePendingAttachments } from '../utils/pending-attachments'
 import { getSkillByName } from '../utils/skill-registry'
@@ -622,7 +622,7 @@ const ALL_COMMANDS: CommandDefinition[] = [
       params.setMessages((prev) => [
         ...prev,
         getUserMessage(params.inputValue.trim()),
-        getSystemMessage('Ending session and returning to the waiting room…'),
+        getSystemMessage(END_SESSION_MESSAGE),
       ])
       params.saveToHistory(params.inputValue.trim())
       clearInput(params)

cli/src/components/status-bar.tsx

@@ -2,16 +2,46 @@ import { getFreebuffModel } from '@codebuff/common/constants/freebuff-models'
 import { TextAttributes } from '@opentui/core'
 import React, { useEffect, useState } from 'react'
 
+import { Button } from './button'
 import { ScrollToBottomButton } from './scroll-to-bottom-button'
 import { ShimmerText } from './shimmer-text'
-import { StopButton } from './stop-button'
+
 import { useFreebuffSessionProgress } from '../hooks/use-freebuff-session-progress'
 import { useTheme } from '../hooks/use-theme'
 import { formatElapsedTime } from '../utils/format-elapsed-time'
 
 import type { FreebuffSessionResponse } from '../types/freebuff-session'
 import type { StatusIndicatorState } from '../utils/status-indicator-state'
 
+/** A small status-bar action button with hover-bold styling. */
+const StatusActionButton = ({
+  children,
+  onClick,
+}: {
+  children: React.ReactNode
+  onClick: () => void
+}) => {
+  const theme = useTheme()
+  const [hovered, setHovered] = useState(false)
+
+  return (
+    <Button
+      style={{ paddingLeft: 1, paddingRight: 1 }}
+      onClick={onClick}
+      onMouseOver={() => setHovered(true)}
+      onMouseOut={() => setHovered(false)}
+    >
+      <text>
+        <span
+          fg={theme.secondary}
+          attributes={hovered ? TextAttributes.BOLD : TextAttributes.NONE}
+        >
+          {children}
+        </span>
+      </text>
+    </Button>
+  )
+}
 
 const SHIMMER_INTERVAL_MS = 160
 
@@ -42,6 +72,7 @@ interface StatusBarProps {
   scrollToLatest: () => void
   statusIndicatorState: StatusIndicatorState
   onStop?: () => void
+  onEndSession?: () => void
   freebuffSession: FreebuffSessionResponse | null
 }
 
@@ -51,6 +82,7 @@ export const StatusBar = ({
   scrollToLatest,
   statusIndicatorState,
   onStop,
+  onEndSession,
   freebuffSession,
 }: StatusBarProps) => {
   const theme = useTheme()
@@ -229,7 +261,10 @@ export const StatusBar = ({
       >
         <text style={{ wrapMode: 'none' }}>{elapsedTimeContent}</text>
         {onStop && (statusIndicatorState.kind === 'waiting' || statusIndicatorState.kind === 'streaming') && (
-          <StopButton onClick={onStop} />
+          <StatusActionButton onClick={onStop}>■ Esc</StatusActionButton>
+        )}
+        {onEndSession && statusIndicatorState.kind === 'idle' && freebuffSession?.status === 'active' && (
+          <StatusActionButton onClick={onEndSession}>✕ End session</StatusActionButton>
         )}
         {sessionProgress !== null &&
           sessionProgress.remainingMs < COUNTDOWN_VISIBLE_MS &&

cli/src/components/stop-button.tsx

@@ -8,6 +8,10 @@ import { getCliEnv } from './env'
  */
 export const IS_FREEBUFF = getCliEnv().FREEBUFF_MODE === 'true'
 
+/** Message shown when the user ends a freebuff session early. */
+export const END_SESSION_MESSAGE =
+  'Ending session and returning to the waiting room…'
+
 // Agent IDs that should not be rendered in the CLI UI
 export const HIDDEN_AGENT_IDS = ['codebuff/context-pruner'] as const