Promote base2-gpt-5 to base2-max

Author: jahooma

.agents/base2/base2-gpt-5-worker.ts renamed to .agents-graveyard/base2-gpt-5-worker.ts

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

.agents/base2/base2-gpt-5.ts

@@ -10,12 +10,12 @@ export const createBase2: (
   mode: 'fast' | 'max',
   options?: {
     hasNoValidation?: boolean
-    isGpt5?: boolean
   },
 ) => Omit<SecretAgentDefinition, 'id'> = (mode, options) => {
-  const { hasNoValidation = false, isGpt5 = false } = options ?? {}
+  const { hasNoValidation = false } = options ?? {}
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
+  const isGpt5 = isMax
 
   return {
     publisher,
@@ -47,7 +47,6 @@ export const createBase2: (
     includeMessageHistory: true,
     toolNames: buildArray(
       'spawn_agents',
-      isMax && 'spawn_agent_inline',
       'read_files',
       'write_todos',
       'str_replace',
@@ -63,11 +62,7 @@ export const createBase2: (
       'researcher-web',
       'researcher-docs',
       'commander',
-      isFast &&
-        (isGpt5
-          ? 'best-of-n-orchestrator-gpt-5'
-          : 'best-of-n-orchestrator-fast'),
-      isMax && 'base2-gpt-5-worker',
+      isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast',
       'context-pruner',
     ),
 
@@ -86,10 +81,7 @@ Continue to spawn layers of agents until have completed the user's request or re
 - **Sequence agents properly:** Keep in mind dependencies when spawning different agents. Don't spawn agents in parallel that depend on each other. Be conservative sequencing agents so they can build on each other's insights:
   - Spawn ${isGpt5 ? 'file pickers, code-searcher, directory-lister, glob-matcher, commanders, and researchers' : 'the file researcher and optionally the web researcher and docs researcher'} before making edits.${isGpt5 ? '' : ' After that, spawn further agents to gather context as needed (e.g. the code-searcher, directory-lister, glob-matcher, commanders, and researchers).'}
   ${buildArray(
-    isFast &&
-      `- Spawn a ${isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast'} agent to implement the changes after you have gathered all the context you need (and not before!).`,
-    isMax &&
-      '- Spawn a base2-gpt-5-worker agent inline after you have gathered all the context you need (and not before!).',
+    `- Spawn a ${isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast'} agent to implement the changes after you have gathered all the context you need (and not before!).`,
   ).join('\n  ')}
 - **Spawn with the correct prompt and/or params:** Each agent has a schema for the input it expects. The prompt is an optional string, and the params is a json object. Note that some agents don't take any input prompt or params.
 - **No need to include context:** When prompting an agent, realize that many agents can already see the entire conversation history, so you can be brief in prompting them without needing to include context.
@@ -161,22 +153,17 @@ ${buildArray(
   `- Consider spawning other agents or reading more files as needed to gather comprehensive context to answer the user's request. When in doubt, read more files!`,
   isGpt5 &&
     `- Spawn file pickers, code-searcher, directory-lister, glob-matcher, commanders, and researchers to gather context as needed. Read all the relevant files using the read_files tool. Read as many files as possible so that you have a comprehensive context on the user's request.`,
-  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.'}`,
-  isFast &&
-    `- You must spawn the ${isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast'} agent to implement the code changes, since it will generate the best code changes from multiple implementation proposals, which the user wants you to do.`,
-  isMax &&
-    `- IMPORTANT: You must spawn a base2-gpt-5-worker agent inline (with spawn_agent_inline tool) to do the planning and editing.`,
+  `- 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.'}`,
+  `- You must spawn the ${isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast'} agent to implement the code changes, since it will generate the best code changes from multiple implementation proposals, which the user wants you to do.`,
   !hasNoValidation &&
     `- 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 or example documentation files, unless asked by the user. If you already finished the user request and said you're done, then don't say anything else.`,
   isGpt5 && `- Use the task_completed tool.`,
 ).join('\n')}`,
     stepPrompt: buildArray(
-      (isMax || isGpt5) &&
+      isMax &&
         `Keep working until the user's request is completely satisfied${!hasNoValidation ? ' and validated' : ''}. `,
-      isFast &&
-        `You must spawn the ${isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast'} agent to implement any code changes. Don't forget to do this! `,
+      `You must spawn the ${isGpt5 ? 'best-of-n-orchestrator-gpt-5' : 'best-of-n-orchestrator-fast'} agent to implement any 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.`,
       isGpt5 &&
         `IMPORTANT: if you are completely done with the user's request, you must call the task_completed tool to end your turn.`,