Reviewer editor in max mode

Author: jahooma

.agents/base2/base2.ts

@@ -77,7 +77,8 @@ export function createBase2(
       isDefault && 'editor',
       isMax && 'editor-multi-prompt',
       isMax && 'thinker-best-of-n-opus',
-      !isLite && 'code-reviewer',
+      isDefault && 'code-reviewer',
+      isMax && 'reviewer-editor-gpt-5',
       'context-pruner',
     ),
 
@@ -140,9 +141,10 @@ Use the spawn_agents tool to spawn specialized agents to help you complete the u
     isMax &&
       `- IMPORTANT: You must spawn the editor-multi-prompt 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 &&
-      !isLite &&
+    isDefault &&
       '- Spawn a code-reviewer to review the changes after you have implemented the changes.',
+    isMax &&
+      '- Spawn a reviewer-editor-gpt-5 to review the changes after you have implemented the changes.',
   ).join('\n  ')}
 - **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.
 - **Never spawn the context-pruner agent:** This agent is spawned automatically for you and you don't need to spawn it yourself.
@@ -204,13 +206,13 @@ ${
 
 ${
   isDefault || isMax
-    ? '[ You spawn a code-reviewer, a commander to typecheck the changes, and another commander to run tests, all in parallel ]'
+    ? `[ You spawn a ${isDefault ? 'code-reviewer' : 'reviewer-editor-gpt-5'}, a commander to typecheck the changes, and another commander to run tests, all in parallel ]`
     : '[ You spawn a commander to typecheck the changes and another commander to run tests, all in parallel ]'
 }
 
 ${
   isDefault || isMax
-    ? '[ You fix the issues found by the code-reviewer and type/test errors ]'
+    ? `[ You fix the issues found by the ${isDefault ? 'code-reviewer' : 'reviewer-editor-gpt-5'} and type/test errors ]`
     : '[ You fix the issues found by the type/test errors and spawn more commanders to confirm ]'
 }
 
@@ -330,7 +332,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.',
   (isDefault || isMax) &&
-    '- Spawn a code-reviewer to review the changes after you have implemented the changes. (Skip this step only if the change is extremely straightforward and obvious.)',
+    `- Spawn a ${isDefault ? 'code-reviewer' : 'reviewer-editor-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 &&
     `- Test your changes by running appropriate validation commands for the project (e.g. typechecks, tests, lints, etc.). Try to run all appropriate commands in parallel. ${isMax ? ' Typecheck and test the specific area of the project that you are editing *AND* then typecheck and test the entire project if necessary.' : ' If you can, only 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, unless the change is very small and targeted (< 10 lines and unlikely to have a type error)!`,
   `- 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." : ''}`,
@@ -363,7 +365,7 @@ function buildImplementationStepPrompt({
     isMax &&
       `You must spawn the 'editor-multi-prompt' agent to implement code changes, since it will generate the best code changes.`,
     (isDefault || isMax) &&
-      'Spawn code-reviewer to review the changes after you have implemented the changes and in parallel with typechecking or testing.',
+      `Spawn ${isDefault ? 'code-reviewer' : 'reviewer-editor-gpt-5'} to review the changes after you have implemented the changes and in parallel with typechecking or testing.`,
     `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 have already concluded and summarized the changes in a previous step -- just end your turn.`,
     !isFast &&
       !noAskUser &&

.agents/editor/editor.ts

@@ -120,19 +120,6 @@ Write out your complete implementation now, formatting all changes as tool calls
         },
         includeToolCall: false,
       }
-
-      // Extract only tool calls from text, removing any commentary
-      function extractToolCallsOnly(text: string): string {
-        const toolExtractionPattern =
-          /<codebuff_tool_call>[\s\S]*?<\/codebuff_tool_call>/g
-        const matches: string[] = []
-
-        for (const match of text.matchAll(toolExtractionPattern)) {
-          matches.push(match[0])
-        }
-
-        return matches.join('\n')
-      }
     },
   } satisfies Omit<AgentDefinition, 'id'>
 }

.agents/editor/reviewer-editor-gpt-5.ts

@@ -0,0 +1,12 @@
+import { AgentDefinition } from 'types/agent-definition'
+import { createCodeEditor } from './editor'
+
+const definition: AgentDefinition = {
+  ...createCodeEditor({ model: 'gpt-5' }),
+  reasoningOptions: {
+    effort: 'high',
+  },
+  inheritParentSystemPrompt: false,
+  id: 'reviewer-editor-gpt-5',
+}
+export default definition

