Skip to content

Commit 96caea0

Browse files
jahoomajahooma
committed
Update file picker max to spawn one file-lister-max that lists 20 files instead of 12
1 parent 47bdcf0 commit 96caea0

File tree

3 files changed

+71
-61
lines changed

3 files changed

+71
-61
lines changed

‎agents/__tests__/file-picker.test.ts‎

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('file-picker agent', () => {
8080
})
8181

8282
describe('createFilePicker - max mode', () => {
83-
test('spawns two file-listers in parallel', () => {
83+
test('spawns single file-lister-max', () => {
8484
const maxPicker = createFilePicker('max')
8585
const mockAgentState = createMockAgentState()
8686
const mockLogger = {
@@ -100,9 +100,13 @@ describe('file-picker agent', () => {
100100

101101
const toolCall = result.value as ToolCall<'spawn_agents'>
102102
expect(toolCall.toolName).toBe('spawn_agents')
103-
expect(toolCall.input.agents).toHaveLength(2)
104-
expect(toolCall.input.agents[0].agent_type).toBe('file-lister')
105-
expect(toolCall.input.agents[1].agent_type).toBe('file-lister')
103+
expect(toolCall.input.agents).toHaveLength(1)
104+
expect(toolCall.input.agents[0].agent_type).toBe('file-lister-max')
105+
})
106+
107+
test('includes file-lister-max in spawnableAgents', () => {
108+
const maxPicker = createFilePicker('max')
109+
expect(maxPicker.spawnableAgents).toContain('file-lister-max')
106110
})
107111
})
108112

@@ -419,7 +423,7 @@ describe('file-picker agent', () => {
419423
})
420424

421425
describe('handleStepsMax', () => {
422-
test('spawns two file-listers in parallel', () => {
426+
test('spawns single file-lister-max with prompt and params', () => {
423427
const maxPicker = createFilePicker('max')
424428
const mockAgentState = createMockAgentState()
425429
const mockLogger = {
@@ -440,16 +444,13 @@ describe('file-picker agent', () => {
440444

441445
const toolCall = result.value as ToolCall<'spawn_agents'>
442446
expect(toolCall.toolName).toBe('spawn_agents')
443-
expect(toolCall.input.agents).toHaveLength(2)
444-
445-
// Both should have same prompt and params
447+
expect(toolCall.input.agents).toHaveLength(1)
448+
expect(toolCall.input.agents[0].agent_type).toBe('file-lister-max')
446449
expect(toolCall.input.agents[0].prompt).toBe('Find auth files')
447-
expect(toolCall.input.agents[1].prompt).toBe('Find auth files')
448450
expect(toolCall.input.agents[0].params).toEqual({ directories: ['src'] })
449-
expect(toolCall.input.agents[1].params).toEqual({ directories: ['src'] })
450451
})
451452

452-
test('merges results from both file-listers', () => {
453+
test('extracts results from file-lister-max', () => {
453454
const maxPicker = createFilePicker('max')
454455
const mockAgentState = createMockAgentState()
455456
const mockLogger = {
@@ -467,7 +468,6 @@ describe('file-picker agent', () => {
467468

468469
generator.next()
469470

470-
// Mock result with two spawned agent results - wrapped in toolResult with production structure
471471
const mockToolResult = {
472472
agentState: createMockAgentState(),
473473
toolResult: [
@@ -476,29 +476,14 @@ describe('file-picker agent', () => {
476476
value: [
477477
{
478478
agentName: 'File Lister',
479-
agentType: 'file-lister',
480-
value: {
481-
type: 'lastMessage',
482-
value: [
483-
{
484-
role: 'assistant',
485-
content: [
486-
{ type: 'text', text: 'src/auth.ts\nsrc/login.ts' },
487-
],
488-
},
489-
],
490-
},
491-
},
492-
{
493-
agentName: 'File Lister',
494-
agentType: 'file-lister',
479+
agentType: 'file-lister-max',
495480
value: {
496481
type: 'lastMessage',
497482
value: [
498483
{
499484
role: 'assistant',
500485
content: [
501-
{ type: 'text', text: 'src/user.ts\nsrc/auth.ts' }, // auth.ts is duplicate
486+
{ type: 'text', text: 'src/auth.ts\nsrc/login.ts\nsrc/user.ts' },
502487
],
503488
},
504489
],
@@ -512,7 +497,6 @@ describe('file-picker agent', () => {
512497

513498
const result = generator.next(mockToolResult)
514499

515-
// Should merge and deduplicate
516500
const toolCall = result.value as ToolCall<'read_files'>
517501
const paths = toolCall.input.paths
518502
expect(paths).toHaveLength(3)
@@ -521,7 +505,7 @@ describe('file-picker agent', () => {
521505
expect(paths).toContain('src/user.ts')
522506
})
523507

524-
test('handles partial failures in max mode', () => {
508+
test('handles error from file-lister-max', () => {
525509
const maxPicker = createFilePicker('max')
526510
const mockAgentState = createMockAgentState()
527511
const mockLogger = {
@@ -539,7 +523,6 @@ describe('file-picker agent', () => {
539523

540524
generator.next()
541525

542-
// One success, one error - wrapped in toolResult with production structure
543526
const mockToolResult = {
544527
agentState: createMockAgentState(),
545528
toolResult: [
@@ -548,23 +531,10 @@ describe('file-picker agent', () => {
548531
value: [
549532
{
550533
agentName: 'File Lister',
551-
agentType: 'file-lister',
552-
value: {
553-
type: 'lastMessage',
554-
value: [
555-
{
556-
role: 'assistant',
557-
content: [{ type: 'text', text: 'src/file.ts' }],
558-
},
559-
],
560-
},
561-
},
562-
{
563-
agentName: 'File Lister',
564-
agentType: 'file-lister',
534+
agentType: 'file-lister-max',
565535
value: {
566536
type: 'error',
567-
message: 'Second file-lister failed',
537+
message: 'File lister max failed',
568538
},
569539
},
570540
],
@@ -575,10 +545,10 @@ describe('file-picker agent', () => {
575545

576546
const result = generator.next(mockToolResult)
577547

578-
// Should still proceed with successful results
579-
const toolCall = result.value as ToolCall<'read_files'>
580-
expect(toolCall.toolName).toBe('read_files')
581-
expect(toolCall.input.paths).toContain('src/file.ts')
548+
const stepText = result.value as StepText
549+
expect(stepText.type).toBe('STEP_TEXT')
550+
expect(stepText.text).toContain('Error from file-lister')
551+
expect(stepText.text).toContain('File lister max failed')
582552
})
583553
})
584554

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { type SecretAgentDefinition } from '../types/secret-agent-definition'
2+
import { createFileLister } from './file-lister'
3+
4+
const base = createFileLister()
5+
6+
const definition: SecretAgentDefinition = {
7+
id: 'file-lister-max',
8+
...base,
9+
spawnerPrompt:
10+
'Lists up to 20 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.',
11+
instructionsPrompt: `Instructions:
12+
- List out the full paths of 20 files that are relevant to the prompt, separated by newlines. Each file path is relative to the project root. Don't forget to include all the subdirectories in the path -- sometimes you have forgotten to include 'src' in the path. Make sure that the file paths are exactly correct.
13+
- Do not write any introductory commentary.
14+
- Do not write any analysis or any English text at all.
15+
- Do not use any more tools. Do not call read_subtree again.
16+
17+
Here's an example response with made up file paths (these are not real file paths, just an example):
18+
<example_response>
19+
packages/core/src/index.ts
20+
packages/core/src/api/server.ts
21+
packages/core/src/api/routes/user.ts
22+
packages/core/src/api/routes/auth.ts
23+
packages/core/src/api/middleware/cors.ts
24+
packages/core/src/utils/logger.ts
25+
packages/core/src/utils/validator.ts
26+
packages/core/src/utils/crypto.ts
27+
packages/common/src/util/stringify.ts
28+
packages/common/src/types/user.ts
29+
packages/common/src/types/config.ts
30+
packages/common/src/constants/index.ts
31+
packages/common/src/constants/routes.ts
32+
packages/utils/src/cli/parseArgs.ts
33+
packages/utils/src/cli/format.ts
34+
packages/utils/src/cli/prompt.ts
35+
docs/routes/index.md
36+
docs/routes/user.md
37+
docs/api/auth.md
38+
package.json
39+
</example_response>
40+
41+
Again: Do not call any tools or write anything else other than the chosen file paths on new lines. Go.`.trim(),
42+
}
43+
44+
export default definition

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ export const createFilePicker = (
2424
effort: 'low',
2525
exclude: false,
2626
},
27-
spawnerPrompt:
28-
'Spawn to find relevant files in a codebase related to the prompt. Outputs up to 12 file paths with short summaries for each file. 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.',
27+
spawnerPrompt: `Spawn to find relevant files in a codebase related to the prompt. Outputs up to ${isMax ? 20 : 12} file paths with short summaries for each file. 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.`,
2928
inputSchema: {
3029
prompt: {
3130
type: 'string',
@@ -48,7 +47,9 @@ export const createFilePicker = (
4847
outputMode: 'last_message',
4948
includeMessageHistory: false,
5049
toolNames: ['spawn_agents'],
51-
spawnableAgents: ['file-lister'],
50+
spawnableAgents: isMax
51+
? ['file-lister-max']
52+
: ['file-lister'],
5253

5354
systemPrompt: `You are an expert at finding relevant files in a codebase. ${PLACEHOLDER.FILE_TREE_PROMPT}`,
5455
instructionsPrompt: `Instructions:
@@ -159,7 +160,7 @@ const handleStepsDefault: SecretAgentDefinition['handleSteps'] = function* ({
159160
}
160161
}
161162

162-
// handleSteps for max mode - spawns 2 file-listers in parallel
163+
// handleSteps for max mode - spawns 1 file-lister-max
163164
const handleStepsMax: SecretAgentDefinition['handleSteps'] = function* ({
164165
prompt,
165166
params,
@@ -169,12 +170,7 @@ const handleStepsMax: SecretAgentDefinition['handleSteps'] = function* ({
169170
input: {
170171
agents: [
171172
{
172-
agent_type: 'file-lister',
173-
prompt: prompt ?? '',
174-
params: params ?? {},
175-
},
176-
{
177-
agent_type: 'file-lister',
173+
agent_type: 'file-lister-max',
178174
prompt: prompt ?? '',
179175
params: params ?? {},
180176
},

0 commit comments

Comments
 (0)