Fix types (tool components cannot return null anymore)

Author: jahooma

cli/src/components/tools/code-search.tsx

@@ -13,7 +13,7 @@ import type { ToolRenderConfig } from './types'
 export const CodeSearchComponent = defineToolComponent({
   toolName: 'code_search',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     const input = toolBlock.input as any
     const pattern = input?.pattern ?? ''
     const flags = input?.flags ?? ''

cli/src/components/tools/glob.tsx

@@ -11,7 +11,7 @@ import type { ToolRenderConfig } from './types'
 export const GlobComponent = defineToolComponent({
   toolName: 'glob',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     const input = toolBlock.input as any
     const pattern = input?.pattern ?? ''
     const cwd = input?.cwd ?? ''
@@ -39,7 +39,7 @@ export const GlobComponent = defineToolComponent({
     }
 
     if (!pattern) {
-      return null
+      return { content: null }
     }
 
     // Build single-line summary

cli/src/components/tools/list-directory.tsx

@@ -13,7 +13,7 @@ import type { ToolRenderConfig } from './types'
 export const ListDirectoryComponent = defineToolComponent({
   toolName: 'list_directory',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     const input = toolBlock.input as any
 
     // Extract directories from input
@@ -35,19 +35,14 @@ export const ListDirectoryComponent = defineToolComponent({
     }
 
     if (directories.length === 0) {
-      return null
+      return { content: null }
     }
 
     // Format directory list
     const description = directories.join(', ')
 
     return {
-      content: (
-        <SimpleToolCallItem
-          name="List"
-          description={description}
-        />
-      ),
+      content: <SimpleToolCallItem name="List" description={description} />,
     }
   },
 })

cli/src/components/tools/read-files.tsx

@@ -1,7 +1,7 @@
 import { TextAttributes } from '@opentui/core'
 
-import { useTheme } from '../../hooks/use-theme'
 import { defineToolComponent } from './types'
+import { useTheme } from '../../hooks/use-theme'
 
 import type { ToolRenderConfig } from './types'
 
@@ -47,7 +47,7 @@ const ReadFilesSimpleToolCallItem = ({
 export const ReadFilesComponent = defineToolComponent({
   toolName: 'read_files',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     const input = toolBlock.input as any
 
     // Extract file paths from input
@@ -60,7 +60,7 @@ export const ReadFilesComponent = defineToolComponent({
     }
 
     if (filePaths.length === 0) {
-      return null
+      return { content: null }
     }
 
     return {

cli/src/components/tools/read-subtree.tsx

@@ -1,7 +1,7 @@
+import { SimpleToolCallItem } from './tool-call-item'
 import { defineToolComponent } from './types'
 
 import type { ToolRenderConfig } from './types'
-import { SimpleToolCallItem } from './tool-call-item'
 
 /**
  * UI component for read_subtree tool.
@@ -11,7 +11,7 @@ import { SimpleToolCallItem } from './tool-call-item'
 export const ReadSubtreeComponent = defineToolComponent({
   toolName: 'read_subtree',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     const input = toolBlock.input as any
     const paths: string[] = Array.isArray(input?.paths)
       ? input.paths.filter((p: any) => typeof p === 'string' && p.trim().length)

cli/src/components/tools/run-terminal-command.tsx

@@ -2,10 +2,10 @@ import { TextAttributes } from '@opentui/core'
 import { useState } from 'react'
 
 import { defineToolComponent } from './types'
-import { useTheme } from '../../hooks/use-theme'
-import { Button } from '../button'
 import { useTerminalDimensions } from '../../hooks/use-terminal-dimensions'
+import { useTheme } from '../../hooks/use-theme'
 import { getLastNVisualLines } from '../../utils/text-layout'
+import { Button } from '../button'
 
 import type { ToolRenderConfig } from './types'
 
@@ -17,17 +17,13 @@ import type { ToolRenderConfig } from './types'
 export const RunTerminalCommandComponent = defineToolComponent({
   toolName: 'run_terminal_command',
 
-  render(toolBlock, theme): ToolRenderConfig | null {
+  render(toolBlock, theme): ToolRenderConfig {
     // Extract command from input
     const command =
       toolBlock.input && typeof (toolBlock.input as any).command === 'string'
         ? (toolBlock.input as any).command.trim()
         : null
 
-    if (!command) {
-      return null
-    }
-
     // Extract output if available
     const output = toolBlock.output ? toolBlock.output.trim() : null
 

cli/src/components/tools/str-replace.tsx

@@ -1,8 +1,8 @@
 import { TextAttributes } from '@opentui/core'
 
-import { useTheme } from '../../hooks/use-theme'
-import { defineToolComponent } from './types'
 import { DiffViewer } from './diff-viewer'
+import { defineToolComponent } from './types'
+import { useTheme } from '../../hooks/use-theme'
 
 import type { ToolRenderConfig } from './types'
 
@@ -82,7 +82,7 @@ const EditBody = ({ name, filePath, diffText }: EditBodyProps) => {
 export const StrReplaceComponent = defineToolComponent({
   toolName: 'str_replace',
 
-  render(toolBlock, _theme, options): ToolRenderConfig | null {
+  render(toolBlock, _theme, options): ToolRenderConfig {
     const outputStr =
       typeof toolBlock.output === 'string' ? toolBlock.output : ''
     const diff =

cli/src/components/tools/write-file.tsx

@@ -1,13 +1,14 @@
+import { StrReplaceComponent } from './str-replace'
 import { defineToolComponent } from './types'
+
 import type { ToolRenderConfig } from './types'
-import { StrReplaceComponent } from './str-replace'
 
 // Reuse the extraction and rendering logic from str-replace by delegating
 
 export const WriteFileComponent = defineToolComponent({
   toolName: 'write_file',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     // Call the str_replace renderer with the same block shape
     // since both tools share identical UI and output structure.
     return StrReplaceComponent.render(toolBlock as any, theme, options)

cli/src/components/tools/write-todos.tsx

@@ -1,7 +1,8 @@
 import { TextAttributes } from '@opentui/core'
 
-import { useTheme } from '../../hooks/use-theme'
 import { defineToolComponent } from './types'
+import { useTheme } from '../../hooks/use-theme'
+
 import type { ToolRenderConfig } from './types'
 
 interface WriteTodosItemProps {
@@ -68,7 +69,7 @@ const WriteTodosItem = ({ todos }: WriteTodosItemProps) => {
 export const WriteTodosComponent = defineToolComponent({
   toolName: 'write_todos',
 
-  render(toolBlock, theme, options): ToolRenderConfig | null {
+  render(toolBlock, theme, options): ToolRenderConfig {
     const { input } = toolBlock
 
     // Extract todos from input
@@ -84,7 +85,7 @@ export const WriteTodosComponent = defineToolComponent({
     }
 
     if (todos.length === 0) {
-      return null
+      return { content: null }
     }
 
     return {