Merge branch 'new-best-of-n'

Author: jahooma

…e2/task-researcher/base2-gpt-5-worker.ts .agents-graveyard/base2-gpt-5-worker.ts.agents/base2/task-researcher/base2-gpt-5-worker.ts renamed to .agents-graveyard/base2-gpt-5-worker.ts .agents/base2/task-researcher/base2-gpt-5-worker.ts renamed to .agents-graveyard/base2-gpt-5-worker.ts

@@ -1,8 +1,8 @@
 import { buildArray } from '@codebuff/common/util/array'
 
-import { createBase2 } from '../base2'
+import { createBase2 } from '../.agents/base2/base2'
 
-import type { SecretAgentDefinition } from '../../types/secret-agent-definition'
+import type { SecretAgentDefinition } from '../.agents/types/secret-agent-definition'
 
 const base2 = createBase2('max')
 

…researcher/base2-with-task-researcher.ts …-graveyard/base2-with-task-researcher.ts.agents/base2/task-researcher/base2-with-task-researcher.ts renamed to .agents-graveyard/base2-with-task-researcher.ts .agents/base2/task-researcher/base2-with-task-researcher.ts renamed to .agents-graveyard/base2-with-task-researcher.ts

@@ -1,7 +1,7 @@
 import { buildArray } from '@codebuff/common/util/array'
 
-import { publisher } from '../../constants'
-import { type SecretAgentDefinition } from '../../types/secret-agent-definition'
+import { publisher } from '../.agents/constants'
+import { type SecretAgentDefinition } from '../.agents/types/secret-agent-definition'
 
 import type { ToolCall } from 'types/agent-definition'
 import type { UserMessage } from 'types/util-types'

.agents/base2/base2-gemini-editor.ts

@@ -11,28 +11,22 @@ export function createBase2(
   options?: {
     hasNoValidation?: boolean
     planOnly?: boolean
-    withGemini?: boolean
-    useGeminiEditor?: boolean
   },
 ): Omit<SecretAgentDefinition, 'id'> {
   const {
     hasNoValidation = mode === 'fast',
     planOnly = false,
-    withGemini = false,
-    useGeminiEditor = false,
   } = options ?? {}
   const isDefault = mode === 'default'
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
 
-  const isSonnet = !withGemini
-  const isGemini = withGemini
+  const isSonnet = true
+  const isGemini = false
 
   return {
     publisher,
-    model: withGemini
-      ? 'google/gemini-3-pro-preview'
-      : 'anthropic/claude-sonnet-4.5',
+    model: 'anthropic/claude-sonnet-4.5',
     displayName: 'Buffy the Orchestrator',
     spawnerPrompt:
       'Advanced base agent that orchestrates planning, editing, and reviewing for complex coding tasks',
@@ -69,17 +63,12 @@ export function createBase2(
       'researcher-web',
       'researcher-docs',
       'commander',
-      useGeminiEditor
-        ? 'editor-implementor-gemini'
-        : buildArray(
-            withGemini && 'editor-best-of-n-gemini',
-            !withGemini && isDefault && 'editor-best-of-n',
-            !withGemini && isMax && 'editor-best-of-n-gpt-5',
-            !withGemini && isDefault && 'thinker-best-of-n',
-            !withGemini && isMax && 'thinker-best-of-n-gpt-5',
-          ),
-      !withGemini && isDefault && 'code-reviewer',
-      !withGemini && isMax && 'code-reviewer-best-of-n-gpt-5',
+      isDefault && 'editor-best-of-n',
+      isMax && 'editor-best-of-n-max',
+      isDefault && 'thinker-best-of-n',
+      isMax && 'thinker-best-of-n-gpt-5',
+      isDefault && 'code-reviewer',
+      isMax && 'code-reviewer-best-of-n-gpt-5',
       'context-pruner',
     ),
 
@@ -131,7 +120,7 @@ Use the spawn_agents tool to spawn specialized agents to help you complete the u
     '- Spawn context-gathering agents (file pickers, code-searcher, directory-lister, glob-matcher, and web/docs researchers) before making edits.',
     isMax &&
       '- Spawn the thinker-best-of-n-gpt-5 after gathering context to solve complex problems.',
-    `- Spawn a ${useGeminiEditor ? 'editor-implementor-gemini' : isMax ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement the changes after you have gathered all the context you need. You must spawn this agent for non-trivial changes, since it writes much better code than you would with the str_replace or write_file tools. Don't spawn the editor in parallel with context-gathering agents.`,
+    `- Spawn a ${isMax ? 'editor-best-of-n-max' : 'editor-best-of-n'} agent to implement the changes after you have gathered all the context you need. You must spawn this agent for non-trivial changes, since it writes much better code than you would with the str_replace or write_file tools. Don't spawn the editor in parallel with context-gathering agents.`,
     '- Spawn commanders sequentially if the second command depends on the the first.',
     !isFast &&
       `- Spawn a ${isDefault ? 'code-reviewer' : 'code-reviewer-best-of-n-gpt-5'} to review the changes after you have implemented the changes.`,
@@ -309,7 +298,6 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           isDefault,
           isMax,
           hasNoValidation,
-          useGeminiEditor,
         }),
     stepPrompt: planOnly
       ? buildPlanOnlyStepPrompt({})
