Updates for base2 and editor agent

Author: jahooma

.agents/base2/base2-factory.ts

@@ -33,6 +33,7 @@ export const base2 = (model: ModelName): Omit<SecretAgentDefinition, 'id'> => ({
 
 Principles:
 - You coordinate between agents but do not implement code yourself.
+- You try to ask for everything you need upfront from each agent so you don't need to spawn them again.
 - You are concise in your responses.
 
 Guidance:
@@ -42,6 +43,7 @@ Guidance:
   instructionsPrompt: `Orchestrate the completion of the coding task using your specialized sub-agents.
 
 - You can spawn agents to help you complete the task. Iterate by spawning more agents as needed.
+- Ask for everything you need upfront from each agent so you're less likely to need to spawn them again.
 - You should feel free to stop and ask the user for guidance if you're stuck or don't know what to try next, or need a clarification.
 - 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 much context.
 - Be careful about instructing subagents to run terminal commands that could be destructive or have effects that are hard to undo (e.g. git push, running scripts that could alter production environments, installing packages globally, etc). Don't do any of these unless the user explicitly asks you to.

.agents/base2/editor.ts

@@ -1,6 +1,9 @@
 import { publisher } from '../constants'
 
-import type { SecretAgentDefinition } from '../types/secret-agent-definition'
+import {
+  PLACEHOLDER,
+  type SecretAgentDefinition,
+} from '../types/secret-agent-definition'
 
 const editor: SecretAgentDefinition = {
   id: 'editor',
@@ -46,14 +49,18 @@ You are extremely skilled at:
 - Following existing codebase patterns
 - Never duplicating existing code and always reusing existing code when possible
 - Making the minimal change necessary to implement the user request
-`,
+- Calling the set_output tool to with a clear explanation of the changes made or with an answer to the user's question
+- Not writing a final summary outside of the one that you include in the set_output tool
+
+${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
 
   instructionsPrompt: `Implement the requested changes. Feel free to ignore the plan if it seems incorrect.
 
 - It's helpful to spawn a file explorer to discover all the relevant files for implementing the plan.
 - You must read all relevant files to understand the current state. You must read any file that could be relevant to the plan, especially files you need to modify, but also files that could show codebase patterns you could imitate. Try to read a lot of files in a single tool call. E.g. use read_files on 12 different files, and then use read_files on 6 more files that fill in the gaps.
 - Implement changes using str_replace or write_file.
-- End turn when complete.
+- You must use the set_output tool before finishing and include a clear explanation of the changes made or an answer to the user prompt.
+- Do not write a further summary outside of the one that you include in the set_output tool. It is inefficient and unnecessary to write a summary outside of the set_output tool, since no one will see it.
 
 Principles:
 - Read before you write
@@ -110,11 +117,12 @@ Other guidance:
     }
 
     // Collect all the edits from the conversation
-    const { messageHistory } = agentState
+    const { messageHistory, output } = agentState
     const editToolResults: string[] = []
     for (const message of messageHistory) {
       if (
         message.role === 'user' &&
+        typeof message.content === 'string' &&
         message.content.includes('<tool_result>')
       ) {
         // Parse out tool results for write_file and str_replace
@@ -146,14 +154,11 @@ Other guidance:
         }
       }
     }
-    const lastAssistantMessage =
-      messageHistory.findLast((message) => message.role === 'assistant')
-        ?.content ?? ''
 
     yield {
       toolName: 'set_output',
       input: {
-        message: lastAssistantMessage,
+        ...output,
         edits: editToolResults,
       },
     }