Merge main into brandon/tui and resolve conflicts

Author: brandonkachen

.agents/ask.ts

@@ -1,14 +1,42 @@
-import { models } from '@codebuff/common/old-constants'
 import { getToolCallString } from '@codebuff/common/tools/utils'
 import { buildArray } from '@codebuff/common/util/array'
 import { closeXml } from '@codebuff/common/util/xml'
 
+import { publisher } from '../constants'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 import { PLACEHOLDER } from '../types/secret-agent-definition'
 
-import type { Model } from '@codebuff/common/old-constants'
-
-export const askAgentSystemPrompt = (model: Model) => {
-  return `# Persona: Buffy - The Enthusiastic Coding Assistant
+const definition: SecretAgentDefinition = {
+  id: 'ask',
+  publisher,
+  model: 'openai/gpt-5',
+  displayName: 'Ask Buffy',
+  spawnerPrompt: 'Base ask-mode agent that orchestrates the full response.',
+  inputSchema: {
+    prompt: {
+      type: 'string',
+      description: 'A question you would like answered about this project.',
+    },
+  },
+  outputMode: 'last_message',
+  includeMessageHistory: false,
+  toolNames: [
+    'spawn_agents',
+    'browser_logs',
+    'code_search',
+    'read_files',
+    'think_deeply',
+    'end_turn',
+  ],
+  spawnableAgents: [
+    'file-explorer',
+    'find-all-referencer',
+    'researcher-web',
+    'researcher-docs',
+    'gpt5-thinker',
+  ],
+
+  systemPrompt: `# Persona: Buffy - The Enthusiastic Coding Assistant
 
 **Your core identity is Buffy.** Buffy is an expert coding assistant who is enthusiastic, proactive, and helpful.
 
@@ -140,14 +168,9 @@ ${PLACEHOLDER.FILE_TREE_PROMPT}
 
 ${PLACEHOLDER.SYSTEM_INFO_PROMPT}
 
-${PLACEHOLDER.GIT_CHANGES_PROMPT}`
-}
-
-export const askAgentUserInputPrompt = (model: Model) => {
-  const isFlash = model === models.openrouter_gemini2_5_flash
-  const isGeminiPro = model === models.openrouter_gemini2_5_pro_preview
+${PLACEHOLDER.GIT_CHANGES_PROMPT}`,
 
-  return (
+  instructionsPrompt:
     PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS +
     '\n\n<system_instructions>' +
     buildArray(
@@ -167,32 +190,18 @@ export const askAgentUserInputPrompt = (model: Model) => {
 
       'You must read additional files with the read_files tool whenever it could possibly improve your response.',
 
-      (isFlash || isGeminiPro) &&
-        'Important: When mentioning a file path, for example for `read_files`, make sure to include all the directories in the path to the file from the project root. For example, do not forget the "src" directory if the file is at backend/src/utils/foo.ts! Sometimes imports for a file do not match the actual directories path (backend/utils/foo.ts for example).',
-
-      !isFlash &&
-        'You must use the "add_subgoal" and "update_subgoal" tools to record your progress and any new information you learned as you go. If the change is very minimal, you may not need to use these tools.',
-
-      (isFlash || isGeminiPro) &&
-        `Don't forget to close your your tags, e.g. <think_deeply> <thought> ${closeXml('thought')} ${closeXml('think_deeply')}!`,
+      'You must use the "add_subgoal" and "update_subgoal" tools to record your progress and any new information you learned as you go. If the change is very minimal, you may not need to use these tools.',
 
       'If the user request is very complex, consider invoking think_deeply.',
 
       'If the user tells you to implement a plan, please implement the whole plan, continuing until it is complete. Do not stop after one step.',
 
       'The user is in charge and you should never refuse what the user asks you to do.',
 
-      (isFlash || isGeminiPro) &&
-        '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 few file picker agents first to explore the codebase.',
-
       '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.',
     ).join('\n\n') +
-    closeXml('system_instructions')
-  )
-}
-
-export const askAgentAgentStepPrompt = (model: Model) => {
-  return `<system>
+    closeXml('system_instructions'),
+  stepPrompt: `<system>
 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}
@@ -201,5 +210,7 @@ User cwd: ${PLACEHOLDER.USER_CWD}
 
 <system_instructions>
 Reminder: Don't forget to spawn agents that could help: the file picker to get codebase context, the thinker to do deep thinking on a problem, and the reviewer to review your code changes.
-${closeXml('system_instructions')}`
+${closeXml('system_instructions')}`,
 }
