refactor(cli): consolidate agent mode definitions into single source of

truth

- Export AGENT_MODES and AGENT_MODE_TO_AGENT from constants.ts - Remove
duplicate mode lists from settings.ts, agent-mode-toggle.tsx - Generate
slash commands dynamically from AGENT_MODES - Simplify toggleAgentMode
to use array index cycling - Use AGENT_MODE_TO_AGENT mapping in
resolveAgent

Author: brandonkachen

cli/src/components/agent-mode-toggle.tsx

@@ -3,20 +3,12 @@ import React, { useEffect, useRef, useState } from 'react'
 import { Button } from './button'
 import { SegmentedControl } from './segmented-control'
 import { useTheme } from '../hooks/use-theme'
+import { AGENT_MODES } from '../utils/constants'
 import { BORDER_CHARS } from '../utils/ui-constants'
 
 import type { Segment } from './segmented-control'
 import type { AgentMode } from '../utils/constants'
 
-const MODE_LABELS: Record<AgentMode, string> = {
-  DEFAULT: 'DEFAULT',
-  LITE: 'LITE',
-  MAX: 'MAX',
-  PLAN: 'PLAN',
-}
-
-const ALL_MODES = Object.keys(MODE_LABELS) as AgentMode[]
-
 export const OPEN_DELAY_MS = 0 // Delay before expanding on hover
 export const CLOSE_DELAY_MS = 250 // Delay before collapsing when mouse leaves
 export const REOPEN_SUPPRESS_MS = 250 // Time to block reopening after explicit close (prevents flicker)
