Replace as any casts with typed mocks in more test files

Test files updated (47 as any casts removed):
- sdk-event-handlers.test.ts: 6 -> 0 casts
- message-updater.test.ts: 6 -> 0 casts
- read-subtree.test.ts: 6 -> 0 casts
- openrouter-ai-sdk/chat/index.test.ts: 6 -> 0 casts
- usage-refresh-on-completion.test.ts: 6 -> 0 casts
- run-terminal-command.test.ts: 5 -> 0 casts
- agent-mode-toggle.test.ts: 5 -> 0 casts
- steps.test.ts: 5 -> 0 casts

Used typed interfaces (SpawnAgentInfo, SubagentStartEvent, ToolResultEvent,
ReadSubtreeResultEntry, MockDb, TestMessageMetadata, RenderContentElement)
and proper type assertions instead of unsafe any casts.

Author: brandonkachen

cli/src/__tests__/integration/usage-refresh-on-completion.test.ts

@@ -1,13 +1,5 @@
 import { QueryClient } from '@tanstack/react-query'
-import {
-  describe,
-  test,
-  expect,
-  beforeEach,
-  afterEach,
-  mock,
-  spyOn,
-} from 'bun:test'
+import { describe, test, expect, beforeEach, afterEach, mock, spyOn } from 'bun:test'
 
 import { usageQueryKeys } from '../../hooks/use-usage-query'
 import { useChatStore } from '../../state/chat-store'
