refactor(cli): simplify use-send-message with extracted helpers and fix type errors

- Extract createEventHandlerState helper for SDK event handler state
- Extract createRunConfig helper for SDK run configuration
- Reduce prop drilling by pulling setters directly from useChatStore
- Rename EventHandlerContext to EventHandlerState to avoid React confusion
- Memoize streamRefs with useRef for referential stability
- Fix mock function types in bash-mode.test.ts and referral-mode.test.ts
- Update sdk-event-handlers.test.ts for renamed type

Author: brandonkachen

cli/src/__tests__/bash-mode.test.ts

@@ -1,6 +1,7 @@
 import { describe, test, expect, mock } from 'bun:test'
 
 import type { InputMode } from '../utils/input-modes'
+import type { InputValue } from '../state/chat-store'
 
 /**
  * Tests for bash mode functionality in the CLI.
@@ -21,8 +22,8 @@ import type { InputMode } from '../utils/input-modes'
 describe('bash-mode', () => {
   describe('entering bash mode', () => {
     test('typing exactly "!" enters bash mode and clears input', () => {
-      const setInputMode = mock(() => {})
-      const setInputValue = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
+      const setInputValue = mock((_value: Partial<InputValue>) => {})
 
       // Simulate user typing '!'
       const inputValue = {
@@ -50,8 +51,8 @@ describe('bash-mode', () => {
     })
 
     test('typing "!ls" does NOT enter bash mode (not exactly "!")', () => {
-      const setInputMode = mock(() => {})
-      const setInputValue = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
+      const setInputValue = mock((_value: Partial<InputValue>) => {})
 
       // Simulate user typing '!ls'
       const inputValue = {
@@ -78,8 +79,8 @@ describe('bash-mode', () => {
     })
 
     test('typing "!" when already in bash mode does nothing special', () => {
-      const setInputMode = mock(() => {})
-      const setInputValue = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
+      const setInputValue = mock((_value: Partial<InputValue>) => {})
 
       const inputValue = {
         text: '!',
@@ -108,7 +109,7 @@ describe('bash-mode', () => {
 
   describe('exiting bash mode', () => {
     test('backspace at cursor position 0 exits bash mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
 
       // Simulate backspace key press in bash mode at cursor position 0
       const inputMode: InputMode = 'bash'
@@ -128,7 +129,7 @@ describe('bash-mode', () => {
     })
 
     test('backspace at cursor position 0 with non-empty input DOES exit bash mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
 
       const inputMode: InputMode = 'bash'
       const cursorPosition = 0
@@ -147,7 +148,7 @@ describe('bash-mode', () => {
     })
 
     test('backspace at cursor position > 0 does NOT exit bash mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
 
       const inputMode: InputMode = 'bash'
       const cursorPosition: number = 2
@@ -166,7 +167,7 @@ describe('bash-mode', () => {
     })
 
     test('other keys at cursor position 0 do NOT exit bash mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
 
       const inputMode: InputMode = 'bash'
       const cursorPosition = 0
@@ -185,7 +186,7 @@ describe('bash-mode', () => {
     })
 
     test('backspace when NOT in bash mode does nothing to bash mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
 
       const inputMode = 'default' as InputMode
       const cursorPosition = 0
@@ -247,7 +248,7 @@ describe('bash-mode', () => {
     })
 
     test('submission saves command WITH "!" to history', () => {
-      const saveToHistory = mock(() => {})
+      const saveToHistory = mock((_command: string) => {})
       const trimmedInput = 'git status'
       const commandWithBang = '!' + trimmedInput
 
@@ -258,7 +259,7 @@ describe('bash-mode', () => {
     })
 
     test('submission exits bash mode after running command', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock((_mode: InputMode) => {})
 
       // After submission, bash mode should be exited
       setInputMode('default')
@@ -267,7 +268,7 @@ describe('bash-mode', () => {
     })
 
     test('terminal command receives value WITHOUT "!" prefix', () => {
-      const runTerminalCommand = mock(() =>
+      const runTerminalCommand = mock((_params: Record<string, unknown>) =>
         Promise.resolve([{ value: { stdout: 'output' } }]),
       )
       const trimmedInput = 'echo hello'

cli/src/__tests__/referral-mode.test.ts

@@ -4,6 +4,9 @@ import { getInputModeConfig } from '../utils/input-modes'
 
 import type { InputMode } from '../utils/input-modes'
 
+// Helper type for mock functions
+type MockSetInputMode = (mode: InputMode) => void
+
 /**
  * Tests for referral mode functionality in the CLI.
  *
@@ -21,7 +24,7 @@ import type { InputMode } from '../utils/input-modes'
 describe('referral-mode', () => {
   describe('entering referral mode', () => {
     test('typing "/referral" enters referral mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
       const command = '/referral'
 
       // Simulate command processing
@@ -33,7 +36,7 @@ describe('referral-mode', () => {
     })
 
     test('typing "/redeem" also enters referral mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
       const command = '/redeem' as string
 
       if (command === '/referral' || command === '/redeem') {
@@ -44,8 +47,8 @@ describe('referral-mode', () => {
     })
 
     test('/referral with a code argument redeems immediately without entering mode', () => {
-      const setInputMode = mock(() => {})
-      const handleReferralCode = mock(async () => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
+      const handleReferralCode = mock(async (_code: string) => {})
       const command = '/referral abc123'
 
       // Simulate handler logic
@@ -65,7 +68,7 @@ describe('referral-mode', () => {
 
   describe('exiting referral mode', () => {
     test('backspace at cursor position 0 exits referral mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
 
       const inputMode = 'referral' as InputMode
       const cursorPosition = 0
@@ -84,7 +87,7 @@ describe('referral-mode', () => {
     })
 
     test('backspace at cursor position 0 with non-empty input DOES exit referral mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
 
       const inputMode = 'referral' as InputMode
       const cursorPosition = 0
@@ -103,7 +106,7 @@ describe('referral-mode', () => {
     })
 
     test('backspace at cursor position > 0 does NOT exit referral mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
 
       const inputMode = 'referral' as InputMode
       const cursorPosition = 5 as number
@@ -122,7 +125,7 @@ describe('referral-mode', () => {
     })
 
     test('other keys at cursor position 0 do NOT exit referral mode', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
 
       const inputMode = 'referral' as InputMode
       const cursorPosition = 0
@@ -316,7 +319,7 @@ describe('referral-mode', () => {
     })
 
     test('submission exits referral mode after processing', () => {
-      const setInputMode = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
 
       // After submission, referral mode should be exited
       setInputMode('default')
@@ -325,8 +328,8 @@ describe('referral-mode', () => {
     })
 
     test('invalid code shows error and exits referral mode', () => {
-      const setInputMode = mock(() => {})
-      const showError = mock(() => {})
+      const setInputMode = mock<MockSetInputMode>((_mode) => {})
+      const showError = mock((_msg: string) => {})
       const trimmedInput = 'ab' // Too short
       const pattern = /^[a-zA-Z0-9-]{3,50}$/
 
@@ -459,7 +462,7 @@ describe('referral-mode', () => {
 
   describe('integration with command router', () => {
     test('referral mode input is routed to handleReferralCode', () => {
-      const handleReferralCode = mock(async () => {})
+      const handleReferralCode = mock(async (_code: string) => {})
       const inputMode = 'referral' as InputMode
       const trimmedInput = 'abc123'
 
@@ -474,7 +477,7 @@ describe('referral-mode', () => {
     })
 
     test('normal mode input is NOT routed to referral handler', () => {
-      const handleReferralCode = mock(async () => {})
+      const handleReferralCode = mock(async (_code: string) => {})
       const inputMode = 'default' as InputMode
       const trimmedInput = 'abc123'
 
@@ -502,8 +505,8 @@ describe('referral-mode', () => {
 
   describe('error handling', () => {
     test('network error during redemption shows error message', async () => {
-      const showError = mock(() => {})
-      const handleReferralCode = mock(async () => {
+      const showError = mock((_msg: string) => {})
+      const handleReferralCode = mock(async (_code: string) => {
         throw new Error('Network error')
       })
 
@@ -521,8 +524,8 @@ describe('referral-mode', () => {
     })
 
     test('validation error prevents redemption attempt', () => {
-      const handleReferralCode = mock(async () => {})
-      const showError = mock(() => {})
+      const handleReferralCode = mock(async (_code: string) => {})
+      const showError = mock((_msg: string) => {})
       const trimmedInput = '!@#' // Invalid characters
       const pattern = /^[a-zA-Z0-9-]{3,50}$/
 

cli/src/chat.tsx

@@ -149,11 +149,6 @@ export const Chat = ({
     agentMode,
     setAgentMode,
     toggleAgentMode,
-    setHasReceivedPlanResponse,
-    lastMessageMode,
-    setLastMessageMode,
-    addSessionCredits,
-    setRunState,
     isAnnouncementVisible,
     setIsAnnouncementVisible,
     isRetrying,
@@ -182,12 +177,6 @@ export const Chat = ({
       agentMode: store.agentMode,
       setAgentMode: store.setAgentMode,
       toggleAgentMode: store.toggleAgentMode,
-      hasReceivedPlanResponse: store.hasReceivedPlanResponse,
-      setHasReceivedPlanResponse: store.setHasReceivedPlanResponse,
-      lastMessageMode: store.lastMessageMode,
-      setLastMessageMode: store.setLastMessageMode,
-      addSessionCredits: store.addSessionCredits,
-      setRunState: store.setRunState,
       isAnnouncementVisible: store.isAnnouncementVisible,
       setIsAnnouncementVisible: store.setIsAnnouncementVisible,
       isRetrying: store.isRetrying,
@@ -596,15 +585,9 @@ export const Chat = ({
   // Future: Could be used for analytics or debugging
 
   const { sendMessage, clearMessages } = useSendMessage({
-    setMessages,
-    setFocusedAgentId,
-    setInputFocused,
     inputRef,
-    setStreamingAgents,
     activeSubagentsRef,
     isChainInProgressRef,
-    setActiveSubagents,
-    setIsChainInProgress,
     setStreamStatus,
     setCanProcessQueue,
     abortControllerRef,
@@ -613,11 +596,6 @@ export const Chat = ({
     mainAgentTimer,
     scrollToLatest,
     onTimerEvent: () => {}, // No-op for now
-    setHasReceivedPlanResponse,
-    lastMessageMode,
-    setLastMessageMode,
-    addSessionCredits,
-    setRunState,
     isQueuePausedRef,
     resumeQueue,
     continueChat,