Reorder tool list to be at top of tools.d.ts. Read it from file so it's formatted nicely

Author: jahooma

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

@@ -6,7 +6,7 @@ import {
   openrouterModels,
   AGENT_CONFIG_FILE,
 } from '@codebuff/common/constants'
-import { compileToolDefinitions } from '@codebuff/common/tools/compile-tool-definitions'
+
 import { AgentTemplateTypes } from '@codebuff/common/types/session-state'
 import z from 'zod/v4'
 
@@ -16,7 +16,6 @@ import type { ToolName } from '@codebuff/common/tools/constants'
 
 const TEMPLATE_RELATIVE_PATH =
   `../../../../common/src/util/${AGENT_CONFIG_FILE}` as const
-
 // Import to validate path exists at compile time
 import(TEMPLATE_RELATIVE_PATH)
 
@@ -37,7 +36,18 @@ export const agentBuilder = (model: Model): Omit<AgentTemplate, 'id'> => {
     console.warn(`Could not read ${AGENT_CONFIG_FILE}:`, error)
     agentTemplateContent = '// Agent template types not available'
   }
-  const toolDefinitionsContent = compileToolDefinitions()
+  // Read the tools.d.ts content from common package
+  let toolDefinitionsContent = ''
+  try {
+    const toolsPath = path.join(
+      __dirname,
+      '../../../../common/src/util/tools.d.ts',
+    )
+    toolDefinitionsContent = fs.readFileSync(toolsPath, 'utf8')
+  } catch (error) {
+    console.warn(`Could not read tools.d.ts from common:`, error)
+    toolDefinitionsContent = '// Tool definitions not available'
+  }
 
   return {
     displayName: 'Bob the Agent Builder',
@@ -182,7 +192,7 @@ IMPORTANT: Always end your response with the end_turn tool when you have complet
         },
       }
 
-      // Step 3: Write the tool definitions file
+      // Step 3: Write the tool definitions file (copy from existing tools.d.ts)
       yield {
         toolName: 'write_file',
         args: {

common/src/tools/compile-tool-definitions.ts

@@ -36,9 +36,7 @@ export interface ${toPascalCase(toolName)}Params ${typeDefinition}`
     .map(([toolName]) => `  '${toolName}': ${toPascalCase(toolName)}Params`)
     .join('\n')
 
-  return `${toolInterfaces}
-
-/**
+  return `/**
  * Union type of all available tool names
  */
 export type ToolName = ${toolUnion}
@@ -50,6 +48,8 @@ export interface ToolParamsMap {
 ${toolParamsMap}
 }
 
+${toolInterfaces}
+
 /**
  * Get parameters type for a specific tool
  */

common/src/util/tools.d.ts

@@ -1,3 +1,56 @@
+/**
+ * Union type of all available tool names
+ */
+export type ToolName =
+  | 'add_message'
+  | 'add_subgoal'
+  | 'browser_logs'
+  | 'code_search'
+  | 'create_plan'
+  | 'end_turn'
+  | 'find_files'
+  | 'read_docs'
+  | 'read_files'
+  | 'run_file_change_hooks'
+  | 'run_terminal_command'
+  | 'send_agent_message'
+  | 'set_messages'
+  | 'set_output'
+  | 'spawn_agents'
+  | 'spawn_agents_async'
+  | 'str_replace'
+  | 'think_deeply'
+  | 'update_subgoal'
+  | 'web_search'
+  | 'write_file'
+
+/**
+ * Map of tool names to their parameter types
+ */
+export interface ToolParamsMap {
+  add_message: AddMessageParams
+  add_subgoal: AddSubgoalParams
+  browser_logs: BrowserLogsParams
+  code_search: CodeSearchParams
+  create_plan: CreatePlanParams
+  end_turn: EndTurnParams
+  find_files: FindFilesParams
+  read_docs: ReadDocsParams
+  read_files: ReadFilesParams
+  run_file_change_hooks: RunFileChangeHooksParams
+  run_terminal_command: RunTerminalCommandParams
+  send_agent_message: SendAgentMessageParams
+  set_messages: SetMessagesParams
+  set_output: SetOutputParams
+  spawn_agents: SpawnAgentsParams
+  spawn_agents_async: SpawnAgentsAsyncParams
+  str_replace: StrReplaceParams
+  think_deeply: ThinkDeeplyParams
+  update_subgoal: UpdateSubgoalParams
+  web_search: WebSearchParams
+  write_file: WriteFileParams
+}
+
 /**
  * Add a new message to the conversation history. To be used for complex requests that can't be solved in a single step, as you may forget what happened!
  */
@@ -225,59 +278,6 @@ export interface WriteFileParams {
   content: string
 }
 
-/**
- * Union type of all available tool names
- */
-export type ToolName =
-  | 'add_message'
-  | 'add_subgoal'
-  | 'browser_logs'
-  | 'code_search'
-  | 'create_plan'
-  | 'end_turn'
-  | 'find_files'
-  | 'read_docs'
-  | 'read_files'
-  | 'run_file_change_hooks'
-  | 'run_terminal_command'
-  | 'send_agent_message'
-  | 'set_messages'
-  | 'set_output'
-  | 'spawn_agents'
-  | 'spawn_agents_async'
-  | 'str_replace'
-  | 'think_deeply'
-  | 'update_subgoal'
-  | 'web_search'
-  | 'write_file'
-
-/**
- * Map of tool names to their parameter types
- */
-export interface ToolParamsMap {
-  add_message: AddMessageParams
-  add_subgoal: AddSubgoalParams
-  browser_logs: BrowserLogsParams
-  code_search: CodeSearchParams
-  create_plan: CreatePlanParams
-  end_turn: EndTurnParams
-  find_files: FindFilesParams
-  read_docs: ReadDocsParams
-  read_files: ReadFilesParams
-  run_file_change_hooks: RunFileChangeHooksParams
-  run_terminal_command: RunTerminalCommandParams
-  send_agent_message: SendAgentMessageParams
-  set_messages: SetMessagesParams
-  set_output: SetOutputParams
-  spawn_agents: SpawnAgentsParams
-  spawn_agents_async: SpawnAgentsAsyncParams
-  str_replace: StrReplaceParams
-  think_deeply: ThinkDeeplyParams
-  update_subgoal: UpdateSubgoalParams
-  web_search: WebSearchParams
-  write_file: WriteFileParams
-}
-
 /**
  * Get parameters type for a specific tool
  */