Remove gpt-5 from base2-max. Use editor with gpt-5, selector is sonnet.

Author: jahooma

.agents/base2/base2.ts

@@ -29,17 +29,11 @@ export function createBase2(
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
 
-  const isGpt5 = isMax
-  const isSonnet = isDefault
+  const isSonnet = true
 
   return {
     publisher,
-    model: isGpt5 ? 'openai/gpt-5.1' : 'anthropic/claude-sonnet-4.5',
-    ...(isGpt5 && {
-      reasoningOptions: {
-        effort: 'high',
-      },
-    }),
+    model: 'anthropic/claude-sonnet-4.5',
     displayName: 'Buffy the Orchestrator',
     spawnerPrompt:
       'Advanced base agent that orchestrates planning, editing, and reviewing for complex coding tasks',
@@ -67,7 +61,6 @@ export function createBase2(
       !isFast && 'write_todos',
       'str_replace',
       'write_file',
-      isGpt5 && 'task_completed',
     ),
     spawnableAgents: buildArray(
       'file-picker',
@@ -80,12 +73,11 @@ export function createBase2(
       withDecisionMaker && 'decision-maker',
       withImplementorGpt5 && 'editor-implementor-gpt-5',
       isDefault && !withImplementorGpt5 && 'editor-best-of-n',
-      isGpt5 && !withImplementorGpt5 && 'editor-best-of-n-gpt-5',
+      isMax && !withImplementorGpt5 && 'editor-best-of-n-gpt-5',
       isDefault && 'thinker-best-of-n',
-      isGpt5 && 'thinker-best-of-n-gpt-5',
-      hasCodeReviewer && (isGpt5 ? 'code-reviewer-gpt-5' : 'code-reviewer'),
-      hasCodeReviewerBestOfN &&
-        (isGpt5 ? 'code-reviewer-best-of-n-gpt-5' : 'code-reviewer-best-of-n'),
+      isMax && 'thinker-best-of-n-gpt-5',
+      hasCodeReviewer && 'code-reviewer',
+      hasCodeReviewerBestOfN && 'code-reviewer-best-of-n',
       'context-pruner',
     ),
 
@@ -136,7 +128,7 @@ Use the spawn_agents tool to spawn specialized agents to help you complete the u
   ${buildArray(
     '- Spawn context-gathering agents (file pickers, code-searcher, directory-lister, glob-matcher, and web/docs researchers) before making edits.',
     !withImplementorGpt5 &&
-      `- Spawn a ${isGpt5 ? '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-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.`,
     withImplementorGpt5 &&
       `- Spawn a editor-implementor-gpt-5 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.`,
     '- Spawn commanders sequentially if the second command depends on the the first.',
@@ -187,7 +179,6 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
       ? buildPlanOnlyInstructionsPrompt({})
       : buildImplementationInstructionsPrompt({
           isSonnet,
-          isGpt5,
           isFast,
           isDefault,
           isMax,
@@ -202,7 +193,6 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
       : buildImplementationStepPrompt({
           isFast,
           isMax,
-          isGpt5,
           hasNoValidation,
           isSonnet,
           withImplementorGpt5,
@@ -233,7 +223,6 @@ const EXPLORE_PROMPT = `- Iteratively spawn file pickers, code-searchers, direct
 
 function buildImplementationInstructionsPrompt({
   isSonnet,
-  isGpt5,
   isFast,
   isDefault,
   isMax,
@@ -244,7 +233,6 @@ function buildImplementationInstructionsPrompt({
   withDecisionMaker,
 }: {
   isSonnet: boolean
-  isGpt5: boolean
   isFast: boolean
   isDefault: boolean
   isMax: boolean
@@ -274,7 +262,7 @@ ${buildArray(
     '- 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 &&
     !withImplementorGpt5 &&
-    `- IMPORTANT: You must spawn the ${isGpt5 ? '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-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.`,
   withImplementorGpt5 &&
     `- IMPORTANT: You must spawn the editor-implementor-gpt-5 agent to implement non-trivial code changes, since it will generate the best code changes using a smarter reasoning model. 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.`,
   hasCodeReviewer &&
@@ -284,21 +272,18 @@ ${buildArray(
   !hasNoValidation &&
     `- Test your changes${isMax ? '' : ' briefly'} by running appropriate validation commands for the project (e.g. typechecks, tests, lints, etc.).${isMax ? ' Start by type checking the specific area of the project that you are editing and then test the entire project if necessary.' : ' If you can, only typecheck/test the area of the project that you are editing, rather than the entire project.'} 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.${isSonnet ? " Don't create any markdown summary files or example documentation files, unless asked by the user." : ''}`,
-  isGpt5 && `- Use the task_completed tool.`,
 ).join('\n')}`
 }
 
 function buildImplementationStepPrompt({
   isFast,
   isMax,
-  isGpt5,
   hasNoValidation,
   isSonnet,
   withImplementorGpt5,
 }: {
   isFast: boolean
   isMax: boolean
-  isGpt5: boolean
   hasNoValidation: boolean
   isSonnet: boolean
   withImplementorGpt5: boolean
@@ -307,10 +292,8 @@ function buildImplementationStepPrompt({
     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 ${withImplementorGpt5 ? 'editor-implementor-gpt-5' : isGpt5 ? '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 ${withImplementorGpt5 ? 'editor-implementor-gpt-5' : isMax ? 'editor-best-of-n-gpt-5' : 'editor-best-of-n'} agent to implement code changes, since it will generate the best code changes.`,
     `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." : ''}. Don't repeat yourself -- especially if you already summarized your changes then just end your turn.`,
-    isGpt5 &&
-      `IMPORTANT: You must include at least one tool call ("<codebuff_tool_call>") per message response. If you are completely done with the user's request or require more information from the user, you must call the task_completed tool to end your turn.`,
   ).join('\n')
 }