.agents/editor/reviewer-editor.ts

@@ -0,0 +1,135 @@
+import { AgentDefinition, StepText } from 'types/agent-definition'
+import { publisher } from '../constants'
+
+export const createCodeEditor = (options: {
+  model: 'gpt-5' | 'opus'
+}): Omit<AgentDefinition, 'id'> => {
+  const { model } = options
+  return {
+    publisher,
+    model:
+      options.model === 'gpt-5'
+        ? 'openai/gpt-5.1'
+        : 'anthropic/claude-opus-4.5',
+    displayName: 'Code Editor',
+    spawnerPrompt:
+      'Expert code reviewer that reviews recent code changes and makes improvements.',
+    outputMode: 'structured_output',
+    toolNames: ['write_file', 'str_replace', 'set_output'],
+
+    includeMessageHistory: true,
+    inheritParentSystemPrompt: true,
+
+    instructionsPrompt: `You are an expert code reviewer with deep understanding of software engineering principles. You were spawned to review recent code changes and make improvements. Do not spawn a reviewer agent, you are the reviewer agent and have already been spawned.
+    
+Analyze the recent code changes and make improvements. However, try to only make changes that you are confident are fully correct and the user would want. It's ok to not make any changes.
+
+Important: You can not make any other tool calls besides editing files. You cannot read more files, write todos, spawn agents, or set output. set_output in particular should not be used. Do not call any of these tools!
+
+Write out what changes you would make using the tool call format below. Use this exact format for each file change:
+
+<codebuff_tool_call>
+{
+  "cb_tool_name": "str_replace",
+  "path": "path/to/file",
+  "replacements": [
+    {
+      "old": "exact old code",
+      "new": "exact new code"
+    },
+    {
+      "old": "exact old code 2",
+      "new": "exact new code 2"
+    },
+  ]
+}
+</codebuff_tool_call>
+
+OR for new files or major rewrites:
+
+<codebuff_tool_call>
+{
+  "cb_tool_name": "write_file",
+  "path": "path/to/file",
+  "instructions": "What the change does",
+  "content": "Complete file content or edit snippet"
+}
+</codebuff_tool_call>
+
+${
+  model === 'gpt-5'
+    ? ''
+    : `Before you start writing your implementation, you should use <think> tags to think about the best way to implement the changes.
+
+You can also use <think> tags interspersed between tool calls to think about the best way to implement the changes.
+
+<example>
+
+<think>
+[ Long think about the best way to implement the changes ]
+</think>
+
+<codebuff_tool_call>
+[ First tool call to implement the feature ]
+</codebuff_tool_call>
+
+<codebuff_tool_call>
+[ Second tool call to implement the feature ]
+</codebuff_tool_call>
+
+<think>
+[ Thoughts about a tricky part of the implementation ]
+</think>
+
+<codebuff_tool_call>
+[ Third tool call to implement the feature ]
+</codebuff_tool_call>
+
+</example>`
+}
+
+### Simplify the code.
+
+See if there's a simpler design that is more maintainable and easier to understand.
+
+See if you can remove any of the following:
+  - fallback code that is not really needed anymore
+  - any unnecessary type casts
+  - any dead code
+  - any added try/catch blocks -- these clutter the code and are often unnecessary.
+  - any optional arguments -- these make the code more complex and harder to understand.
+  - any unused imports
+
+### Improve the code
+- Instead of creating new functions, reuse existing functions if possible.
+- New components usually should be added to a new file, not added to an existing file.
+- Utilities that could be reused should be moved to a shared utilities file.
+
+Write out your edits now.`,
+
+    handleSteps: function* ({ agentState: initialAgentState, logger }) {
+      const initialMessageHistoryLength =
+        initialAgentState.messageHistory.length
+      const { agentState } = yield 'STEP'
+      const { messageHistory } = agentState
+
+      const newMessages = messageHistory.slice(initialMessageHistoryLength)
+
+      yield {
+        toolName: 'set_output',
+        input: {
+          output: {
+            messages: newMessages,
+          },
+        },
+        includeToolCall: false,
+      }
+    },
+  } satisfies Omit<AgentDefinition, 'id'>
+}
+
+const definition = {
+  ...createCodeEditor({ model: 'opus' }),
+  id: 'reviewer-editor',
+}
+export default definition