Merge some type files

Author: jahooma

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

@@ -2,7 +2,7 @@ import { describe, test, expect, beforeEach } from 'bun:test'
 
 import contextPruner from '../context-pruner'
 
-import type { Message } from '../types/codebuff-message'
+import type { Message } from '../types/util-types'
 
 describe('context-pruner handleSteps', () => {
   let mockAgentState: any

.agents/changes-reviewer.ts

@@ -74,13 +74,13 @@ Use the following guidelines to review the changes and suggest improvements:
     }
 
     // Step 4: Extract file paths from git diff and status output
-    const gitDiffOutput = gitDiffResult || ''
+    const gitDiffOutput = JSON.stringify(gitDiffResult ?? [])
     const changedFiles = gitDiffOutput
       .split('\n')
       .map((line) => line.trim())
       .filter((line) => line && !line.startsWith('??') && !line.includes('OSC'))
 
-    const gitStatusOutput = gitStatusResult || ''
+    const gitStatusOutput = JSON.stringify(gitStatusResult ?? [])
     const untrackedFiles = gitStatusOutput
       .split('\n')
       .map((line) => line.trim())

.agents/context-pruner.ts

@@ -1,7 +1,7 @@
 import { publisher } from './constants'
 
 import type { AgentDefinition, ToolCall } from './types/agent-definition'
-import type { Message, ToolMessage } from './types/codebuff-message'
+import type { Message, ToolMessage } from './types/util-types'
 import type { CodebuffToolMessage } from '@codebuff/common/tools/list'
 
 const definition: AgentDefinition = {

.agents/types/agent-definition.ts

@@ -14,8 +14,7 @@
  *   export default definition
  */
 
-import type { Message } from './codebuff-message'
-import { ToolResultOutput } from './content-part'
+import type { Message, ToolResultOutput, JsonObjectSchema } from './util-types'
 import type * as Tools from './tools'
 type ToolName = Tools.ToolName
 
@@ -226,26 +225,6 @@ export type ToolCall<T extends ToolName = ToolName> = {
   }
 }[T]
 
-/**
- * JSON Schema definition (for prompt schema or output schema)
- */
-export type JsonSchema = {
-  type?:
-    | 'object'
-    | 'array'
-    | 'string'
-    | 'number'
-    | 'boolean'
-    | 'null'
-    | 'integer'
-  description?: string
-  properties?: Record<string, JsonSchema | boolean>
-  required?: string[]
-  enum?: Array<string | number | boolean | null>
-  [k: string]: unknown
-}
-export type JsonObjectSchema = JsonSchema & { type: 'object' }
-
 // ============================================================================
 // Available Tools
 // ============================================================================

.agents/types/codebuff-message.ts

@@ -1,4 +1,4 @@
-import type { Message } from './codebuff-message'
+import type { Message } from './util-types'
 
 /**
  * Union type of all available tool names