Update thinker & reviewer to use prompt-cached Sonnet

Author: jahooma

.agents/base-max.ts

@@ -11,9 +11,9 @@ const definition: SecretAgentDefinition = {
     'file-explorer',
     'researcher-web-sonnet',
     'researcher-docs-sonnet',
-    'implementation-planner-max',
+    'decomposing-planner',
     'thinker',
-    'reviewer-max',
+    'reviewer',
     'context-pruner',
   ],
 }

.agents/prompts/base-prompts.ts

@@ -252,7 +252,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 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.`,
+        `IMPORTANT: You must spawn the decomposing-planner 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.',
 
@@ -308,7 +308,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 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.`,
+        `IMPORTANT: You must spawn the decomposing-planner 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.',
@@ -330,11 +330,8 @@ If you don't do this, then your response will be cut off and the turn will be en
 }
 
 export const baseAgentAgentStepPrompt = (model: Model) => {
-  return `<system>
-You have ${PLACEHOLDER.REMAINING_STEPS} more response(s) before you will be cut off and the turn will be ended automatically.
+  return `You have ${PLACEHOLDER.REMAINING_STEPS} more response(s) before you will be cut off and the turn will be ended automatically.
 
 Assistant cwd (project root): ${PLACEHOLDER.PROJECT_ROOT}
-User cwd: ${PLACEHOLDER.USER_CWD}
-${closeXml('system')}
-`
+User cwd: ${PLACEHOLDER.USER_CWD}`
 }

.agents/reviewer/reviewer-factory.ts

@@ -1,11 +1,11 @@
-import { AGENT_PERSONAS } from '@codebuff/common/constants/agents'
 import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 import type { Model } from '@codebuff/common/old-constants'
 
 export const reviewer = (model: Model): Omit<SecretAgentDefinition, 'id'> => ({
   model,
-  displayName: AGENT_PERSONAS.reviewer.displayName,
-  spawnerPrompt: AGENT_PERSONAS.reviewer.purpose,
+  displayName: 'Nit Pick Nick',
+  spawnerPrompt:
+    'Reviews file changes and responds with critical feedback. Use this after making any significant change to the codebase; otherwise, no need to use this agent for minor changes since it takes a second.',
   inputSchema: {
     prompt: {
       type: 'string',

.agents/reviewer/reviewer.ts

@@ -6,11 +6,7 @@ import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   id: 'reviewer',
   publisher,
-  ...reviewer('google/gemini-2.5-pro'),
-  reasoningOptions: {
-    effort: 'low',
-    exclude: true,
-  },
+  ...reviewer('anthropic/claude-sonnet-4.5'),
 }
 
 export default definition

.agents/thinker/decomposing-thinker.ts

@@ -8,7 +8,7 @@ const definition: SecretAgentDefinition = {
   model: 'anthropic/claude-sonnet-4.5',
   displayName: 'Decomposing Thinker',
   spawnerPrompt:
-    'Creates comprehensive analysis by decomposing problems into multiple thinking angles and synthesizing insights from parallel thinker-sonnet agents.',
+    'Creates comprehensive analysis by decomposing problems into multiple thinking angles and synthesizing insights from parallel thinker agents.',
   inputSchema: {
     params: {
       type: 'object',
@@ -19,7 +19,7 @@ const definition: SecretAgentDefinition = {
             type: 'string',
             description: 'A specific problem or topic to analyze',
           },
-          description: 'A list of 2-10 specific problems or topics to analyze',
+          description: 'A list of 2-8 specific problems or topics to analyze',
         },
       },
       required: ['prompts'],
@@ -29,15 +29,15 @@ const definition: SecretAgentDefinition = {
   includeMessageHistory: true,
   outputMode: 'structured_output',
   toolNames: ['spawn_agents', 'set_output'],
-  spawnableAgents: ['thinker-sonnet'],
+  spawnableAgents: ['thinker'],
 
   handleSteps: function* ({ params }) {
     const prompts: string[] = params?.prompts ?? []
     const { toolResult } = yield {
       toolName: 'spawn_agents',
       input: {
         agents: prompts.map((promptText) => ({
-          agent_type: 'thinker-sonnet',
+          agent_type: 'thinker',
           prompt: promptText,
         })),
       },

.agents/thinker/thinker-sonnet.ts

@@ -5,7 +5,7 @@ import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 const definition: SecretAgentDefinition = {
   id: 'thinker',
   publisher,
-  model: 'openai/gpt-5',
+  model: 'anthropic/claude-sonnet-4.5',
   displayName: 'Theo the Theorizer',
   spawnerPrompt:
     'Does deep thinking given the current messages and a specific prompt to focus on. Use this to help you solve a specific problem.',

.agents/thinker/thinker.ts

@@ -175,8 +175,8 @@ export async function getAgentPrompt<T extends StringField>({
   let addendum = ''
 
   if (promptType.type === 'stepPrompt' && agentState.agentType) {
-    // Put step prompt within a system-reminder tag so agent doesn't think the user just spoke again.
-    prompt = `<system-reminder>${prompt}</system-reminder>`
+    // Put step prompt within a system_reminder tag so agent doesn't think the user just spoke again.
+    prompt = `<system_reminder>${prompt}</system_reminder>`
   }
 
   // Add tool instructions, spawnable agents, and output schema prompts to instructionsPrompt