Update impl planner agents to focus on simple solutions, fix errors, tweak base-max prompts

Author: jahooma

.agents/implementation-planner/implementation-planner.ts

@@ -20,7 +20,7 @@ const definition: SecretAgentDefinition = {
   },
   outputMode: 'last_message',
   includeMessageHistory: true,
-  toolNames: ['spawn_agents', 'read_files', 'end_turn'],
+  toolNames: ['spawn_agents', 'read_files'],
   spawnableAgents: [
     'file-explorer',
     'web-researcher',
@@ -30,6 +30,8 @@ const definition: SecretAgentDefinition = {
   systemPrompt: `You are an expert programmer, architect, researcher, and general problem solver.
 You spawn agents to help you gather information, and then describe a full change to the codebase that will accomplish the task.
 
+You do not have access to tools to modify files (e.g. the write_file or str_replace tools). You are describing all the code changes that should be made as a full implementation.
+
 ${PLACEHOLDER.FILE_TREE_PROMPT}
 ${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
 
@@ -39,7 +41,23 @@ ${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
 - Read more and more files to get any information that could possibly help you make the best plan. It's good to read 20+ files.
 - Think about the best way to accomplish the task.
 - Finally, describe the full change to the codebase that will accomplish the task (or other steps, e.g. terminal commands to run). Use markdown code blocks to describe the changes for each file.
-- Then use the end_turn tool immediately after describing all the changes.
+
+Note that you are not allowed to use tools to modify files. You are instead describing a full implementation of the changes that should be made with all the code changes using markdown code blocks.
+
+<guidelines>
+IMPORTANT: You must pay attention to the user's request! Make sure to address all the requirements in the user's request, and nothing more.
+
+For the changes:
+- Focus on implementing the simplest solution that will accomplish the task in a high quality manner.
+- Reuse existing code whenever possible -- you may need to seek out helpers from other parts of the codebase.
+- Use existing patterns and conventions from the codebase. Keep naming consistent. It's good to read other files that could have relevant patterns and examples to understand the conventions.
+- Try not to modify more files than necessary.
+
+Things to avoid:
+- try/catch blocks for error handling unless absolutely necessary.
+- writing duplicate code that could be replaced with a helper function or especially an existing function.
+- comments. You can mostly leave out comments unless absolutely necessary to understand the code.
+</guidelines>
 `,
 }
 

.agents/implementation-planner/plan-selector.ts

@@ -51,26 +51,33 @@ const definition: SecretAgentDefinition = {
     },
     required: ['reasoning', 'selectedPlanId'],
   },
-  includeMessageHistory: false,
+  includeMessageHistory: true,
   systemPrompt: `You are an expert plan evaluator with deep experience in software engineering, architecture, and project management.
 
-Your task is to analyze multiple implementations and select the best one based on:
-1. **Completeness** - How well does it address the requirements?
-2. **Simplicity** - How clean and easy to understand is the implementation? Is the code overcomplicated?
+We're interested in the simplest solution that will accomplish the task correctly! You got this!
+
+${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
+
+  instructionsPrompt: `Analyze all the provided implementations and select the best one based on:
+
+1. **Simplicity** - How clean and easy to understand is the implementation? Is the code overcomplicated or over-engineered?
+2. **Correctness** - Does the implementation correctly address the requirements?
 3. **Quality** - How well does it work? How clear is the implementation?
 4. **Efficiency** - How minimal and focused are the changes? Were more files changed than necessary? Is the code verbose?
 5. **Maintainability** - How well will this approach work long-term?
-6. **Risk** - What are the potential downsides or failure points?
-
-${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
+6. **Does what the user expects** - Make sure the implementation addresses all the requirements in the user's request, and does not do other stuff that the user did not ask for.
 
-  instructionsPrompt: `Analyze all the provided plans and select the best one.
+More on **Simplicity**:
+- We don't want an over-engineered solution.
+- We're not interested in endless safety and correctness checks.
+- Modifying fewer files is better.
+- Reusing existing code is better than writing new code.
+- It's good to match existing patterns and conventions in the codebase, including naming conventions, code style, and architecture.
 
-For each plan, evaluate:
+For each implementation, evaluate:
 - Strengths and weaknesses
 - Implementation complexity
 - Alignment with the original task
-- Potential risks or issues
 
 Use the set_output tool to return your selection.`,
 }

.agents/prompts/base-prompts.ts

@@ -254,7 +254,7 @@ export const baseAgentUserInputPrompt = (
       `Important: you *must* read as many files with the read_files tool as possible from the results of the file picker agents. Don't be afraid to read ${isLite ? '8' : '20'} files. The more files you read, the better context you have on the codebase and the better your response will be.`,
 
       isMax &&
-        `Important: You must spawn the implementation-planner-max agent for all medium-to-hard coding tasks. It will help you come up with the best possible code changes.`,
+        `IMPORTANT: You must spawn the implementation-planner-max agent for all non-trivial coding tasks. It will help you come up with the best possible code changes. This is non-negotiable. The user needs you to spawn this agent to get the best possible code changes. Use your judgment to deviate from the plan whereever you see fit.`,
 
       'If the users uses "@agent-id" or "@AgentName" in their message, you must spawn that agent. If you don\'t know what input parameters that agent expects, use the lookup_agent_info tool to get the agent metadata. Spawn all the agents that the user mentions.',
 
@@ -310,7 +310,7 @@ export const baseAgentUserInputPrompt = (
         `You must use the spawn_agents tool to spawn agents to help you complete the user request. You can spawn as many agents as you want. It is a good idea to spawn a file explorer agent first to explore the codebase. ${isLite ? '' : 'Finally, you must spawn the reviewer agent to review your code changes.'}`,
 
       isMax &&
-        `Important: You must spawn the implementation-planner-max agent for all medium-to-hard coding tasks. It will help you come up with the best possible code changes.`,
+        `IMPORTANT: You must spawn the implementation-planner-max agent for all non-trivial coding tasks. It will help you come up with the best possible code changes. This is non-negotiable. The user needs you to spawn this agent to get the best possible code changes. Use your judgment to deviate from the plan whereever you see fit.`,
 
       !isGPT5 &&
         'Finally, you must use the end_turn tool at the end of your response when you have completed the user request or want the user to respond to your message.',