Refactor best-of-n agent files

Author: jahooma

.agents/base2/base2.ts

@@ -14,7 +14,11 @@ export const createBase2: (
     bestOfNFast?: boolean
   },
 ) => Omit<SecretAgentDefinition, 'id'> = (mode, options) => {
-  const { hasNoValidation = false, bestOfN = false, bestOfNFast = false } = options ?? {}
+  const {
+    hasNoValidation = false,
+    bestOfN = false,
+    bestOfNFast = false,
+  } = options ?? {}
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
 
@@ -58,8 +62,8 @@ export const createBase2: (
       'researcher-web',
       'researcher-docs',
       'commander',
-      bestOfN && 'base2-best-of-n-orchestrator',
-      bestOfNFast && 'base2-best-of-n-fast-orchestrator',
+      bestOfN && 'best-of-n-orchestrator',
+      bestOfNFast && 'best-of-n-orchestrator-fast',
       isMax && 'base2-gpt-5-worker',
       'context-pruner',
     ),
@@ -150,10 +154,11 @@ ${buildArray(
   isFast &&
     `- Use the write_todos tool to write out your step-by-step implementation plan.${hasNoValidation ? '' : ' You should include at least one step to validate/test your changes: be specific about whether to typecheck, run tests, run lints, etc.'}`,
   bestOfN &&
-    `- You must spawn the base2-best-of-n-orchestrator agent to implement the code changes, since it will generate multiple implementation proposals and select the best one, which the user wants you to do.`,
+    `- You must spawn the best-of-n-orchestrator agent to implement the code changes, since it will generate multiple implementation proposals and select the best one, which the user wants you to do.`,
   bestOfNFast &&
-    `- You must spawn the base2-best-of-n-fast-orchestrator agent to implement the code changes, since it will generate multiple implementation proposals and select the best one, which the user wants you to do.`,
-  !bestOfN && !bestOfNFast &&
+    `- You must spawn the best-of-n-orchestrator-fast agent to implement the code changes, since it will generate multiple implementation proposals and select the best one, which the user wants you to do.`,
+  !bestOfN &&
+    !bestOfNFast &&
     isFast &&
     `- Use the str_replace or write_file tool to make the changes. (Pause after making all the changes to see the tool results of your edits and double check they went through correctly.)`,
   isMax &&
@@ -162,7 +167,7 @@ ${buildArray(
     `- Test your changes${isFast ? ' briefly' : ''} by running appropriate validation commands for the project (e.g. typechecks, tests, lints, etc.). You may have to explore the project to find the appropriate commands. Don't skip this step!`,
   `- Inform the user that you have completed the task in one sentence or a few short bullet points. Don't create any markdown summary files, unless asked by the user. If you already finished the user request and said you're done, then don't say anything else.`,
 ).join('\n')}`,
-    stepPrompt: `${isMax ? "Keep working until the user's request is completely satisfied. " : ''}${bestOfN ? "You must spawn the base2-best-of-n-orchestrator agent to implement the code changes. Don't forget to do this! " : ''}After completing the user request, summarize your changes in a sentence or a few short bullet points. Do not create any summary markdown files or example documentation files, unless asked by the user. If you already summarized your changes, then end turn and don't say anything else.`,
+    stepPrompt: `${isMax ? "Keep working until the user's request is completely satisfied. " : ''}${bestOfN ? "You must spawn the best-of-n-orchestrator agent to implement the code changes. Don't forget to do this! " : ''}After completing the user request, summarize your changes in a sentence or a few short bullet points. Do not create any summary markdown files or example documentation files, unless asked by the user. If you already summarized your changes, then end turn and don't say anything else.`,
     handleSteps: function* ({ params }) {
       let steps = 0
       while (true) {

.agents/base2/best-of-n/base2-best-of-n-editor.ts

@@ -0,0 +1,8 @@
+import { createBestOfNImplementor } from './best-of-n-implementor'
+
+import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
+
+export default {
+  ...createBestOfNImplementor({ model: 'gpt-5' }),
+  id: 'best-of-n-implementor-gpt-5',
+} satisfies SecretAgentDefinition

.agents/base2/best-of-n/base2-implementor-step-gpt-5.ts

@@ -1,7 +1,8 @@
-import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
 import { publisher } from '../../constants'
 
-export const createBase2ImplementorStep = (options: {
+import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
+
+export const createBestOfNImplementor = (options: {
   model: 'sonnet' | 'gpt-5'
 }): Omit<SecretAgentDefinition, 'id'> => {
   const { model } = options
@@ -76,7 +77,7 @@ Write out your complete implementation now, formatting all changes as tool calls
   }
 }
 const definition = {
-  ...createBase2ImplementorStep({ model: 'sonnet' }),
-  id: 'base2-implementor-step',
+  ...createBestOfNImplementor({ model: 'sonnet' }),
+  id: 'best-of-n-implementor',
 }
 export default definition

.agents/base2/best-of-n/base2-selector.ts

@@ -3,7 +3,7 @@ import { publisher } from '../../constants'
 import { StepText, ToolCall } from 'types/agent-definition'
 
 const definition: SecretAgentDefinition = {
-  id: 'base2-best-of-n-fast-orchestrator',
+  id: 'best-of-n-orchestrator-fast',
   publisher,
   model: 'anthropic/claude-sonnet-4.5',
   displayName: 'Best-of-N Fast Implementation Orchestrator',
@@ -20,11 +20,7 @@ const definition: SecretAgentDefinition = {
     'set_messages',
     'set_output',
   ],
-  spawnableAgents: [
-    'base2-implementor-step',
-    'base2-implementor-step-gpt-5',
-    'base2-selector-fast',
-  ],
+  spawnableAgents: ['best-of-n-implementor', 'best-of-n-selector'],
 
   inputSchema: {},
   outputMode: 'structured_output',
@@ -41,16 +37,15 @@ const definition: SecretAgentDefinition = {
       includeToolCall: false,
     } satisfies ToolCall<'set_messages'>
 
-    // Spawn 1 of each model for easy prompt caching
     const { toolResult: implementorsResult1 } = yield {
       toolName: 'spawn_agents',
       input: {
         agents: [
-          { agent_type: 'base2-implementor-step' },
-          { agent_type: 'base2-implementor-step' },
-          { agent_type: 'base2-implementor-step' },
-          { agent_type: 'base2-implementor-step' },
-          { agent_type: 'base2-implementor-step' },
+          { agent_type: 'best-of-n-implementor' },
+          { agent_type: 'best-of-n-implementor' },
+          { agent_type: 'best-of-n-implementor' },
+          { agent_type: 'best-of-n-implementor' },
+          { agent_type: 'best-of-n-implementor' },
         ],
       },
       includeToolCall: false,
@@ -71,7 +66,7 @@ const definition: SecretAgentDefinition = {
       input: {
         agents: [
           {
-            agent_type: 'base2-selector-fast',
+            agent_type: 'best-of-n-selector',
             params: { implementations },
           },
         ],
@@ -103,7 +98,7 @@ const definition: SecretAgentDefinition = {
       return
     }
 
-    // Spawn editor to apply the chosen implementation
+    // Apply the chosen implementation using STEP_TEXT
     const { agentState: postEditsAgentState } = yield {
       type: 'STEP_TEXT',
       text: chosenImplementation.content,