@@ -318,7 +306,6 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           isMax,
           hasNoValidation,
           isSonnet,
-          useGeminiEditor,
         }),
 
     handleSteps: function* ({ params }) {
@@ -350,14 +337,12 @@ function buildImplementationInstructionsPrompt({
   isDefault,
   isMax,
   hasNoValidation,
-  useGeminiEditor,
 }: {
   isSonnet: boolean
   isFast: boolean
   isDefault: boolean
   isMax: boolean
   hasNoValidation: boolean
-  useGeminiEditor: boolean
 }) {
   return `Act as a helpful assistant and freely respond to the user's request however would be most helpful to the user. Use your judgement to orchestrate the completion of the user's request using your specialized sub-agents and tools as needed. Take your time and be comprehensive. Don't surprise the user. For example, don't modify files if the user has not asked you to do so at least implicitly.
 
@@ -376,7 +361,7 @@ ${buildArray(
   isFast &&
     '- Do a single typecheck targeted for your changes at most (if applicable for the project). Or skip this step if the change was small.',
   !isFast &&
-    `- IMPORTANT: You must spawn the ${useGeminiEditor ? 'editor-implementor-gemini' : isMax ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious.`,
+    `- IMPORTANT: You must spawn the ${isMax ? 'editor-best-of-n-max' : 'editor-best-of-n'} agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very straightforward and obvious.`,
   !isFast &&
     `- Spawn a ${isDefault ? 'code-reviewer' : 'code-reviewer-best-of-n-gpt-5'} to review the changes after you have implemented the changes. (Skip this step only if the change is extremely straightforward and obvious.)`,
   !hasNoValidation &&
@@ -390,19 +375,17 @@ function buildImplementationStepPrompt({
   isMax,
   hasNoValidation,
   isSonnet,
-  useGeminiEditor,
 }: {
   isFast: boolean
   isMax: boolean
   hasNoValidation: boolean
   isSonnet: boolean
-  useGeminiEditor: boolean
 }) {
   return buildArray(
     isMax &&
       `Keep working until the user's request is completely satisfied${!hasNoValidation ? ' and validated' : ''}, or until you require more information from the user.`,
     !isFast &&
-      `You must spawn the ${useGeminiEditor ? 'editor-implementor-gemini' : isMax ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement code changes, since it will generate the best code changes.`,
+      `You must spawn the ${isMax ? 'editor-best-of-n-max' : 'editor-best-of-n'} agent to implement code changes, since it will generate the best code changes.`,
     isMax && 'Spawn the thinker-best-of-n-gpt-5 to solve complex problems.',
     `After completing the user request, summarize your changes in a sentence${isFast ? '' : ' or a few short bullet points'}.${isSonnet ? " Don't create any summary markdown files or example documentation files, unless asked by the user." : ''}.`,
   ).join('\n')

.agents/base2/base2-gemini.ts

@@ -1,7 +1,7 @@
 import { createBestOfNEditor } from './editor-best-of-n'
 
 const definition = {
-  ...createBestOfNEditor('gpt-5'),
-  id: 'editor-best-of-n-gpt-5',
+  ...createBestOfNEditor('max'),
+  id: 'editor-best-of-n-max',
 }
 export default definition