@@ -80,10 +72,7 @@ describe('Usage Refresh on SDK Completion', () => {
       expect(useChatStore.getState().inputMode).toBe('usage')
 
       // Spy on invalidateQueries
-      const invalidateSpy = mock(
-        queryClient.invalidateQueries.bind(queryClient),
-      )
-      queryClient.invalidateQueries = invalidateSpy as any
+      const invalidateSpy = spyOn(queryClient, 'invalidateQueries')
 
       // Simulate SDK run completion triggering invalidation
       const isUsageMode = useChatStore.getState().inputMode === 'usage'
@@ -101,10 +90,7 @@ describe('Usage Refresh on SDK Completion', () => {
     test('should invalidate multiple times for sequential runs', () => {
       useChatStore.getState().setInputMode('usage')
 
-      const invalidateSpy = mock(
-        queryClient.invalidateQueries.bind(queryClient),
-      )
-      queryClient.invalidateQueries = invalidateSpy as any
+      const invalidateSpy = spyOn(queryClient, 'invalidateQueries')
 
       // Simulate three sequential SDK runs
       for (let i = 0; i < 3; i++) {
@@ -123,10 +109,7 @@ describe('Usage Refresh on SDK Completion', () => {
       useChatStore.getState().setInputMode('default')
       expect(useChatStore.getState().inputMode).toBe('default')
 
-      const invalidateSpy = mock(
-        queryClient.invalidateQueries.bind(queryClient),
-      )
-      queryClient.invalidateQueries = invalidateSpy as any
+      const invalidateSpy = spyOn(queryClient, 'invalidateQueries')
 
       // Simulate SDK run completion check
       const isUsageMode = useChatStore.getState().inputMode === 'usage'
@@ -145,10 +128,7 @@ describe('Usage Refresh on SDK Completion', () => {
       // User closes banner before run completes
       useChatStore.getState().setInputMode('default')
 
-      const invalidateSpy = mock(
-        queryClient.invalidateQueries.bind(queryClient),
-      )
-      queryClient.invalidateQueries = invalidateSpy as any
+      const invalidateSpy = spyOn(queryClient, 'invalidateQueries')
 
       // Simulate run completion
       const isUsageMode = useChatStore.getState().inputMode === 'usage'
@@ -165,13 +145,12 @@ describe('Usage Refresh on SDK Completion', () => {
       // Even if banner is visible in store, query won't run if enabled=false
       useChatStore.getState().setInputMode('usage')
 
-      const fetchMock = mock(globalThis.fetch)
-      globalThis.fetch = fetchMock as any
+      const fetchSpy = spyOn(globalThis, 'fetch')
 
       // Query with enabled=false won't execute
       // (This would be the behavior when useUsageQuery({ enabled: false }) is called)
 
-      expect(fetchMock).not.toHaveBeenCalled()
+      expect(fetchSpy).not.toHaveBeenCalled()
     })
   })
 
@@ -180,11 +159,10 @@ describe('Usage Refresh on SDK Completion', () => {
       getAuthTokenSpy.mockReturnValue(undefined)
       useChatStore.getState().setInputMode('usage')
 
-      const fetchMock = mock(globalThis.fetch)
-      globalThis.fetch = fetchMock as any
+      const fetchSpy = spyOn(globalThis, 'fetch')
 
       // Query won't execute without auth token
-      expect(fetchMock).not.toHaveBeenCalled()
+      expect(fetchSpy).not.toHaveBeenCalled()
     })
   })
 })

cli/src/__tests__/unit/agent-mode-toggle.test.ts

@@ -50,12 +50,18 @@ describe('AgentModeToggle - resolveAgentModeClick', () => {
   })
 })
 
+// Extended Date.now type with test helper method
+interface MockDateNow {
+  (): number
+  set: (v: number) => void
+}
+
 describe('useHoverToggle timing (controller)', () => {
   let originalSetTimeout: typeof setTimeout
   let originalClearTimeout: typeof clearTimeout
   let originalNow: typeof Date.now
 
-  let timers: { id: number; ms: number; fn: Function; active: boolean }[]
+  let timers: { id: number; ms: number; fn: () => void; active: boolean }[]
   let nextId: number
 
   const runAll = () => {
@@ -73,21 +79,22 @@ describe('useHoverToggle timing (controller)', () => {
     originalNow = Date.now
 
     let now = 1_000
-    Date.now = () => now
-    ;(Date.now as any).set = (v: number) => {
-      now = v
-    }
+    const mockDateNow: MockDateNow = Object.assign(
+      () => now,
+      { set: (v: number) => { now = v } }
+    )
+    Date.now = mockDateNow
 
-    globalThis.setTimeout = ((fn: Function, ms?: number) => {
+    globalThis.setTimeout = ((fn: () => void, ms?: number) => {
       const id = nextId++
       timers.push({ id, ms: Number(ms ?? 0), fn, active: true })
-      return id as any
-    }) as any
+      return id as unknown as ReturnType<typeof setTimeout>
+    }) as typeof setTimeout
 
-    globalThis.clearTimeout = ((id?: any) => {
-      const rec = timers.find((t) => t.id === id)
+    globalThis.clearTimeout = ((id?: ReturnType<typeof clearTimeout>) => {
+      const rec = timers.find((t) => t.id === (id as unknown as number))
       if (rec) rec.active = false
-    }) as any
+    }) as typeof clearTimeout
   })
 
   afterEach(() => {
@@ -122,7 +129,7 @@ describe('useHoverToggle timing (controller)', () => {
     ctl.closeNow(true)
     ctl.scheduleOpen()
     expect(timers.length).toBe(0)
-    ;(Date.now as any).set(1_000 + REOPEN_SUPPRESS_MS + 1)
+    ;(Date.now as MockDateNow).set(1_000 + REOPEN_SUPPRESS_MS + 1)
     ctl.scheduleOpen()
     expect(timers.length).toBe(1)
     expect(timers[0].ms).toBe(OPEN_DELAY_MS)

cli/src/components/tools/__tests__/run-terminal-command.test.ts

@@ -3,6 +3,17 @@ import { describe, expect, test } from 'bun:test'
 import { parseTerminalOutput, RunTerminalCommandComponent } from '../run-terminal-command'
 
 import type { ToolBlock } from '../types'
+import type { ReactElement } from 'react'
+
+// Use ChatTheme import for proper typing
+import type { ChatTheme } from '../../../types/theme-system'
+
+// Type for the render result content element
+interface RenderContentElement extends ReactElement {
+  props: {
+    timeoutSeconds?: number
+  }
+}
 
 // Helper to create a mock tool block
 const createToolBlock = (
@@ -36,7 +47,7 @@ describe('RunTerminalCommandComponent', () => {
   describe('render', () => {
     test('returns content and collapsedPreview', () => {
       const toolBlock = createToolBlock('ls -la', createJsonOutput('file1\nfile2'))
-      const mockTheme = {} as any
+      const mockTheme = {} as ChatTheme
       const mockOptions = {
         availableWidth: 80,
         indentationOffset: 0,
@@ -146,7 +157,7 @@ describe('RunTerminalCommandComponent', () => {
   })
 
   describe('timeout extraction', () => {
-    const mockTheme = {} as any
+    const mockTheme = {} as ChatTheme
     const mockOptions = {
       availableWidth: 80,
       indentationOffset: 0,
@@ -158,23 +169,23 @@ describe('RunTerminalCommandComponent', () => {
 
       const result = RunTerminalCommandComponent.render(toolBlock, mockTheme, mockOptions)
 
-      expect((result.content as any).props.timeoutSeconds).toBeUndefined()
+      expect((result.content as RenderContentElement).props.timeoutSeconds).toBeUndefined()
     })
 
     test('passes timeoutSeconds for positive timeout', () => {
       const toolBlock = createToolBlock('npm test', createJsonOutput('tests passed'), 60)
 
       const result = RunTerminalCommandComponent.render(toolBlock, mockTheme, mockOptions)
 
-      expect((result.content as any).props.timeoutSeconds).toBe(60)
+      expect((result.content as RenderContentElement).props.timeoutSeconds).toBe(60)
     })
 
     test('passes timeoutSeconds for no timeout (-1)', () => {
       const toolBlock = createToolBlock('long-running-task', createJsonOutput('done'), -1)
 
       const result = RunTerminalCommandComponent.render(toolBlock, mockTheme, mockOptions)
 
-      expect((result.content as any).props.timeoutSeconds).toBe(-1)
+      expect((result.content as RenderContentElement).props.timeoutSeconds).toBe(-1)
     })
   })
 

cli/src/utils/__tests__/message-updater.test.ts

@@ -6,7 +6,13 @@ import {
   DEFAULT_FLUSH_INTERVAL_MS,
 } from '../message-updater'
 
-import type { ChatMessage, ContentBlock } from '../../types/chat'
+import type { ChatMessage, ContentBlock, TextContentBlock } from '../../types/chat'
+
+// Type for metadata with runState for testing
+interface TestMessageMetadata {
+  bashCwd?: string
+  runState?: { id: string }
+}
 
 const baseMessages: ChatMessage[] = [
   {
@@ -50,7 +56,7 @@ describe('createMessageUpdater', () => {
 
     expect(state[0].blocks?.[0]).toEqual(block)
     expect(state[0].isComplete).toBe(true)
-    expect((state[0].metadata as any).runState).toEqual({ id: 'run-1' })
+    expect((state[0].metadata as TestMessageMetadata).runState).toEqual({ id: 'run-1' })
   })
 
   test('setError preserves content and blocks, sets userError, and marks complete', () => {
@@ -75,7 +81,7 @@ describe('createMessageUpdater', () => {
     expect(state[0].userError).toBe('boom')
     expect(state[0].isComplete).toBe(true)
     expect(state[0].blocks).toHaveLength(1)
-    expect((state[0].blocks![0] as any).content).toBe('existing block')
+    expect((state[0].blocks![0] as TextContentBlock).content).toBe('existing block')
   })
 
   test('clearUserError removes userError field from message', () => {
@@ -175,8 +181,8 @@ describe('createBatchedMessageUpdater', () => {
     expect(setMessagesCallCount).toBe(1)
     expect(state[0].content).toBe('first')
     expect(state[0].blocks).toHaveLength(2)
-    expect((state[0].blocks![0] as any).content).toBe('block1')
-    expect((state[0].blocks![1] as any).content).toBe('block2')
+    expect((state[0].blocks![0] as TextContentBlock).content).toBe('block1')
+    expect((state[0].blocks![1] as TextContentBlock).content).toBe('block2')
 
     updater.dispose()
   })
@@ -241,8 +247,8 @@ describe('createBatchedMessageUpdater', () => {
     expect(state[0].isComplete).toBe(true)
     // Existing blocks are preserved and pending block was flushed
     expect(state[0].blocks).toHaveLength(2)
-    expect((state[0].blocks![0] as any).content).toBe('existing block')
-    expect((state[0].blocks![1] as any).content).toBe('pending block')
+    expect((state[0].blocks![0] as TextContentBlock).content).toBe('existing block')
+    expect((state[0].blocks![1] as TextContentBlock).content).toBe('pending block')
   })
 
   test('updates after dispose are applied immediately', () => {
@@ -358,7 +364,7 @@ describe('createBatchedMessageUpdater', () => {
 
     // Both existing and new metadata should be present
     expect(state[0].metadata?.bashCwd).toBe('/existing/path')
-    expect(state[0].metadata?.runState).toEqual({ id: 'run-123' })
+    expect((state[0].metadata as TestMessageMetadata)?.runState).toEqual({ id: 'run-123' })
     expect(state[0].isComplete).toBe(true)
   })