fix circular dependencies

Author: charleslien

backend/src/__tests__/run-agent-step-tools.test.ts

@@ -25,7 +25,6 @@ import {
 import * as aisdk from '../llm-apis/vercel-ai-sdk/ai-sdk'
 import { runAgentStep } from '../run-agent-step'
 import { getAllAgentTemplates } from '../templates/agent-registry'
-import * as tools from '../tools'
 import * as websocketAction from '../websockets/websocket-action'
 
 describe('runAgentStep - update_report tool', () => {
@@ -68,27 +67,6 @@ describe('runAgentStep - update_report tool', () => {
       Promise.resolve(true)
     )
 
-    // Mock the readFiles function from tools.ts
-    spyOn(tools, 'readFiles').mockImplementation(
-      async (paths: string[], projectRoot: string) => {
-        const results: Record<string, string | null> = {}
-        paths.forEach((p) => {
-          if (p === 'src/auth.ts') {
-            results[p] = 'export function authenticate() { return true; }'
-          } else if (p === 'src/user.ts') {
-            results[p] = 'export interface User { id: string; name: string; }'
-          } else if (p === 'src/components/auth/login.tsx') {
-            results[p] = 'export function Login() { return <div>Login</div>; }'
-          } else if (p === 'src/utils/validation.ts') {
-            results[p] = 'export function validate() { return true; }'
-          } else {
-            results[p] = null
-          }
-        })
-        return results
-      }
-    )
-
     spyOn(websocketAction, 'requestFiles').mockImplementation(
       async (ws: any, paths: string[]) => {
         const results: Record<string, string | null> = {}

backend/src/__tests__/subagent-streaming.test.ts

@@ -1,3 +1,7 @@
+import type { WebSocket } from 'ws'
+import type { AgentTemplate } from '../templates/types'
+import type { SendSubagentChunk } from '../tools/handlers/tool/spawn-agents'
+
 import { TEST_USER_ID } from '@codebuff/common/constants'
 import { getInitialSessionState } from '@codebuff/common/types/session-state'
 import {
@@ -11,15 +15,10 @@ import {
   mock,
   spyOn,
 } from 'bun:test'
-import { WebSocket } from 'ws'
 
 import * as runAgentStep from '../run-agent-step'
 import * as agentRegistryModule from '../templates/agent-registry'
-import { AgentTemplate } from '../templates/types'
-import {
-  handleSpawnAgents,
-  SendSubagentChunk,
-} from '../tools/handlers/spawn-agents'
+import { handleSpawnAgents } from '../tools/handlers/tool/spawn-agents'
 import * as loggerModule from '../util/logger'
 import { mockFileContext, MockWebSocket } from './test-utils'
 

backend/src/templates/agents/agent-builder.ts

@@ -103,6 +103,7 @@ Every agent template must include these fields:
 Use these placeholders in prompts:
 - {CODEBUFF_AGENT_NAME} - Agent name
 - {CODEBUFF_TOOLS_PROMPT} - Available tools description
+- {CODEBUFF_AGENTS_PROMPT} - Available agents description
 - {CODEBUFF_FILE_TREE_PROMPT} - File tree information
 - {CODEBUFF_SYSTEM_INFO_PROMPT} - System information
 - {CODEBUFF_PROJECT_ROOT} - Project root directory

backend/src/templates/agents/archive/dry-run.ts

@@ -22,7 +22,11 @@ export const dryRun = (model: Model): Omit<AgentTemplate, 'id'> => ({
 
   systemPrompt: `# Persona: ${PLACEHOLDER.AGENT_NAME} - The Dry Run Specialist
 
-You are an expert software engineer who specializes in dry runs - a form of thinking and planning where you mentally walk through implementation steps before actually coding. You are good at implementing plans through careful analysis and step-by-step reasoning.\n\n${PLACEHOLDER.TOOLS_PROMPT}`,
+You are an expert software engineer who specializes in dry runs - a form of thinking and planning where you mentally walk through implementation steps before actually coding. You are good at implementing plans through careful analysis and step-by-step reasoning.
+
+${PLACEHOLDER.TOOLS_PROMPT}
+
+${PLACEHOLDER.AGENTS_PROMPT}`,
 
   userInputPrompt: `Do a dry run of implementing just the specified portion of the plan. (Do NOT sketch out the full plan!)
 

backend/src/templates/agents/file-picker.ts

@@ -35,6 +35,7 @@ You are an expert at finding relevant files in a codebase.
 \n\n` +
     [
       PLACEHOLDER.TOOLS_PROMPT,
+      PLACEHOLDER.AGENTS_PROMPT,
       PLACEHOLDER.FILE_TREE_PROMPT,
       PLACEHOLDER.SYSTEM_INFO_PROMPT,
       PLACEHOLDER.GIT_CHANGES_PROMPT,

backend/src/templates/agents/planner.ts

@@ -26,7 +26,11 @@ export const planner = (model: Model): Omit<AgentTemplate, 'id'> => ({
 
   systemPrompt: `# Persona: ${PLACEHOLDER.AGENT_NAME}
 
-You are an expert software architect. You are good at creating comprehensive plans to tackle the user request.\n\n${PLACEHOLDER.TOOLS_PROMPT}`,
+You are an expert software architect. You are good at creating comprehensive plans to tackle the user request.
+
+${PLACEHOLDER.TOOLS_PROMPT}
+
+${PLACEHOLDER.AGENTS_PROMPT}`,
 
   userInputPrompt: `Steps for your response:
 1. Use the <think_deeply> tool to think through cruxes for the plan, and tricky cases. Consider alternative approaches. Be sure to close the tool call with ${closeXml('think_deeply')}.

backend/src/templates/agents/researcher.ts

@@ -47,6 +47,7 @@ In your report, provide a thorough analysis that includes:
 Always end your response with the end_turn tool.\\n\\n` +
     [
       PLACEHOLDER.TOOLS_PROMPT,
+      PLACEHOLDER.AGENTS_PROMPT,
       PLACEHOLDER.FILE_TREE_PROMPT,
       PLACEHOLDER.SYSTEM_INFO_PROMPT,
       PLACEHOLDER.GIT_CHANGES_PROMPT,

backend/src/templates/agents/reviewer.ts

@@ -24,7 +24,10 @@ export const reviewer = (model: Model): Omit<AgentTemplate, 'id'> => ({
   systemPrompt: `# Persona: ${PLACEHOLDER.AGENT_NAME}
 
 You are an expert programmer who can articulate very clear feedback on code changes.
-${PLACEHOLDER.TOOLS_PROMPT}`,
+
+${PLACEHOLDER.TOOLS_PROMPT}
+
+${PLACEHOLDER.AGENTS_PROMPT}`,
 
   userInputPrompt: `Your task is to provide helpful feedback on the last file changes made by the assistant. You should critique the code changes made recently in the above conversation.
 

backend/src/templates/agents/superagent.ts

@@ -40,6 +40,8 @@ export const superagent = (
     `You are an expert orchestrator that can solve any problem, including coding tasks.
 
 ${PLACEHOLDER.TOOLS_PROMPT}
+
+${PLACEHOLDER.AGENTS_PROMPT}
 `.trim(),
   userInputPrompt: `
 Answer the user's question or complete the task by spawning copies of the base agent.

backend/src/templates/agents/thinker.ts

@@ -24,7 +24,10 @@ export const thinker = (model: Model): Omit<AgentTemplate, 'id'> => ({
   systemPrompt: `# Persona: ${PLACEHOLDER.AGENT_NAME}
 
 You are an expert programmer.
-${PLACEHOLDER.TOOLS_PROMPT}`,
+
+${PLACEHOLDER.TOOLS_PROMPT}
+
+${PLACEHOLDER.AGENTS_PROMPT}`,
 
   userInputPrompt: `
 Think deeply, step by step, about the user request and how best to approach it.