Clean up a few bits in our .agents

Author: jahooma

.agents/sonnet4-agent-builder.ts .agents/agent-builder.ts.agents/sonnet4-agent-builder.ts renamed to .agents/agent-builder.ts

@@ -3,7 +3,7 @@ import { publisher, version } from './constants'
 import type { AgentConfig } from './types/agent-config'
 
 const config: AgentConfig = {
-  id: 'sonnet4-agent-builder',
+  id: 'agent-builder',
   version,
   publisher,
   displayName: 'Bob the Agent Builder',
@@ -17,7 +17,6 @@ const config: AgentConfig = {
     'code_search',
     'spawn_agents',
     'add_message',
-    'set_output',
     'end_turn',
   ],
   subagents: [`codebuff/file-picker@${version}`],
@@ -28,7 +27,6 @@ const config: AgentConfig = {
       type: 'string',
     },
   },
-  outputMode: 'json',
   includeMessageHistory: false,
 
   parentPrompt:
@@ -70,7 +68,7 @@ Create agent templates that are focused, efficient, and well-documented. Always
 
 You have access to three example agents in \`.agents/examples/\` that demonstrate different complexity levels:
 
-1. **Level 1 - Code Reviewer**: Simple agent with basic tools (read_files, write_file, set_output, end_turn)
+1. **Level 1 - Code Reviewer**: Simple agent with basic tools (read_files, write_file, end_turn)
 2. **Level 2 - Test Generator**: Intermediate agent with subagents and handleSteps logic
 3. **Level 3 - Documentation Writer**: Advanced agent with comprehensive tools, multiple subagents, and complex orchestration
 
@@ -170,9 +168,7 @@ IMPORTANT: Always end your response with the end_turn tool when you have complet
     }
 
     if (exampleAgentsResult) {
-      const exampleFiles = exampleAgentsResult
-        .split('\n\n')
-        .filter(Boolean)
+      const exampleFiles = exampleAgentsResult.split('\n\n').filter(Boolean)
 
       // Write example 1
       if (exampleFiles[0]) {

.agents/brainstormer.ts

@@ -58,9 +58,6 @@ Remember: Your goal is to expand thinking, not to provide definitive answers. He
 
   instructionsPrompt:
     'Act as a creative thought partner. Generate multiple perspectives, challenge assumptions, explore alternatives, and ask probing questions to help think through problems more thoroughly.',
-
-  stepPrompt:
-    "Continue brainstorming and exploring ideas. When you're done, use the end_turn tool.",
 }
 
 export default config

.agents/changes-reviewer.ts

@@ -71,13 +71,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?.result || ''
+    const gitDiffOutput = gitDiffResult || ''
     const changedFiles = gitDiffOutput
       .split('\n')
       .map((line) => line.trim())
       .filter((line) => line && !line.startsWith('??') && !line.includes('OSC'))
 
-    const gitStatusOutput = gitStatusResult?.result || ''
+    const gitStatusOutput = gitStatusResult || ''
     const untrackedFiles = gitStatusOutput
       .split('\n')
       .map((line) => line.trim())

.agents/claude4-gemini-thinking.ts

@@ -334,8 +334,7 @@ User cwd: {CODEBUFF_USER_CWD}
           ],
         },
       }
-      const { toolResult: thinkResult } = yield 'STEP'
-      if (thinkResult?.toolName === 'end_turn') break
+      yield 'STEP'
     }
   },
 }

.agents/file-explorer.ts

@@ -53,7 +53,7 @@ const config: AgentConfig = {
     yield {
       toolName: 'set_output',
       args: {
-        results: spawnResult?.result,
+        results: spawnResult,
       },
     }
   },

.agents/file-picker.ts

@@ -25,11 +25,6 @@ const config: AgentConfig = {
 
 You are an expert at finding relevant files in a codebase.
 
-
-{CODEBUFF_TOOLS_PROMPT}
-
-{CODEBUFF_AGENTS_PROMPT}
-
 {CODEBUFF_FILE_TREE_PROMPT}
 
 {CODEBUFF_SYSTEM_INFO_PROMPT}
@@ -40,7 +35,7 @@ In your report, please give an analysis that includes the full paths of files th
   stepPrompt:
     'Do not use the find_files tool or any tools again. Just give your response.',
   handleSteps: function* ({ agentState, prompt, params }) {
-    const toolResult = yield {
+    yield {
       toolName: 'find_files',
       args: { prompt: prompt ?? '' },
     }

.agents/git-committer.ts

@@ -9,23 +9,7 @@ const config: AgentConfig = {
   displayName: 'Git Committer',
   model: 'anthropic/claude-4-sonnet-20250522',
 
-  toolNames: [
-    'read_files',
-    'run_terminal_command',
-    'set_output',
-    'add_message',
-    'end_turn',
-  ],
-
-  outputSchema: {
-    type: 'object',
-    properties: {
-      success: { type: 'boolean' },
-      message: { type: 'string' },
-      commitHash: { type: 'string' },
-    },
-    required: ['success', 'message'],
-  },
+  toolNames: ['read_files', 'run_terminal_command', 'add_message', 'end_turn'],
 
   inputSchema: {
     prompt: {
@@ -46,9 +30,6 @@ const config: AgentConfig = {
   instructionsPrompt:
     'Follow the steps to create a good commit: analyze changes with git diff and git log, read relevant files for context, stage appropriate files, analyze changes, and create a commit with proper formatting including the Codebuff footer.',
 
-  stepPrompt:
-    'Continue with the git commit process. Make sure to end your response by using set_output to output a structured summary of what you committed and whether it was successful.',
-
   handleSteps: function* ({ agentState, prompt, params }: AgentStepContext) {
     // Step 1: Run git diff and git log to analyze changes
     yield {

.agents/planner.ts

@@ -22,20 +22,12 @@ const config: AgentConfig = {
   includeMessageHistory: true,
 
   parentPrompt: 'Agent that formulates a comprehensive plan to a prompt.',
-  systemPrompt: `# Persona: {CODEBUFF_AGENT_NAME}
-
-You are an expert software architect. You are good at creating comprehensive plans to tackle the user request.
-
-{CODEBUFF_TOOLS_PROMPT}
-
-{CODEBUFF_AGENTS_PROMPT}`,
+  systemPrompt: `You are an expert software architect. You are good at creating comprehensive plans to tackle the user request.`,
   instructionsPrompt: `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 </think_deeply>.
 2. Write out your plan in a concise way.
 3. Spawn 1-5 dry run agents to sketch portions of the implementation of the plan. (Important: do not forget to close the tool call with "</spawn_agents>"!)
 4. Synthesize all the information and rewrite the full plan to be the best it can be. Use the end_turn tool.`,
-  stepPrompt:
-    'Do not forget to use the end_turn tool to end your response. Make sure the final plan is the best it can be.',
 }
 
 export default config

.agents/researcher.ts

@@ -33,20 +33,8 @@ In your report, provide a thorough analysis that includes:
 - Code examples or patterns when applicable
 - Actionable recommendations
 
-Always end your response with the end_turn tool.\
-\
-{CODEBUFF_TOOLS_PROMPT}\
-\
-{CODEBUFF_AGENTS_PROMPT}\
-\
-{CODEBUFF_FILE_TREE_PROMPT}\
-\
-{CODEBUFF_SYSTEM_INFO_PROMPT}\
-\
-{CODEBUFF_GIT_CHANGES_PROMPT}`,
-  instructionsPrompt: '',
-  stepPrompt:
-    "Don't forget to end your response with the end_turn tool: <end_turn></end_turn>",
+Always end your response with the end_turn tool.`,
+  stepPrompt: "Don't forget to end your response with the end_turn tool.",
   handleSteps: function* ({ agentState, prompt, params }) {
     yield {
       toolName: 'web_search',

.agents/superagent.ts

@@ -33,11 +33,7 @@ const config: AgentConfig = {
 
   parentPrompt:
     'Superagent that can spawn multiple code editing agents to complete a task.',
-  systemPrompt: `You are an expert orchestrator that can solve any problem, including coding tasks.
-
-{CODEBUFF_TOOLS_PROMPT}
-
-{CODEBUFF_AGENTS_PROMPT}`,
+  systemPrompt: `You are an expert orchestrator that can solve any problem, including coding tasks.`,
   instructionsPrompt: `Answer the user\'s question or complete the task by spawning copies of the base agent.
 
 If you have all the information you need, just write out the response and do not spawn any agents.