Update orchestrator subagents to use inheritParentSystemPrompt

Author: jahooma

.agents/editor/editor.ts

@@ -1,9 +1,6 @@
 import { Message } from 'types/util-types'
 import { publisher } from '../constants'
-import {
-  PLACEHOLDER,
-  type SecretAgentDefinition,
-} from '../types/secret-agent-definition'
+import { type SecretAgentDefinition } from '../types/secret-agent-definition'
 
 const editor: SecretAgentDefinition = {
   id: 'editor',
@@ -28,7 +25,6 @@ const editor: SecretAgentDefinition = {
     },
   },
   outputMode: 'structured_output',
-  includeMessageHistory: true,
   toolNames: [
     'read_files',
     'write_file',
@@ -42,7 +38,10 @@ const editor: SecretAgentDefinition = {
   ],
   spawnableAgents: ['file-explorer', 'web-researcher', 'docs-researcher'],
 
-  systemPrompt: `You are an expert code editor with deep understanding of software engineering principles.
+  includeMessageHistory: true,
+  inheritParentSystemPrompt: true,
+
+  instructionsPrompt: `You are an expert code editor with deep understanding of software engineering principles.
 
 # Core Mandates
 
@@ -66,52 +65,8 @@ const editor: SecretAgentDefinition = {
     - Remove unused variables, functions, and files as a result of your changes.
     - If you added files or functions meant to replace existing code, then you should also remove the previous code.
 - **Edit multiple files at once:** When you edit files, you must make as many tool calls as possible in a single message. This is faster and much more efficient than making all the tool calls in separate messages. It saves users thousands of dollars in credits if you do this!
-<example>
-Assistant: I will now implement feature X.
-
-<codebuff_tool_call>
-{
-  "toolName": "str_replace",
-  "input": {
-    "filePath": "src/components/Button.tsx",
-    "oldContent": "...",
-    "newContent": "...",
-  }
-}
-</codebuff_tool_call>
-
-<codebuff_tool_call>
-{
-  "toolName": "str_replace",
-  "input": {
-    "filePath": "src/components/Button.tsx",
-    "oldContent": "...",
-    "newContent": "...",
-  }
-}
-</codebuff_tool_call>
-
-// ... 8 more str_replace tool calls ...
-
-Let's see what the code looks like now.
-
-User: <tool_result>
-<tool>str_replace</tool>
-<result>...</result>
-</tool_result>
-
-<tool_result>
-<tool>str_replace</tool>
-<result>...</result>
-</tool_result>
-
-// ... 8 more tool_result blocks ...
-</example>
 - **Summarize with set_output:** 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 separate summary outside of the set_output tool.
-
-${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
-
-  instructionsPrompt: `Implement the requested changes, using your judgment as needed, but referring to the original <user-message> as the most important source of information.
+Implement the requested changes, using your judgment as needed, but referring to the original <user-message> as the most important source of information.
 
 # Instructions
 

.agents/planners/decomposing-planner-lite.ts

@@ -9,7 +9,6 @@ const definition: SecretAgentDefinition = {
   spawnerPrompt:
     'Creates a better implementation plan by decomposing the task into smaller plans in parallel and synthesizing them into a final plan. Includes full code changes.',
   spawnableAgents: ['researcher-file-explorer', 'implementation-planner-lite'],
-  includeMessageHistory: false,
 }
 
 export default definition

.agents/planners/decomposing-planner.ts

@@ -1,8 +1,5 @@
 import { publisher } from '../constants'
-import {
-  PLACEHOLDER,
-  type SecretAgentDefinition,
-} from '../types/secret-agent-definition'
+import { type SecretAgentDefinition } from '../types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   id: 'decomposing-planner',
@@ -19,27 +16,25 @@ const definition: SecretAgentDefinition = {
     },
   },
   outputMode: 'last_message',
-  includeMessageHistory: true,
   toolNames: ['spawn_agents', 'read_files'],
-  spawnableAgents: ['file-explorer', 'implementation-planner'],
-
-  systemPrompt: `You are an expert programmer, architect, and problem solver who excels at breaking down complex tasks.
+  spawnableAgents: ['researcher-file-explorer', 'implementation-planner'],
 
-${PLACEHOLDER.FILE_TREE_PROMPT}
-${PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS}`,
+  includeMessageHistory: true,
+  inheritParentSystemPrompt: true,
 
-  instructionsPrompt: `Instructions:
+  instructionsPrompt: `You are an expert programmer, architect, and problem solver who excels at breaking down complex tasks.
+Instructions:
 
 Step 1: Task Decomposition
-- Spawn a file-explorer agent to explore the codebase and read all the relevant files
+- Spawn a researcher-file-explorer agent to explore the codebase and read all the relevant files
 - Carefully analyze the user's request
-- Break it down into 3-5 focused subtasks that:
+- Break it down into 2-10 focused subtasks that:
   - Cover different aspects of the implementation (e.g., data layer, business logic, UI, testing)
   - Are specific and actionable
   - Together address the complete requirements
 
 Step 2: Parallel Planning
-- Spawn 3-5 implementation-planner agents in parallel (one spawn_agents call with multiple agents)
+- Spawn 2-10 implementation-planner agents in parallel (one spawn_agents call with multiple agents)
 - Give each agent a focused subtask from your decomposition
 - Each subtask prompt should be specific about what that agent should focus on
 

.agents/planners/implementation-planner.ts

@@ -1,8 +1,5 @@
 import { publisher } from '../constants'
-import {
-  PLACEHOLDER,
-  type SecretAgentDefinition,
-} from '../types/secret-agent-definition'
+import { type SecretAgentDefinition } from '../types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   id: 'implementation-planner',
@@ -20,22 +17,16 @@ const definition: SecretAgentDefinition = {
   },
   outputMode: 'last_message',
   includeMessageHistory: true,
+  inheritParentSystemPrompt: true,
   toolNames: ['spawn_agents', 'read_files'],
-  spawnableAgents: [
-    'file-explorer',
-    'web-researcher',
-    'docs-researcher',
-  ],
+  spawnableAgents: ['file-explorer', 'web-researcher', 'docs-researcher'],
 
-  systemPrompt: `You are an expert programmer, architect, researcher, and general problem solver.
+  instructionsPrompt: `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}`,
-
-  instructionsPrompt: `Instructions:
+Instructions:
 - Spawn file-explorer twice to find all the relevant parts of the codebase. Use different prompts for each file-explorer to ensure you get all the relevant parts of the codebase. In parallel as part of the same spawn_agents tool call, you may also spawn a web-researcher or docs-researcher to search the web or technical documentation for relevant information.
 - Read all the file paths that are relevant using the read_files tool.
 - 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.

.agents/reviewer/reviewer-factory.ts

@@ -15,11 +15,11 @@ export const reviewer = (model: Model): Omit<SecretAgentDefinition, 'id'> => ({
     },
   },
   outputMode: 'last_message',
-  includeMessageHistory: true,
   toolNames: ['end_turn', 'run_file_change_hooks'],
   spawnableAgents: [],
 
-  systemPrompt: `You are an expert programmer who can articulate very clear feedback on code changes.`,
+  inheritParentSystemPrompt: true,
+  includeMessageHistory: true,
 
   instructionsPrompt: `Your task is to provide helpful feedback on the last file changes made by the assistant.
 

.agents/types/agent-definition.ts

@@ -95,7 +95,7 @@ export interface AgentDefinition {
   /** Whether to include conversation history from the parent agent in context.
    *
    * Defaults to false.
-   * Use this if the agent needs to know all the previous messages in the conversation.
+   * Use this when the agent needs to know all the previous messages in the conversation.
    */
   includeMessageHistory?: boolean
 
@@ -121,6 +121,14 @@ export interface AgentDefinition {
    * This field is key if the agent is intended to be spawned by other agents. */
   spawnerPrompt?: string
 
+  /** Whether to inherit the parent agent's system prompt instead of using this agent's own systemPrompt.
+   *
+   * Defaults to false.
+   * Use this when you want to enable prompt caching by preserving the same system prompt prefix.
+   * Cannot be used together with the systemPrompt field.
+   */
+  inheritParentSystemPrompt?: boolean
+
   /** Background information for the agent. Fairly optional. Prefer using instructionsPrompt for agent instructions. */
   systemPrompt?: string
 
@@ -289,7 +297,7 @@ export type ModelName =
   | 'openai/gpt-5-nano'
 
   // Anthropic
-  | 'anthropic/claude-sonnet-4'
+  | 'anthropic/claude-sonnet-4.5'
   | 'anthropic/claude-opus-4.1'
 
   // Gemini
@@ -326,8 +334,8 @@ export type ModelName =
   // Other open source models
   | 'moonshotai/kimi-k2'
   | 'moonshotai/kimi-k2:nitro'
-  | 'z-ai/glm-4.5'
-  | 'z-ai/glm-4.5:nitro'
+  | 'z-ai/glm-4.6'
+  | 'z-ai/glm-4.6:nitro'
   | (string & {})
 
 export type { Tools }

common/src/templates/initial-agents-dir/types/agent-definition.ts

@@ -92,13 +92,6 @@ export interface AgentDefinition {
     params?: JsonObjectSchema
   }
 
-  /** Whether to include conversation history from the parent agent in context.
-   *
-   * Defaults to false.
-   * Use this when the agent needs to know all the previous messages in the conversation.
-   */
-  includeMessageHistory?: boolean
-
   /** How the agent should output a response to its parent (defaults to 'last_message')
    *
    * last_message: The last message from the agent, typically after using tools.
@@ -121,6 +114,13 @@ export interface AgentDefinition {
    * This field is key if the agent is intended to be spawned by other agents. */
   spawnerPrompt?: string
 
+  /** Whether to include conversation history from the parent agent in context.
+   *
+   * Defaults to false.
+   * Use this when the agent needs to know all the previous messages in the conversation.
+   */
+  includeMessageHistory?: boolean
+
   /** Whether to inherit the parent agent's system prompt instead of using this agent's own systemPrompt.
    *
    * Defaults to false.