Merge origin/main into brandon/upgrade-opentui-2025-10-28

Resolved merge conflicts following the guidance:
- Preferred our theming/UI work (theme system, Separator component)
- Preferred their engineering/systems work (PLAN mode, BuildModeButtons)

Key changes:
- Added PLAN mode support to agent mode toggle with theme system
- Added BuildModeButtons component for plan mode workflow
- Updated theme types to include modePlanBg and modePlanText
- Fixed TypeScript errors in BuildModeButtons (wrap -> wrapMode)

All type checks and builds pass successfully.

Author: brandonkachen

.agents/base2/base2.ts

@@ -49,6 +49,7 @@ export function createBase2(
     toolNames: buildArray(
       'spawn_agents',
       'read_files',
+      'read_subtree',
       'write_todos',
       'str_replace',
       'write_file',
@@ -192,10 +193,10 @@ The user asks you to implement a new feature. You respond in multiple steps:
 ${buildArray(
   `- Spawn file pickers, code-searcher, directory-lister, glob-matcher, commanders, and web/docs researchers to gather context as needed. The file-picker-max agent in particular is very useful to use to find relevant files. Read all the relevant files using the read_files tool. Read as many files as possible so that you have a comprehensive context on the user's request.`,
   `- Important: Read as many files as could possibly be relevant to the task to improve your understanding of the user's request and produce the best possible code changes. This is frequently 12-20 files, depending on the task.`,
-  `- Use the write_todos tool to write out your step-by-step implementation plan.${hasNoValidation ? '' : ' You should include at least one step to validate/test your changes: be specific about whether to typecheck, run tests, run lints, etc.'}`,
+  `- Use the write_todos tool to write out your step-by-step implementation plan. Include ALL of the applicable tasks in the list.${hasNoValidation ? '' : ' You should include at least one step to validate/test your changes: be specific about whether to typecheck, run tests, run lints, etc.'}`,
   `- You must spawn the ${isGpt5 ? 'best-of-n-editor-gpt-5' : 'best-of-n-editor'} agent to implement non-trivial code changes, since it will generate the best code changes from multiple implementation proposals. This is the best way to make high quality code changes -- strongly prefer using this agent over the str_replace or write_file tools, unless the change is very small and trivial.`,
   !hasNoValidation &&
-    `- Test your changes${isFast ? ' briefly' : ''} by running appropriate validation commands for the project (e.g. typechecks, tests, lints, etc.). You may have to explore the project to find the appropriate commands. Don't skip this step!`,
+    `- Test your changes${isFast ? ' briefly' : ''} by running appropriate validation commands for the project (e.g. typechecks, tests, lints, etc.).${isFast ? ' If you can, only typecheck/test the area of the project that you are editing, rather than the entire project.' : ' Start by type checking the specific area of the project that you are editing and then test the entire project if necessary.'} You may have to explore the project to find the appropriate commands. Don't skip this step!`,
   `- Inform the user that you have completed the task in one sentence or a few short bullet points. Don't create any markdown summary files or example documentation files, unless asked by the user. If you already finished the user request and said you're done, then don't say anything else.`,
   isGpt5 && `- Use the task_completed tool.`,
 ).join('\n')}`

.agents/base2/best-of-n/best-of-n-implementor.ts

@@ -12,11 +12,6 @@ export const createBestOfNImplementor = (options: {
   return {
     publisher,
     model: isSonnet ? 'anthropic/claude-sonnet-4.5' : 'openai/gpt-5',
-    ...(isGpt5 && {
-      reasoningOptions: {
-        effort: 'high',
-      },
-    }),
     displayName: 'Implementation Generator',
     spawnerPrompt:
       'Generates a complete implementation plan with all code changes',

.agents/file-explorer/file-lister.ts

@@ -1,27 +1,37 @@
 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: 'file-lister',
   displayName: 'Liszt the File Lister',
   publisher,
   model: 'anthropic/claude-haiku-4.5',
-  spawnerPrompt: 'Lists files that are relevant to the prompt',
+  spawnerPrompt:
+    'Lists up to 12 files that are relevant to the prompt within the given directories. Unless you know which directories are relevant, omit the directories parameter. This agent is great for finding files that could be relevant to the prompt.',
   inputSchema: {
     prompt: {
       type: 'string',
       description: 'A coding task to complete',
     },
+    params: {
+      type: 'object' as const,
+      properties: {
+        directories: {
+          type: 'array' as const,
+          items: { type: 'string' as const },
+          description:
+            'Optional list of paths to directories to look within. If omitted, the entire project tree is used.',
+        },
+      },
+      required: [],
+    },
   },
   outputMode: 'last_message',
   includeMessageHistory: false,
-  toolNames: [],
+  toolNames: ['read_subtree'],
   spawnableAgents: [],
 
-  systemPrompt: `You are an expert at finding relevant files in a codebase and listing them out. ${PLACEHOLDER.FILE_TREE_PROMPT_LARGE}`,
+  systemPrompt: `You are an expert at finding relevant files in a codebase and listing them out.`,
   instructionsPrompt: `Instructions:
 - Do not use any tools.
 - Do not write any analysis.
@@ -44,6 +54,19 @@ README.md
 
 Do not write an introduction. Do not use any tools. Do not write anything else other than the file paths.
   `.trim(),
+
+  handleSteps: function* ({ params }) {
+    const directories = params?.directories ?? []
+    yield {
+      toolName: 'read_subtree',
+      input: {
+        paths: directories,
+        maxTokens: 200_000,
+      },
+    }
+
+    yield 'STEP_ALL'
+  },
 }
 
 export default definition

.agents/file-explorer/file-picker-max.ts

@@ -17,12 +17,24 @@ const definition: SecretAgentDefinition = {
     exclude: false,
   },
   spawnerPrompt:
-    'Spawn to find relevant files in a codebase related to the prompt. Cannot do string searches on the codebase.',
+    'Spawn to find relevant files in a codebase related to the prompt. Cannot do string searches on the codebase, but does a fuzzy search. Unless you know which directories are relevant, omit the directories parameter. This agent is extremely effective at finding files in the codebase that could be relevant to the prompt.',
   inputSchema: {
     prompt: {
       type: 'string',
       description: 'A coding task to complete',
     },
+    params: {
+      type: 'object' as const,
+      properties: {
+        directories: {
+          type: 'array' as const,
+          items: { type: 'string' as const },
+          description:
+            'Optional list of paths to directories to look within. If omitted, the entire project tree is used.',
+        },
+      },
+      required: [],
+    },
   },
   outputMode: 'last_message',
   includeMessageHistory: false,
@@ -35,14 +47,15 @@ Provide an extremely short report of the locations in the codebase that could be
 In your report, please give a very concise analysis that includes the full paths of files that are relevant and (extremely briefly) how they could be useful.
   `.trim(),
 
-  handleSteps: function* ({ prompt, logger }) {
+  handleSteps: function* ({ prompt, params }) {
     const { toolResult: fileListerResults } = yield {
       toolName: 'spawn_agents',
       input: {
         agents: [
           {
             agent_type: 'file-lister',
             prompt: prompt ?? '',
+            params: params ?? {},
           },
         ],
       },
@@ -62,7 +75,7 @@ In your report, please give a very concise analysis that includes the full paths
       },
     }
 
-    yield 'STEP_ALL'
+    yield 'STEP'
   },
 }