@@ -108,16 +100,16 @@ export function useHoverToggle() {
 export function buildExpandedSegments(currentMode: AgentMode): Segment[] {
   return [
     // All mode options (disabled for current mode)
-    ...ALL_MODES.map((m) => ({
+    ...AGENT_MODES.map((m) => ({
       id: m,
-      label: MODE_LABELS[m],
+      label: m,
       isBold: false,
       disabled: m === currentMode,
     })),
     // Active mode indicator with reversed arrow
     {
       id: `active-${currentMode}`,
-      label: `> ${MODE_LABELS[currentMode]}`,
+      label: `> ${currentMode}`,
       isSelected: true,
       defaultHighlighted: true,
     },
@@ -220,11 +212,7 @@ export const AgentModeToggle = ({
           wrapMode="none"
           fg={isCollapsedHovered ? theme.foreground : theme.muted}
         >
-          {isCollapsedHovered ? (
-            <b>{`< ${MODE_LABELS[mode]}`}</b>
-          ) : (
-            `< ${MODE_LABELS[mode]}`
-          )}
+          {isCollapsedHovered ? <b>{`< ${mode}`}</b> : `< ${mode}`}
         </text>
       </Button>
     )

cli/src/data/slash-commands.ts

@@ -1,10 +1,19 @@
+import { AGENT_MODES } from '../utils/constants'
+
 export interface SlashCommand {
   id: string
   label: string
   description: string
   aliases?: string[]
 }
 
+// Generate mode commands from the AGENT_MODES constant
+const MODE_COMMANDS: SlashCommand[] = AGENT_MODES.map((mode) => ({
+  id: `mode:${mode.toLowerCase()}`,
+  label: `mode:${mode.toLowerCase()}`,
+  description: `Switch to ${mode} mode`,
+}))
+
 export const SLASH_COMMANDS: SlashCommand[] = [
   // {
   //   id: 'help',
@@ -79,24 +88,5 @@ export const SLASH_COMMANDS: SlashCommand[] = [
     description: 'Attach an image file (or Ctrl+V to paste from clipboard)',
     aliases: ['img', 'attach'],
   },
-  {
-    id: 'mode:default',
-    label: 'mode:default',
-    description: 'Switch to DEFAULT mode',
-  },
-  {
-    id: 'mode:lite',
-    label: 'mode:lite',
-    description: 'Switch to LITE mode',
-  },
-  {
-    id: 'mode:max',
-    label: 'mode:max',
-    description: 'Switch to MAX mode',
-  },
-  {
-    id: 'mode:plan',
-    label: 'mode:plan',
-    description: 'Switch to PLAN mode',
-  },
+  ...MODE_COMMANDS,
 ]

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

@@ -1,11 +1,11 @@
 import { useQueryClient } from '@tanstack/react-query'
 import { useCallback, useEffect, useRef } from 'react'
-import { match } from 'ts-pattern'
 
 import { setCurrentChatId } from '../project-files'
 import { createStreamController } from './stream-state'
 import { useChatStore } from '../state/chat-store'
 import { getCodebuffClient } from '../utils/codebuff-client'
+import { AGENT_MODE_TO_ID } from '../utils/constants'
 import { createEventHandlerState } from '../utils/create-event-handler-state'
 import { createRunConfig } from '../utils/create-run-config'
 import { loadAgentDefinitions } from '../utils/load-agent-definitions'
@@ -76,14 +76,7 @@ const resolveAgent = (
       ? agentDefinitions.find((definition) => definition.id === agentId)
       : undefined
 
-  const fallbackAgent = match(agentMode)
-    .with('MAX', () => 'base2-max')
-    .with('DEFAULT', () => 'base2')
-    .with('LITE', () => 'base2-lite')
-    .with('PLAN', () => 'base2-plan')
-    .exhaustive()
-
-  return selectedAgentDefinition ?? agentId ?? fallbackAgent
+  return selectedAgentDefinition ?? agentId ?? AGENT_MODE_TO_ID[agentMode]
 }
 
 // Respect bash context, but avoid sending empty prompts when only images are attached.

cli/src/state/chat-store.ts

@@ -2,6 +2,7 @@ import { castDraft } from 'immer'
 import { create } from 'zustand'
 import { immer } from 'zustand/middleware/immer'
 
+import { AGENT_MODES } from '../utils/constants'
 import { clamp } from '../utils/math'
 import { loadModePreference, saveModePreference } from '../utils/settings'
 
@@ -251,15 +252,9 @@ export const useChatStore = create<ChatStore>()(
 
     toggleAgentMode: () =>
       set((state) => {
-        if (state.agentMode === 'DEFAULT') {
-          state.agentMode = 'LITE'
-        } else if (state.agentMode === 'LITE') {
-          state.agentMode = 'MAX'
-        } else if (state.agentMode === 'MAX') {
-          state.agentMode = 'PLAN'
-        } else {
-          state.agentMode = 'DEFAULT'
-        }
+        const currentIndex = AGENT_MODES.indexOf(state.agentMode)
+        const nextIndex = (currentIndex + 1) % AGENT_MODES.length
+        state.agentMode = AGENT_MODES[nextIndex]
         saveModePreference(state.agentMode)
       }),
 

cli/src/utils/constants.ts

@@ -46,5 +46,16 @@ export const shouldRenderAsSimpleText = (agentType: string): boolean => {
  */
 export const MAIN_AGENT_ID = 'main-agent'
 
-const agentModes = ['DEFAULT', 'LITE', 'MAX', 'PLAN'] as const
-export type AgentMode = (typeof agentModes)[number]
+/**
+ * Mapping from agent mode to agent ID.
+ * Single source of truth for all agent modes (order = cycling order).
+ */
+export const AGENT_MODE_TO_ID = {
+  DEFAULT: 'base2',
+  LITE: 'base2-lite',
+  MAX: 'base2-max',
+  PLAN: 'base2-plan',
+} as const
+
+export type AgentMode = keyof typeof AGENT_MODE_TO_ID
+export const AGENT_MODES = Object.keys(AGENT_MODE_TO_ID) as AgentMode[]

cli/src/utils/settings.ts

@@ -2,6 +2,7 @@ import fs from 'fs'
 import path from 'path'
 
 import { getConfigDir } from './auth'
+import { AGENT_MODES } from './constants'
 import { logger } from './logger'
 
 import type { AgentMode } from './constants'
@@ -14,8 +15,6 @@ export interface Settings {
   // Add new settings here over time
 }
 
-const VALID_MODES: AgentMode[] = ['DEFAULT', 'LITE', 'MAX', 'PLAN']
-
 /**
  * Get the settings file path
  */
@@ -63,7 +62,7 @@ const validateSettings = (parsed: unknown): Settings => {
   // Validate mode
   if (
     typeof obj.mode === 'string' &&
-    VALID_MODES.includes(obj.mode as AgentMode)
+    AGENT_MODES.includes(obj.mode as AgentMode)
   ) {
     settings.mode = obj.mode as AgentMode
   }