base2-editor (thinks before implementing)

Author: jahooma

.agents/base2/base2-editor.ts

@@ -0,0 +1,8 @@
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('default', { useEditor: true }),
+  id: 'base2-editor',
+  displayName: 'Buffy the Editor Orchestrator',
+}
+export default definition

.agents/base2/base2.ts

@@ -11,9 +11,14 @@ export function createBase2(
   options?: {
     hasNoValidation?: boolean
     planOnly?: boolean
+    useEditor?: boolean
   },
 ): Omit<SecretAgentDefinition, 'id'> {
-  const { hasNoValidation = mode === 'fast', planOnly = false } = options ?? {}
+  const {
+    hasNoValidation = mode === 'fast',
+    planOnly = false,
+    useEditor = false,
+  } = options ?? {}
   const isDefault = mode === 'default'
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
@@ -65,6 +70,7 @@ export function createBase2(
       'researcher-docs',
       isLite ? 'commander-lite' : 'commander',
       isLite && 'editor-gpt-5',
+      useEditor && 'editor',
       isMax && 'editor-best-of-n-max',
       isMax && 'thinker-best-of-n-opus',
       !isLite && 'code-reviewer-opus',
@@ -119,6 +125,8 @@ 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.',
     isLite &&
       '- Spawn the editor-gpt-5 agent to implement the changes after you have gathered all the context you need.',
+    useEditor &&
+      '- Spawn the editor agent to implement the changes after you have gathered all the context you need.',
     isMax &&
       '- Spawn the thinker-best-of-n-opus after gathering context to solve complex problems.',
     isMax &&
@@ -171,11 +179,13 @@ ${buildArray(
 [ You read a few other relevant files using the read_files tool ]
 
 ${
-  isDefault || isFast
-    ? '[ You implement the changes using the str_replace or write_file tools ]'
-    : isLite
-      ? '[ You implement the changes using the editor-gpt-5 agent ]'
-      : '[ You implement the changes using the editor-best-of-n-max agent ]'
+  useEditor
+    ? `[ You implement the changes using the editor agent ]`
+    : isDefault || isFast
+      ? '[ You implement the changes using the str_replace or write_file tools ]'
+      : isLite
+        ? '[ You implement the changes using the editor-gpt-5 agent ]'
+        : '[ You implement the changes using the editor-best-of-n-max agent ]'
 }
 
 ${
@@ -225,6 +235,7 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           isMax,
           isLite,
           hasNoValidation,
+          useEditor,
         }),
     stepPrompt: planOnly
       ? buildPlanOnlyStepPrompt({})
@@ -233,6 +244,7 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           isMax,
           hasNoValidation,
           isSonnet,
+          useEditor,
         }),
 
     handleSteps: function* ({ params }) {
@@ -265,13 +277,15 @@ function buildImplementationInstructionsPrompt({
   isMax,
   isLite,
   hasNoValidation,
+  useEditor,
 }: {
   isSonnet: boolean
   isFast: boolean
   isDefault: boolean
   isMax: boolean
   isLite: boolean
   hasNoValidation: boolean
+  useEditor: 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.
 
@@ -287,6 +301,8 @@ ${buildArray(
     `- For any task requiring 3+ steps, use the write_todos tool to write out your step-by-step implementation plan. Include ALL of the applicable tasks in the list.${isFast ? '' : ' You should include a step to review the changes after you have implemented the changes.'}:${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 may be able to do reviewing and validation in parallel in the same step. Skip write_todos for simple tasks like quick edits or answering questions.`,
   isLite &&
     '- IMPORTANT: You must spawn the editor-gpt-5 agent to implement the changes after you have gathered all the context you need. This agent will do the best job of implementing the changes so you must spawn it for all changes.',
+  useEditor &&
+    '- IMPORTANT: You must spawn the editor agent to implement the changes after you have gathered all the context you need. This agent will do the best job of implementing the changes so you must spawn it for all non-trivial changes. Do not pass any prompt or params to the editor agent when spawning it. It will make its own best choices of what to do.',
   isMax &&
     `- IMPORTANT: You must spawn the editor-best-of-n-max 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.`,
   (isDefault || isFast) &&
@@ -308,15 +324,19 @@ function buildImplementationStepPrompt({
   isMax,
   hasNoValidation,
   isSonnet,
+  useEditor,
 }: {
   isFast: boolean
   isMax: boolean
   hasNoValidation: boolean
   isSonnet: boolean
+  useEditor: 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.`,
+    useEditor &&
+      `You must spawn the 'editor' agent to implement code changes, since it will do the best job of implementing the changes.`,
     isMax &&
       `You must spawn the 'editor-best-of-n-max' agent to implement code changes, since it will generate the best code changes.`,
     isMax && 'Spawn the thinker-best-of-n-opus to solve complex problems.',

.agents/editor/editor.ts

@@ -9,7 +9,7 @@ export const createCodeEditor = (options: {
     options.model === 'gpt-5' ? 'openai/gpt-5.1' : 'anthropic/claude-opus-4.5',
   displayName: 'Code Editor',
   spawnerPrompt:
-    'Expert code editor. Do not specify an input prompt for this agent; it inherits the context of the entire conversation with the user. Make sure to read any files intended to be edited before spawning this agent as it cannot read files on its own.',
+    "Expert code editor that implements code changes based on the user's request. Do not specify an input prompt for this agent; it inherits the context of the entire conversation with the user. Make sure to read any files intended to be edited before spawning this agent as it cannot read files on its own.",
   outputMode: 'structured_output',
   toolNames: ['write_file', 'str_replace', 'set_output'],
 
@@ -52,7 +52,35 @@ OR for new files or major rewrites:
 }
 </codebuff_tool_call>
 
-After the edit tool calls, you can optionally mention any follow-up steps to take, like deleting a file, or a sepcific way to validate the changes. There's no need to use the set_output tool as your entire response will be included in the output.
+IMPORTANT: Before you start writing your implementation, you should use <think> tags to think about the best way to implement the changes. You should think really really hard to make sure you implement the changes in the best way possible. Take as much time as you to think through all the cases to produce the best 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>
+
+After the edit tool calls, you can optionally mention any follow-up steps to take, like deleting a file, or a sepcific way to validate the changes. You should not summarize your changes, just stop when you're done. There's no need to use the set_output tool as your entire response will be included in the output.
 
 Your implementation should:
 - Be complete and comprehensive
@@ -110,5 +138,8 @@ Write out your complete implementation now, formatting all changes as tool calls
   },
 })
 
-const editor = createCodeEditor({ model: 'opus' })
-export default editor
+const definition = {
+  ...createCodeEditor({ model: 'opus' }),
+  id: 'editor',
+}
+export default definition