Actually implement it so ending session puts you back in model picker

Author: jahooma

cli/src/chat.tsx

@@ -57,7 +57,7 @@ import { reportActivity } from './utils/activity-tracker'
 import { trackEvent } from './utils/analytics'
 import { showClipboardMessage } from './utils/clipboard'
 import { readClipboardImage } from './utils/clipboard-image'
-import { endAndRejoinFreebuffSession } from './hooks/use-freebuff-session'
+import { returnToFreebuffLanding } 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'
@@ -1460,7 +1460,7 @@ export const Chat = ({
                 ...prev,
                 getSystemMessage(END_SESSION_MESSAGE),
               ])
-              endAndRejoinFreebuffSession().catch(() => {})
+              returnToFreebuffLanding({ resetChat: true }).catch(() => {})
             }}
             freebuffSession={freebuffSession}
           />

cli/src/commands/command-registry.ts

@@ -9,7 +9,7 @@ import { handleInitializationFlowLocally } from './init'
 import { buildInterviewPrompt, buildPlanPrompt, buildReviewPromptFromArgs } from './prompt-builders'
 import { runBashCommand } from './router'
 import { handleUsageCommand } from './usage'
-import { endAndRejoinFreebuffSession } from '../hooks/use-freebuff-session'
+import { returnToFreebuffLanding } from '../hooks/use-freebuff-session'
 import { useThemeStore } from '../hooks/use-theme'
 import { WEBSITE_URL } from '../login/constants'
 import { useChatStore } from '../state/chat-store'
@@ -613,9 +613,10 @@ const ALL_COMMANDS: CommandDefinition[] = [
       clearInput(params)
     },
   }),
-  // /end-session (freebuff-only) — end the active session early and re-queue. The
-  // hook flips status from 'active' → 'queued', which unmounts <Chat> and
-  // mounts <WaitingRoomScreen>, where the user can pick a different model.
+  // /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.
   defineCommand({
     name: 'end-session',
     handler: (params) => {
@@ -626,7 +627,7 @@ const ALL_COMMANDS: CommandDefinition[] = [
       ])
       params.saveToHistory(params.inputValue.trim())
       clearInput(params)
-      endAndRejoinFreebuffSession().catch(() => {
+      returnToFreebuffLanding({ resetChat: true }).catch(() => {
         // The hook surfaces poll errors via the session store; nothing to do
         // here beyond letting the chat history reflect the attempt.
       })

cli/src/hooks/use-freebuff-session.ts

@@ -262,15 +262,6 @@ export function joinFreebuffQueue(model: string): Promise<void> {
   return restartFreebuffSession('rejoin')
 }
 
-/**
- * End the current session and immediately rejoin the queue. Used by the
- * "switch model" confirmation flow when the server returned `model_locked`,
- * and by any UI that lets the user exit an active session early.
- */
-export function endAndRejoinFreebuffSession(): Promise<void> {
-  return restartFreebuffSession('rejoin', { resetChat: true, releaseSlot: true })
-}
-
 /**
  * Best-effort DELETE of the caller's session row. Used by exit paths that
  * skip React unmount (process.exit on Ctrl+C) so the seat frees up quickly

cli/src/utils/constants.ts

@@ -10,7 +10,7 @@ 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…'
+  'Ending session and returning to the model picker…'
 
 // Agent IDs that should not be rendered in the CLI UI
 export const HIDDEN_AGENT_IDS = ['codebuff/context-pruner'] as const