fix: resolve TypeScript errors and update test assertions

- Add type guards for AgentOutput.message access in SDK retry tests -
Add optional chaining for possibly undefined sessionState in evals -
Update context-pruner tests to use correct message structure (toolName
at message level, not in content)

Author: brandonkachen

.agents/__tests__/context-pruner.test.ts

@@ -140,20 +140,20 @@ describe('context-pruner handleSteps', () => {
     const firstTerminalMessage = resultMessages.find(
       (m: any) =>
         m.role === 'tool' &&
-        m.content?.toolName === 'run_terminal_command' &&
-        m.content?.output?.[0]?.value?.command === 'command-1',
+        m.toolName === 'run_terminal_command' &&
+        m.content?.[0]?.value?.command === 'command-1',
     )
     expect(
-      firstTerminalMessage?.content?.output?.[0]?.value?.stdoutOmittedForLength,
+      firstTerminalMessage?.content?.[0]?.value?.stdoutOmittedForLength,
     ).toBe(true)
 
     // Check that recent terminal commands are preserved (but may be processed by large tool result pass)
     const recentTerminalMessage = resultMessages.find(
       (m: any) =>
         m.role === 'tool' &&
-        m.content?.toolName === 'run_terminal_command' &&
-        (m.content?.output?.[0]?.value?.command === 'command-7' ||
-          m.content?.output?.[0]?.value?.message ===
+        m.toolName === 'run_terminal_command' &&
+        (m.content?.[0]?.value?.command === 'command-7' ||
+          m.content?.[0]?.value?.message ===
             '[LARGE_TOOL_RESULT_OMITTED]'),
     )
     expect(recentTerminalMessage).toBeDefined()
@@ -181,17 +181,17 @@ describe('context-pruner handleSteps', () => {
 
     // Large tool result should be simplified
     const largeResultMessage = resultMessages.find(
-      (m: any) => m.role === 'tool' && m.content?.toolName === 'read_files',
+      (m: any) => m.role === 'tool' && m.toolName === 'read_files',
     )
-    expect(largeResultMessage?.content?.output?.[0]?.value?.message).toBe(
+    expect(largeResultMessage?.content?.[0]?.value?.message).toBe(
       '[LARGE_TOOL_RESULT_OMITTED]',
     )
 
     // Small tool result should be preserved
     const smallResultMessage = resultMessages.find(
-      (m: any) => m.role === 'tool' && m.content?.toolName === 'code_search',
+      (m: any) => m.role === 'tool' && m.toolName === 'code_search',
     )
-    expect(smallResultMessage?.content?.output?.[0]?.value?.data).toBe(
+    expect(smallResultMessage?.content?.[0]?.value?.data).toBe(
       'Small result',
     )
   })
@@ -367,7 +367,7 @@ describe('context-pruner edge cases', () => {
     // Valid terminal command should be processed correctly
     const validCommand = resultMessages.find(
       (m: any) =>
-        m.role === 'tool' && m.content?.toolName === 'run_terminal_command',
+        m.role === 'tool' && m.toolName === 'run_terminal_command',
     )
     expect(validCommand).toBeDefined()
   })
@@ -481,7 +481,7 @@ describe('context-pruner edge cases', () => {
     const hasLargeToolResultReplacement = resultMessages.some(
       (m: any) =>
         m.role === 'tool' &&
-        m.content?.output?.[0]?.value?.message ===
+        m.content?.[0]?.value?.message ===
           '[LARGE_TOOL_RESULT_OMITTED]',
     )
     expect(hasLargeToolResultReplacement).toBe(true)

cli/src/chat.tsx

@@ -1,5 +1,14 @@
+import { RECONNECTION_MESSAGE_DURATION_MS } from '@codebuff/sdk'
 import { useKeyboard } from '@opentui/react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useQueryClient } from '@tanstack/react-query'
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useTransition,
+} from 'react'
 import { useShallow } from 'zustand/react/shallow'
 
 import { routeUserPrompt } from './commands/router'
@@ -9,11 +18,12 @@ import { MessageWithAgents } from './components/message-with-agents'
 import { StatusBar } from './components/status-bar'
 import { SLASH_COMMANDS } from './data/slash-commands'
 import { useAgentValidation } from './hooks/use-agent-validation'
+import { authQueryKeys } from './hooks/use-auth-query'
 import { useChatInput } from './hooks/use-chat-input'
 import { useClipboard } from './hooks/use-clipboard'
 import { useConnectionStatus } from './hooks/use-connection-status'
 import { useElapsedTime } from './hooks/use-elapsed-time'
-import { useTimeout } from './hooks/use-timeout'
+import { useEvent } from './hooks/use-event'
 import { useExitHandler } from './hooks/use-exit-handler'
 import { useInputHistory } from './hooks/use-input-history'
 import { useKeyboardHandlers } from './hooks/use-keyboard-handlers'
@@ -26,6 +36,7 @@ import { useSuggestionEngine } from './hooks/use-suggestion-engine'
 import { useSuggestionMenuHandlers } from './hooks/use-suggestion-menu-handlers'
 import { useTerminalDimensions } from './hooks/use-terminal-dimensions'
 import { useTheme } from './hooks/use-theme'
+import { useTimeout } from './hooks/use-timeout'
 import { useValidationBanner } from './hooks/use-validation-banner'
 import { useChatStore } from './state/chat-store'
 import { useFeedbackStore } from './state/feedback-store'
@@ -36,23 +47,18 @@ import {
   getStatusIndicatorState,
   type AuthStatus,
 } from './utils/status-indicator-state'
-import { authQueryKeys } from './hooks/use-auth-query'
-import { RECONNECTION_MESSAGE_DURATION_MS } from '@codebuff/sdk'
-import { useQueryClient } from '@tanstack/react-query'
-import { useTransition } from 'react'
 import { computeInputLayoutMetrics } from './utils/text-layout'
 import { createMarkdownPalette } from './utils/theme-system'
 
 import type { MultilineInputHandle } from './components/multiline-input'
 import type { ContentBlock } from './types/chat'
 import type { SendMessageFn } from './types/contracts/send-message'
 import type { User } from './utils/auth'
+import type { AgentMode } from './utils/constants'
 import type { FileTreeNode } from '@codebuff/common/util/file'
 import type { ScrollBoxRenderable } from '@opentui/core'
 import type { UseMutationResult } from '@tanstack/react-query'
 import type { Dispatch, SetStateAction } from 'react'
-import { useEvent } from './hooks/use-event'
-import { AgentMode } from './utils/constants'
 
 export const Chat = ({
   headerContent,
@@ -133,16 +139,16 @@ export const Chat = ({
     setLastMessageMode,
     addSessionCredits,
     resetChatStore,
-  sessionCreditsUsed,
-  setRunState,
-  isAnnouncementVisible,
-  setIsAnnouncementVisible,
-  isRetrying,
-} = useChatStore(
-  useShallow((store) => ({
-    inputValue: store.inputValue,
-    cursorPosition: store.cursorPosition,
-    lastEditDueToNav: store.lastEditDueToNav,
+    sessionCreditsUsed,
+    setRunState,
+    isAnnouncementVisible,
+    setIsAnnouncementVisible,
+    isRetrying,
+  } = useChatStore(
+    useShallow((store) => ({
+      inputValue: store.inputValue,
+      cursorPosition: store.cursorPosition,
+      lastEditDueToNav: store.lastEditDueToNav,
       setInputValue: store.setInputValue,
       inputFocused: store.inputFocused,
       setInputFocused: store.setInputFocused,
@@ -169,13 +175,13 @@ export const Chat = ({
       setLastMessageMode: store.setLastMessageMode,
       addSessionCredits: store.addSessionCredits,
       resetChatStore: store.reset,
-    sessionCreditsUsed: store.sessionCreditsUsed,
-    setRunState: store.setRunState,
-    isAnnouncementVisible: store.isAnnouncementVisible,
-    setIsAnnouncementVisible: store.setIsAnnouncementVisible,
-    isRetrying: store.isRetrying,
-  })),
-)
+      sessionCreditsUsed: store.sessionCreditsUsed,
+      setRunState: store.setRunState,
+      isAnnouncementVisible: store.isAnnouncementVisible,
+      setIsAnnouncementVisible: store.setIsAnnouncementVisible,
+      isRetrying: store.isRetrying,
+    })),
+  )
 
   // Memoize toggle IDs extraction - only recompute when messages change
   const allToggleIds = useMemo(() => {
@@ -534,10 +540,7 @@ export const Chat = ({
   // Timer events are currently tracked but not used for UI updates
   // Future: Could be used for analytics or debugging
 
-  const {
-    sendMessage,
-    clearMessages,
-  } = useSendMessage({
+  const { sendMessage, clearMessages } = useSendMessage({
     messages,
     allToggleIds,
     setMessages,

evals/buffbench/agent-runner.ts

@@ -112,7 +112,7 @@ export async function runAgentOnCommit({
               trace.push(event)
             },
           })
-          cost = result.sessionState.mainAgentState.creditsUsed / 100
+          cost = (result.sessionState?.mainAgentState.creditsUsed ?? 0) / 100
 
           execSync('git add .', { cwd: repoDir, stdio: 'ignore' })
           diff = execSync(`git diff ${commit.parentSha}`, {

evals/git-evals/prompting-agent.ts

@@ -93,7 +93,7 @@ Analyze the conversation and decide your next action.`
     },
   })
 
-  if (!result) {
+  if (!result || !result.sessionState) {
     return {
       decision: 'halt',
       reasoning: `No valid response from prompting agent. Error:\n${lastErrorMessage}`,

evals/git-evals/runners/codebuff.ts

@@ -39,7 +39,7 @@ export class CodebuffRunner implements Runner {
 
     const client = new CodebuffClient({
       apiKey,
-      cwd: this.runState.sessionState.fileContext.cwd,
+      cwd: this.runState.sessionState?.fileContext.cwd ?? process.cwd(),
     })
 
     const agentsPath = path.join(__dirname, '../../../.agents')
@@ -103,7 +103,7 @@ export class CodebuffRunner implements Runner {
 
     return {
       steps,
-      totalCostUsd: this.runState.sessionState.mainAgentState.creditsUsed / 100,
+      totalCostUsd: (this.runState.sessionState?.mainAgentState.creditsUsed ?? 0) / 100,
     }
   }
 }

sdk/src/__tests__/run-with-retry.test.ts

@@ -63,7 +63,9 @@ describe('run retry wrapper', () => {
 
     // Should return error output after exhausting retries
     expect(result.output.type).toBe('error')
-    expect(result.output.message).toContain('timeout')
+    if (result.output.type === 'error') {
+      expect(result.output.message).toContain('timeout')
+    }
     // Initial attempt + one retry
     expect(runSpy).toHaveBeenCalledTimes(2)
   })
@@ -140,7 +142,9 @@ describe('run retry wrapper', () => {
     })
 
     expect(result.output.type).toBe('error')
-    expect(result.output.message).toContain('Aborted')
+    if (result.output.type === 'error') {
+      expect(result.output.message).toContain('Aborted')
+    }
     expect(runSpy).toHaveBeenCalledTimes(0)
   })