refactor: extract test utilities and remove unused helpers

brandonkachen · brandonkachen · commit 5d1471ddb4c6 · 2025-12-01T22:31:59.000-08:00
- Extract createMessage, createToolMessage, createMockLogger to test-utils.ts

- Remove unused functions from implementor-helpers.ts (getLatestCommentary, countEdits, getEditedFiles, getEditedFileSnippets, getTotalStats)

- Remove unused imports from implementor-row.tsx and message-block.tsx
diff --git a/.agents/__tests__/context-pruner.test.ts b/.agents/__tests__/context-pruner.test.ts
@@ -1,8 +1,15 @@
 import { describe, test, expect, beforeEach } from 'bun:test'
 
 import contextPruner from '../context-pruner'
+import {
+  createMessage,
+  createTerminalToolMessage,
+  createLargeToolMessage,
+  createToolMessage,
+  createMockLogger,
+} from './test-utils'
 
-import type { Message, ToolMessage } from '../types/util-types'
+import type { Message } from '../types/util-types'
 
 describe('context-pruner handleSteps', () => {
   let mockAgentState: any
@@ -13,62 +20,11 @@ describe('context-pruner handleSteps', () => {
     }
   })
 
-  const createMessage = (
-    role: 'user' | 'assistant',
-    content: string,
-  ): Message => ({
-    role,
-    content,
-  })
-
-  const createTerminalToolMessage = (
-    command: string,
-    output: string,
-    exitCode?: number,
-  ): ToolMessage => ({
-    role: 'tool',
-    toolCallId: 'test-id',
-    toolName: 'run_terminal_command',
-    content: [
-      {
-        type: 'json',
-        value: {
-          command,
-          stdout: output,
-          ...(exitCode !== undefined && { exitCode }),
-        },
-      },
-    ],
-  })
-
-  const createLargeToolMessage = (
-    toolName: string,
-    largeData: string,
-  ): ToolMessage => ({
-    role: 'tool',
-    toolCallId: 'test-id',
-    toolName,
-    content: [
-      {
-        type: 'json',
-        value: {
-          data: largeData,
-        },
-      },
-    ],
-  })
-
   const runHandleSteps = (messages: Message[]) => {
     mockAgentState.messageHistory = messages
-    const mockLogger = {
-      debug: () => {},
-      info: () => {},
-      warn: () => {},
-      error: () => {},
-    }
     const generator = contextPruner.handleSteps!({
       agentState: mockAgentState,
-      logger: mockLogger,
+      logger: createMockLogger(),
     })
     const results: any[] = []
     let result = generator.next()
@@ -299,43 +255,11 @@ describe('context-pruner edge cases', () => {
     }
   })
 
-  const createMessage = (
-    role: 'user' | 'assistant',
-    content: string,
-  ): Message => ({
-    role,
-    content,
-  })
-
-  const createTerminalToolMessage = (
-    command: string,
-    output: string,
-  ): ToolMessage => ({
-    role: 'tool',
-    toolCallId: 'test-id',
-    toolName: 'run_terminal_command',
-    content: [
-      {
-        type: 'json',
-        value: {
-          command,
-          stdout: output,
-        },
-      },
-    ],
-  })
-
   const runHandleSteps = (messages: Message[]) => {
     mockAgentState.messageHistory = messages
-    const mockLogger = {
-      debug: () => {},
-      info: () => {},
-      warn: () => {},
-      error: () => {},
-    }
     const generator = contextPruner.handleSteps!({
       agentState: mockAgentState,
-      logger: mockLogger,
+      logger: createMockLogger(),
     })
     const results: ReturnType<typeof generator.next>['value'][] = []
     let result = generator.next()
@@ -441,23 +365,6 @@ describe('context-pruner edge cases', () => {
     // Create content large enough to exceed 200k token limit to trigger pruning
     const largeContent = 'x'.repeat(150000)
 
-    const createToolMessage = (
-      toolName: string,
-      size: number,
-    ): ToolMessage => ({
-      role: 'tool',
-      toolCallId: 'test-id',
-      toolName,
-      content: [
-        {
-          type: 'json',
-          value: {
-            data: 'a'.repeat(size),
-          },
-        },
-      ],
-    })
-
     const messages = [
       createMessage('user', largeContent),
       createMessage('assistant', largeContent),
@@ -508,7 +415,7 @@ describe('context-pruner edge cases', () => {
       },
     ]
 
-    testCases.forEach(({ content, shouldRemove }, index) => {
+    testCases.forEach(({ content, shouldRemove }) => {
       const messages = [
         createMessage('user', 'Hello'),
         createMessage('assistant', content),
diff --git a/.agents/__tests__/test-utils.ts b/.agents/__tests__/test-utils.ts
@@ -0,0 +1,70 @@
+import type { Message, ToolMessage } from '../types/util-types'
+
+export const createMessage = (
+  role: 'user' | 'assistant',
+  content: string,
+): Message => ({
+  role,
+  content,
+})
+
+export const createTerminalToolMessage = (
+  command: string,
+  output: string,
+  exitCode?: number,
+): ToolMessage => ({
+  role: 'tool',
+  toolCallId: 'test-id',
+  toolName: 'run_terminal_command',
+  content: [
+    {
+      type: 'json',
+      value: {
+        command,
+        stdout: output,
+        ...(exitCode !== undefined && { exitCode }),
+      },
+    },
+  ],
+})
+
+export const createLargeToolMessage = (
+  toolName: string,
+  largeData: string,
+): ToolMessage => ({
+  role: 'tool',
+  toolCallId: 'test-id',
+  toolName,
+  content: [
+    {
+      type: 'json',
+      value: {
+        data: largeData,
+      },
+    },
+  ],
+})
+
+export const createToolMessage = (
+  toolName: string,
+  size: number,
+): ToolMessage => ({
+  role: 'tool',
+  toolCallId: 'test-id',
+  toolName,
+  content: [
+    {
+      type: 'json',
+      value: {
+        data: 'a'.repeat(size),
+      },
+    },
+  ],
+})
+
+export const createMockLogger = () => ({
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+})
diff --git a/cli/src/components/implementor-row.tsx b/cli/src/components/implementor-row.tsx
@@ -9,7 +9,6 @@ import {
   getImplementorDisplayName,
   getImplementorIndex,
   getFileStatsFromBlocks,
-  type TimelineItem,
   type FileStats,
 } from '../utils/implementor-helpers'
 import { computeSmartColumns } from '../utils/layout-helpers'
diff --git a/cli/src/components/message-block.tsx b/cli/src/components/message-block.tsx
@@ -1,4 +1,3 @@
-import { pluralize } from '@codebuff/common/util/string'
 import { TextAttributes } from '@opentui/core'
 import React, { memo, useCallback, useMemo, useState, type ReactNode } from 'react'
 
@@ -64,8 +63,6 @@ interface MessageBlockProps {
   }) => void
 }
 
-import { BORDER_CHARS } from '../utils/ui-constants'
-
 export const MessageBlock: React.FC<MessageBlockProps> = ({
   messageId,
   blocks,
diff --git a/cli/src/utils/implementor-helpers.ts b/cli/src/utils/implementor-helpers.ts
@@ -1,7 +1,6 @@
 import type {
   AgentContentBlock,
   ContentBlock,
-  TextContentBlock,
   ToolContentBlock,
 } from '../types/chat'
 
@@ -112,116 +111,6 @@ export function extractValueForKey(output: string, key: string): string | null {
   return null
 }
 
-/**
- * Get the latest commentary (text block content) from agent blocks
- * Returns a single-line string with newlines replaced by spaces
- */
-export function getLatestCommentary(
-  blocks: ContentBlock[] | undefined,
-): string | undefined {
-  if (!blocks || blocks.length === 0) return undefined
-
-  // Find the last text block that isn't reasoning
-  for (let i = blocks.length - 1; i >= 0; i--) {
-    const block = blocks[i]
-    if (block.type === 'text' && block.textType !== 'reasoning') {
-      // Replace newlines with spaces and collapse multiple spaces
-      const content = block.content
-        .replace(/\n+/g, ' ')
-        .replace(/\s+/g, ' ')
-        .trim()
-      if (content) return content
-    }
-  }
-  return undefined
-}
-
-/**
- * Count edit operations (str_replace, write_file tools)
- */
-export function countEdits(blocks: ContentBlock[] | undefined): number {
-  if (!blocks || blocks.length === 0) return 0
-
-  return blocks.filter(
-    (block) =>
-      block.type === 'tool' &&
-      EDIT_TOOL_NAMES.includes(block.toolName as (typeof EDIT_TOOL_NAMES)[number]),
-  ).length
-}
-
-/**
- * Get list of unique file paths edited by the agent
- */
-export function getEditedFiles(blocks: ContentBlock[] | undefined): string[] {
-  if (!blocks || blocks.length === 0) return []
-
-  const files = new Set<string>()
-
-  for (const block of blocks) {
-    if (
-      block.type === 'tool' &&
-      EDIT_TOOL_NAMES.includes(block.toolName as (typeof EDIT_TOOL_NAMES)[number])
-    ) {
-      const filePath = extractFilePath(block)
-      if (filePath) {
-        files.add(filePath)
-      }
-    }
-  }
-
-  return Array.from(files)
-}
-
-export interface FileSnippet {
-  path: string
-  snippet?: string
-  isCreate: boolean
-}
-
-/**
- * Get list of files with content snippets
- */
-export function getEditedFileSnippets(blocks: ContentBlock[] | undefined): FileSnippet[] {
-  if (!blocks || blocks.length === 0) return []
-
-  const visited = new Set<string>()
-  const results: FileSnippet[] = []
-
-  for (const block of blocks) {
-    if (
-      block.type === 'tool' &&
-      EDIT_TOOL_NAMES.includes(block.toolName as (typeof EDIT_TOOL_NAMES)[number])
-    ) {
-      const filePath = extractFilePath(block)
-      if (filePath && !visited.has(filePath)) {
-        visited.add(filePath)
-        
-        const diff = extractDiff(block)
-        let snippet: string | undefined
-        if (diff) {
-          // Extract first non-header line as preview
-          const lines = diff.split('\n')
-          const interestingLine = lines.find(l => 
-            (l.startsWith('+') || l.startsWith('-')) && 
-            !l.startsWith('+++') && !l.startsWith('---')
-          )
-          if (interestingLine) {
-            snippet = interestingLine.trim().slice(0, 50)
-          }
-        }
-
-        results.push({
-          path: filePath,
-          isCreate: isCreateFile(block),
-          snippet
-        })
-      }
-    }
-  }
-
-  return results
-}
-
 /**
  * Extract file path from tool block
  */
@@ -448,20 +337,6 @@ export function getFileStatsFromBlocks(blocks: ContentBlock[] | undefined): File
   return Array.from(fileMap.values())
 }
 
-/**
- * Get total stats across all files
- */
-export function getTotalStats(fileStats: FileStats[]): DiffStats {
-  return fileStats.reduce(
-    (acc, file) => ({
-      linesAdded: acc.linesAdded + file.stats.linesAdded,
-      linesRemoved: acc.linesRemoved + file.stats.linesRemoved,
-      hunks: acc.hunks + file.stats.hunks,
-    }),
-    { linesAdded: 0, linesRemoved: 0, hunks: 0 }
-  )
-}
-
 /**
  * Build an activity timeline from agent blocks
  * Interleaves commentary (text blocks) and edits (tool calls)
