Merge remote-tracking branch 'origin/main' into brandon/tui

# Conflicts:
#	backend/src/run-programmatic-step.ts

Author: brandonkachen

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

@@ -0,0 +1,68 @@
+import { publisher } from '../constants'
+
+import {
+  PLACEHOLDER,
+  type SecretAgentDefinition,
+} from '../types/secret-agent-definition'
+import { AssistantMessage } from 'types/util-types'
+
+const definition: SecretAgentDefinition = {
+  id: 'file-lister-max',
+  displayName: 'Liszt the File Lister',
+  publisher,
+  model: 'anthropic/claude-haiku-4.5',
+  spawnerPrompt: 'Lists files that are relevant to the prompt',
+  inputSchema: {
+    prompt: {
+      type: 'string',
+      description: 'A coding task to complete',
+    },
+  },
+  outputMode: 'last_message',
+  includeMessageHistory: false,
+  toolNames: [],
+  spawnableAgents: [],
+
+  systemPrompt: `You are an expert at finding relevant files in a codebase and listing them out. ${PLACEHOLDER.FILE_TREE_PROMPT}`,
+  instructionsPrompt: `PHASE 1 Instructions:
+- Do not use any tools.
+- Do not write any analysis.
+- List out the full paths of up to 12 files that are relevant to the prompt, separated by newlines.
+- Write out the following string to signal the end of this phase:
+"cb_easp": true
+
+Do not write an introduction. Do not use any tools. Do not write anything else other than the file paths.
+
+PHASE 2 Instructions:
+- Do not use any tools.
+- Do not write any analysis.
+- After reading those files, give your new best guess at the most relevant files, separated by newlines.
+  `.trim(),
+
+  handleSteps: function* ({ logger }) {
+    const { agentState } = yield 'STEP_ALL'
+    const { messageHistory } = agentState
+    const lastAssistantMessage = messageHistory.findLast(
+      (message) => message.role === 'assistant',
+    ) as AssistantMessage
+    const lastMessageContent = lastAssistantMessage.content
+    const lastMessageStr = Array.isArray(lastMessageContent)
+      ? lastMessageContent[0].type === 'text'
+        ? lastMessageContent[0].text
+        : ''
+      : lastMessageContent
+
+    const files = lastMessageStr.split('\n').filter(Boolean)
+
+    yield {
+      toolName: 'read_files',
+      input: {
+        paths: files,
+      },
+    }
+
+    yield 'STEP_ALL'
+  },
+}
+
+export default definition

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

@@ -0,0 +1,34 @@
+import { publisher } from '../constants'
+import {
+  PLACEHOLDER,
+  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',
+  inputSchema: {
+    prompt: {
+      type: 'string',
+      description: 'A coding task to complete',
+    },
+  },
+  outputMode: 'last_message',
+  includeMessageHistory: false,
+  toolNames: [],
+  spawnableAgents: [],
+
+  systemPrompt: `You are an expert at finding relevant files in a codebase and listing them out. ${PLACEHOLDER.FILE_TREE_PROMPT}`,
+  instructionsPrompt: `Instructions:
+- Do not use any tools.
+- Do not write any analysis.
+- List out the full paths of up to 12 files that are relevant to the prompt, separated by newlines.
+
+Do not write an introduction. Do not use any tools. Do not write anything else other than the file paths.
+  `.trim(),
+}
+
+export default definition

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

@@ -21,21 +21,43 @@ const definition: SecretAgentDefinition = {
   },
   outputMode: 'last_message',
   includeMessageHistory: false,
-  toolNames: [],
-  spawnableAgents: [],
+  toolNames: ['spawn_agents'],
+  spawnableAgents: ['file-lister'],
 
   systemPrompt: `You are an expert at finding relevant files in a codebase. ${PLACEHOLDER.FILE_TREE_PROMPT_SMALL}`,
   instructionsPrompt: `Instructions:
 - Don't use any tools.
-- Provide a short report of the locations in the codebase that could be helpful. Focus on the files that are most relevant to the user prompt.
+- Provide a short report of the locations in the codebase that could be helpful. Focus on the files that are most relevant to the user prompt. Leave out irrelevant locations.
 In your report, please give a very concise analysis that includes the full paths of files that are relevant and (briefly) how they could be useful.
   `.trim(),
 
-  handleSteps: function* ({ agentState, prompt, params }) {
-    yield {
-      toolName: 'find_files',
-      input: { prompt: prompt ?? '' },
+  handleSteps: function* ({ prompt, logger }) {
+    const { toolResult: fileListerResults } = yield {
+      toolName: 'spawn_agents',
+      input: {
+        agents: [
+          {
+            agent_type: 'file-lister',
+            prompt: prompt ?? '',
+          },
+        ],
+      },
     } satisfies ToolCall
+
+    const fileListerResult = fileListerResults?.[0]
+    const filesStr =
+      fileListerResult && fileListerResult.type === 'json'
+        ? ((fileListerResult.value as any)?.[0]?.value?.value as string)
+        : ''
+    const files = filesStr.split('\n').filter(Boolean)
+
+    yield {
+      toolName: 'read_files',
+      input: {
+        paths: files,
+      },
+    }
+
     yield 'STEP_ALL'
   },
 }

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

@@ -10,7 +10,7 @@ const definition: SecretAgentDefinition = {
   id: 'file-picker',
   displayName: 'Fletcher the File Fetcher',
   publisher,
-  model: 'x-ai/grok-4-fast',
+  model: 'google/gemini-2.5-flash',
   spawnerPrompt:
     'Spawn to find relevant files in a codebase related to the prompt. Cannot do string searches on the codebase.',
   inputSchema: {
@@ -25,6 +25,7 @@ const definition: SecretAgentDefinition = {
   spawnableAgents: [],
 
   systemPrompt: `You are an expert at finding relevant files in a codebase. ${PLACEHOLDER.FILE_TREE_PROMPT_SMALL}`,
+
   instructionsPrompt: `Instructions:
 Provide a short report of the locations in the codebase that could be helpful. Focus on the files that are most relevant to the user prompt.
 In your report, please give a very concise analysis that includes the full paths of files that are relevant and (briefly) how they could be useful.

backend/src/run-agent-step.ts

@@ -620,9 +620,7 @@ export const loopAgentSteps = async (
         currentAgentState = programmaticAgentState
         totalSteps = stepNumber
 
-        if (endTurn) {
-          shouldEndTurn = true
-        }
+        shouldEndTurn = endTurn
       }
 
       // Check if output is required but missing