Make todos standard for base2

Author: jahooma

.agents/base2/base2-fast-todos.ts

@@ -27,13 +27,11 @@ const definition: SecretAgentDefinition = {
 
 The user asks you to implement a new feature. You respond in multiple steps:
 
-1. Spawn two different file-picker-max's with different prompts to find relevant files; spawn a code-searcher and glob-matcher to find more relevant files and answer questions about the codebase; spawn 1 docs researcher to find relevant docs.
-1a. Read all the relevant files using the read_files tool.
-2. Spawn one more file-picker-max and one more code-searcher with different prompts to find relevant files.
-2a. Read all the relevant files using the read_files tool.
-3. Use the str_replace or write_file tool to make the changes.
-4. Test your changes 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.
-5. End your turn.`,
+- Gather context on the user's request
+- Use the write_todos tool to write out your step-by-step implementation plan.
+- Use the str_replace or write_file tool to make the changes.
+- Test your changes 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.
+- End your turn.`,
 
   stepPrompt: undefined,
 }

.agents/base2/base2-fast-with-decomposing-thinker.ts

@@ -10,15 +10,9 @@ export const createBase2: (
   mode: 'fast' | 'max',
   options?: {
     hasNoValidation?: boolean
-    hasDecomposingThinker?: boolean
-    usesTodos?: boolean
   },
 ) => Omit<SecretAgentDefinition, 'id'> = (mode, options) => {
-  const {
-    hasNoValidation = false,
-    hasDecomposingThinker = false,
-    usesTodos = false,
-  } = options ?? {}
+  const { hasNoValidation = false } = options ?? {}
   const isFast = mode === 'fast'
   const isMax = mode === 'max'
 
@@ -49,7 +43,7 @@ export const createBase2: (
       'spawn_agents',
       isMax && 'spawn_agent_inline',
       'read_files',
-      usesTodos && 'write_todos',
+      'write_todos',
       'str_replace',
       'write_file',
     ),
@@ -61,7 +55,6 @@ export const createBase2: (
       'glob-matcher',
       'researcher-web',
       'researcher-docs',
-      hasDecomposingThinker && 'decomposing-thinker',
       'commander',
       isMax && 'base2-gpt-5-worker',
       'context-pruner',
@@ -82,8 +75,6 @@ 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 file pickers, code-searcher, directory-lister, glob-matcher, commanders, and researchers before making edits.
   ${buildArray(
-    hasDecomposingThinker &&
-      '- Spawn a decomposing-thinker agent after you have gathered all the context to ask key questions and plan your response. Make sure to include all the relevant file paths in the params.',
     isMax &&
       '- Spawn a base2-gpt-5-worker agent inline after you have gathered all the context you need (and not before!).',
   ).join('\n  ')}
@@ -152,13 +143,7 @@ ${buildArray(
   '- You must spawn a file-researcher to find relevant files; consider also spawning a web and/or docs researcher to find relevant information online.',
   '- Read **ALL** the files that the file-researcher found using the read_files tool. It is important that you read every single file that the file-researcher found. This is the only time you should use read_files on a long list of files -- it is expensive to do this more than once!',
   `- Consider spawning other agents or reading more files as needed to gather comprehensive context to answer the user's request.`,
-  hasDecomposingThinker &&
-    `- Spawn a decomposing-thinker agent to ask key questions and plan your response. Make sure to include all the relevant file paths in the params.`,
-  usesTodos &&
-    `- 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.'}`,
-  isFast &&
-    !usesTodos &&
-    '- Write out your implementation plan as a bullet point list.',
+  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.'}`,
   isFast &&
     `- Use the str_replace or write_file tool to make the changes. (Pause after making all the changes to see the tool results of your edits and double check they went through correctly.)`,
   isMax &&