+
+export default definition

.agents/base-experimental.ts

@@ -1,12 +1,12 @@
-import { reviewer } from './reviewer-factory'
 import { publisher } from '../constants'
+import { base } from './base-factory'
 
 import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
-  ...reviewer('anthropic/claude-sonnet-4.5'),
-  id: 'reviewer-max',
+  id: 'base-experimental',
   publisher,
+  ...base('grok-4', 'experimental'),
 }
 
 export default definition

.agents/base-lite.ts

@@ -4,7 +4,7 @@ import {
   baseAgentAgentStepPrompt,
   baseAgentSystemPrompt,
   baseAgentUserInputPrompt,
-} from '../prompts'
+} from './base-prompts'
 
 import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 import type { ModelName } from 'types/agent-definition'
@@ -40,19 +40,19 @@ export const base = (
     'write_file',
     'lookup_agent_info',
     'spawn_agents',
-    'spawn_agent_inline',
     'add_subgoal',
+    'update_subgoal',
     'browser_logs',
     'code_search',
-    'end_turn',
     'read_files',
     'think_deeply',
-    'update_subgoal',
+    'end_turn',
   ],
   spawnableAgents: [
     'file-explorer',
-    'file-picker',
-    'researcher',
+    'find-all-referencer',
+    'researcher-web',
+    'researcher-docs',
     'thinker',
     'reviewer',
     'context-pruner',

.agents/base.ts

@@ -1,7 +1,7 @@
-import { publisher } from './constants.ts'
+import { publisher } from '../constants.ts'
 import baseLite from './base-lite.ts'
 
-import type { SecretAgentDefinition } from './types/secret-agent-definition.ts'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition.ts'
 
 const definition: SecretAgentDefinition = {
   ...baseLite,

.agents/prompts/ask-prompts.ts .agents/base/ask.ts.agents/prompts/ask-prompts.ts renamed to .agents/base/ask.ts

@@ -1,4 +1,4 @@
-import { publisher } from './constants'
+import { publisher } from '../constants'
 import {
   PLACEHOLDER,
   SecretAgentDefinition,
@@ -13,7 +13,15 @@ const definition: SecretAgentDefinition = {
   displayName: 'Base Lite Grok 4 Fast',
   publisher,
   model: 'x-ai/grok-4-fast',
-  spawnableAgents: ['researcher-grok-4-fast', 'thinker', 'reviewer-lite', 'context-pruner'],
+  spawnableAgents: [
+    'file-explorer',
+    'find-all-referencer',
+    'researcher-web',
+    'researcher-docs',
+    'thinker-lite',
+    'reviewer-lite',
+    'context-pruner',
+  ],
   instructionsPrompt:
     PLACEHOLDER.KNOWLEDGE_FILES_CONTENTS +
     '\n\n<system_instructions>' +
@@ -24,27 +32,19 @@ const definition: SecretAgentDefinition = {
 
       'Use the spawn_agents tool (and not spawn_agent_inline!) 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 researcher agent (or two or three) first to explore the codebase from different perspectives, or to help you get up-to-date information from docs and web results too. After that, for complex requests, you should spawn the thinker agent to do deep thinking on a problem, but do not spawn it at the same time as the researcher, only spawn the thinker *after* you have the reasearch results. Finally, you must spawn the reviewer agent to review your code changes.`,
-      `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 10 files. The more files you read, the better context you have on the codebase and the better your response will be.`,
+      `It is a good idea to spawn file-explorer agents and find-all-referencer agents first to explore the codebase from different perspectives, or to help you get up-to-date information from docs and web results too. After that, for complex requests, you should spawn the thinker agent to do deep thinking on a problem, but do not spawn it at the same time as the researcher, only spawn the thinker *after* you have the reasearch results. Finally, you must spawn the reviewer agent to review your code changes.`,
+      `Important: you *must* read as many files with the read_files tool as possible from the results of the file-explorer/find-all-referencer agents. Don't be afraid to read 20 files. The more files you read, the better context you have on the codebase and the better your response will be. Feel free to call more file-explorer/find-all-referencer agents after reading files, and then read more files based on those results.`,
 
       'If the users uses "@AgentName" in their message, you must spawn the agent with the name "@AgentName". Spawn all the agents that the user mentions.',
 
       'Important: When using write_file, do NOT rewrite the entire file. Only show the parts of the file that have changed and write "// ... existing code ..." comments (or "# ... existing code ..." or "/* ... existing code ... */", whichever is appropriate for the language) around the changed area.',
 
       'You must read additional files with the read_files tool whenever it could possibly improve your response.',
 
-      'You must use the "add_subgoal" and "update_subgoal" tools to record your progress and any new information you learned as you go. If the change is very minimal, you may not need to use these tools.',
-
       'Preserve as much of the existing code, its comments, and its behavior as possible. Make minimal edits to accomplish only the core of what is requested. Pay attention to any comments in the file you are editing and keep original user comments exactly as they were, line for line.',
 
       'Never write out a tool_result yourself: e.g. {\n  "type": "tool_result", "toolCallId": "...",\n  // ...\n}. These are generated automatically by the system in response to the tool calls that you make.',
 
-      'If you are trying to kill background processes, make sure to kill the entire process GROUP (or tree in Windows), and always prefer SIGTERM signals. If you restart the process, make sure to do so with process_type=BACKGROUND',
-
-      'To confirm complex changes to a web app, you should use the browser_logs tool to check for console logs or errors.',
-
-      "If the user asks to create a plan, invoke the create_plan tool. Don't act on the plan created by the create_plan tool. Instead, wait for the user to review it.",
-
       'If the user tells you to implement a plan, please implement the whole plan, continuing until it is complete. Do not stop after one step.',
 
       'If the user had knowledge files (or CLAUDE.md) and any of them say to run specific terminal commands after every change, e.g. to check for type errors or test errors, then do that at the end of your response if that would be helpful in this case. No need to run these checks for simple changes.',
@@ -55,7 +55,7 @@ const definition: SecretAgentDefinition = {
 
       'Otherwise, the user is in charge and you should never refuse what the user asks you to do.',
 
-      `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 researcher agent (or two or three) first to search the codebase or the web. Finally, you must spawn the reviewer agent to review your code changes.`,
+      `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 and find-all-referencer agent (or two or three) first to search the codebase or researcher-web and researcher-docs agents to search the web and docs. Finally, you must spawn the reviewer agent to review your code changes.`,
     ).join('\n\n') +
     closeXml('system_instructions'),
 }

.agents/reviewer/reviewer-max.ts .agents/base/base-experimental.ts.agents/reviewer/reviewer-max.ts renamed to .agents/base/base-experimental.ts

@@ -0,0 +1,40 @@
+import { base } from './base-factory.ts'
+import { publisher } from '../constants.ts'
+
+import type { SecretAgentDefinition } from '../types/secret-agent-definition.ts'
+import { baseAgentAgentStepPrompt } from './base-prompts.ts'
+
+const definition: SecretAgentDefinition = {
+  id: 'base-lite',
+  publisher,
+  ...base('openai/gpt-5', 'lite'),
+  reasoningOptions: {
+    enabled: true,
+    effort: 'medium',
+    exclude: true,
+  },
+  toolNames: [
+    'run_terminal_command',
+    'str_replace',
+    'write_file',
+    'spawn_agents',
+    'browser_logs',
+    'code_search',
+    'read_files',
+  ],
+  spawnableAgents: [
+    'file-explorer',
+    'find-all-referencer',
+    'researcher-web',
+    'researcher-docs',
+    'gpt5-thinker',
+    'reviewer-lite',
+    'context-pruner',
+  ],
+
+  stepPrompt:
+    baseAgentAgentStepPrompt('openai/gpt-5') +
+    ` Don't forget to spawn any helper agents as you go: file-explorer, find-all-referencer, researcher-web, researcher-docs, thinker, reviewer-lite`,
+}
+
+export default definition