Skip to content

Commit 7dc8050

Browse files
charlesliencharleslien
committed
remove agentTemplate from state
1 parent 7909947 commit 7dc8050

File tree

10 files changed

+45
-56
lines changed

10 files changed

+45
-56
lines changed

‎packages/agent-runtime/src/__tests__/cost-aggregation.test.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,25 @@ describe('Cost Aggregation System', () => {
5454
let params: ParamsExcluding<typeof handleSpawnAgents, 'toolCall' | 'state'>
5555

5656
beforeEach(() => {
57+
// Setup mock agent template
58+
mockAgentTemplate = {
59+
id: 'test-agent',
60+
displayName: 'Test Agent',
61+
model: 'gpt-4o-mini',
62+
toolNames: ['write_file'],
63+
spawnableAgents: ['test-agent'],
64+
systemPrompt: 'Test system prompt',
65+
instructionsPrompt: 'Test instructions',
66+
stepPrompt: 'Test step prompt',
67+
includeMessageHistory: true,
68+
inheritParentSystemPrompt: false,
69+
outputMode: 'last_message',
70+
inputSchema: {},
71+
}
72+
5773
params = {
5874
...TEST_AGENT_RUNTIME_IMPL,
75+
agentTemplate: mockAgentTemplate,
5976
ancestorRunIds: [],
6077
clientSessionId: 'test-session',
6178
fileContext: mockFileContext,
@@ -71,22 +88,6 @@ describe('Cost Aggregation System', () => {
7188
getLatestState: () => ({ messages: [] }),
7289
}
7390

74-
// Setup mock agent template
75-
mockAgentTemplate = {
76-
id: 'test-agent',
77-
displayName: 'Test Agent',
78-
model: 'gpt-4o-mini',
79-
toolNames: ['write_file'],
80-
spawnableAgents: ['test-agent'],
81-
systemPrompt: 'Test system prompt',
82-
instructionsPrompt: 'Test instructions',
83-
stepPrompt: 'Test step prompt',
84-
includeMessageHistory: true,
85-
inheritParentSystemPrompt: false,
86-
outputMode: 'last_message',
87-
inputSchema: {},
88-
}
89-
9091
mockLocalAgentTemplates = {
9192
'test-agent': mockAgentTemplate,
9293
}
@@ -148,7 +149,6 @@ describe('Cost Aggregation System', () => {
148149
const mockValidatedState = {
149150
fingerprintId: 'test-fingerprint',
150151
userId: 'test-user',
151-
agentTemplate: mockAgentTemplate,
152152
localAgentTemplates: mockLocalAgentTemplates,
153153
messages: [],
154154
agentState: parentAgentState,

‎packages/agent-runtime/src/__tests__/spawn-agents-message-history.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('Spawn Agents Message History', () => {
3535

3636
let handleSpawnAgentsBaseParams: ParamsExcluding<
3737
typeof handleSpawnAgents,
38-
'toolCall' | 'state' | 'getLatestState'
38+
'toolCall' | 'state' | 'getLatestState' | 'agentTemplate'
3939
>
4040
let baseState: Omit<
4141
ParamsOf<typeof handleSpawnAgents>['state'],
@@ -141,11 +141,11 @@ describe('Spawn Agents Message History', () => {
141141

142142
const { result } = handleSpawnAgents({
143143
...handleSpawnAgentsBaseParams,
144+
agentTemplate: parentAgent,
144145
toolCall,
145146
getLatestState: () => ({ messages: mockMessages }),
146147
state: {
147148
...baseState,
148-
agentTemplate: parentAgent,
149149
localAgentTemplates: { 'child-agent': childAgent },
150150
messages: mockMessages,
151151
agentState: sessionState.mainAgentState,
@@ -206,11 +206,11 @@ describe('Spawn Agents Message History', () => {
206206

207207
const { result } = handleSpawnAgents({
208208
...handleSpawnAgentsBaseParams,
209+
agentTemplate: parentAgent,
209210
toolCall,
210211
getLatestState: () => ({ messages: mockMessages }),
211212
state: {
212213
...baseState,
213-
agentTemplate: parentAgent,
214214
localAgentTemplates: { 'child-agent': childAgent },
215215
messages: mockMessages,
216216
agentState: sessionState.mainAgentState,
@@ -233,11 +233,11 @@ describe('Spawn Agents Message History', () => {
233233

234234
const { result } = handleSpawnAgents({
235235
...handleSpawnAgentsBaseParams,
236+
agentTemplate: parentAgent,
236237
toolCall,
237238
getLatestState: () => ({ messages: mockMessages }),
238239
state: {
239240
...baseState,
240-
agentTemplate: parentAgent,
241241
localAgentTemplates: { 'child-agent': childAgent },
242242
messages: mockMessages,
243243
agentState: sessionState.mainAgentState,
@@ -263,11 +263,11 @@ describe('Spawn Agents Message History', () => {
263263

264264
const { result } = handleSpawnAgents({
265265
...handleSpawnAgentsBaseParams,
266+
agentTemplate: parentAgent,
266267
toolCall,
267268
getLatestState: () => ({ messages: mockMessages }),
268269
state: {
269270
...baseState,
270-
agentTemplate: parentAgent,
271271
localAgentTemplates: { 'child-agent': childAgent },
272272
messages: mockMessages,
273273
agentState: sessionState.mainAgentState,

‎packages/agent-runtime/src/__tests__/spawn-agents-permissions.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('Spawn Agents Permissions', () => {
3030
let mockLoopAgentSteps: any
3131
let handleSpawnAgentsBaseParams: ParamsExcluding<
3232
typeof handleSpawnAgents,
33-
'toolCall' | 'state'
33+
'toolCall' | 'state' | 'agentTemplate'
3434
>
3535
let baseState: Omit<
3636
ParamsOf<typeof handleSpawnAgents>['state'],
@@ -268,10 +268,10 @@ describe('Spawn Agents Permissions', () => {
268268

269269
const { result } = handleSpawnAgents({
270270
...handleSpawnAgentsBaseParams,
271+
agentTemplate: parentAgent,
271272
toolCall,
272273
state: {
273274
...baseState,
274-
agentTemplate: parentAgent,
275275
localAgentTemplates: { thinker: childAgent },
276276
agentState: sessionState.mainAgentState,
277277
},
@@ -290,10 +290,10 @@ describe('Spawn Agents Permissions', () => {
290290

291291
const { result } = handleSpawnAgents({
292292
...handleSpawnAgentsBaseParams,
293+
agentTemplate: parentAgent,
293294
toolCall,
294295
state: {
295296
...baseState,
296-
agentTemplate: parentAgent,
297297
localAgentTemplates: { reviewer: childAgent },
298298
agentState: sessionState.mainAgentState,
299299
},
@@ -314,10 +314,10 @@ describe('Spawn Agents Permissions', () => {
314314

315315
const { result } = handleSpawnAgents({
316316
...handleSpawnAgentsBaseParams,
317+
agentTemplate: parentAgent,
317318
toolCall,
318319
state: {
319320
...baseState,
320-
agentTemplate: parentAgent,
321321
localAgentTemplates: {}, // Empty - agent not found
322322
agentState: sessionState.mainAgentState,
323323
},
@@ -340,10 +340,10 @@ describe('Spawn Agents Permissions', () => {
340340

341341
const { result } = handleSpawnAgents({
342342
...handleSpawnAgentsBaseParams,
343+
agentTemplate: parentAgent,
343344
toolCall,
344345
state: {
345346
...baseState,
346-
agentTemplate: parentAgent,
347347
localAgentTemplates: { 'codebuff/thinker@1.0.0': childAgent },
348348
agentState: sessionState.mainAgentState,
349349
},
@@ -362,10 +362,10 @@ describe('Spawn Agents Permissions', () => {
362362

363363
const { result } = handleSpawnAgents({
364364
...handleSpawnAgentsBaseParams,
365+
agentTemplate: parentAgent,
365366
toolCall,
366367
state: {
367368
...baseState,
368-
agentTemplate: parentAgent,
369369
localAgentTemplates: {
370370
thinker: childAgent,
371371
'codebuff/thinker@1.0.0': childAgent, // Register with both keys
@@ -387,10 +387,10 @@ describe('Spawn Agents Permissions', () => {
387387

388388
const { result } = handleSpawnAgents({
389389
...handleSpawnAgentsBaseParams,
390+
agentTemplate: parentAgent,
390391
toolCall,
391392
state: {
392393
...baseState,
393-
agentTemplate: parentAgent,
394394
localAgentTemplates: { 'codebuff/thinker@2.0.0': childAgent },
395395
agentState: sessionState.mainAgentState,
396396
},
@@ -423,10 +423,10 @@ describe('Spawn Agents Permissions', () => {
423423

424424
const { result } = handleSpawnAgents({
425425
...handleSpawnAgentsBaseParams,
426+
agentTemplate: parentAgent,
426427
toolCall,
427428
state: {
428429
...baseState,
429-
agentTemplate: parentAgent,
430430
localAgentTemplates: {
431431
thinker: thinkerAgent,
432432
reviewer: reviewerAgent,
@@ -466,10 +466,10 @@ describe('Spawn Agents Permissions', () => {
466466

467467
const { result } = handleSpawnAgentInline({
468468
...handleSpawnAgentsBaseParams,
469+
agentTemplate: parentAgent,
469470
toolCall,
470471
state: {
471472
...baseState,
472-
agentTemplate: parentAgent,
473473
localAgentTemplates: { thinker: childAgent },
474474
agentState: sessionState.mainAgentState,
475475
},
@@ -487,10 +487,10 @@ describe('Spawn Agents Permissions', () => {
487487

488488
const { result } = handleSpawnAgentInline({
489489
...handleSpawnAgentsBaseParams,
490+
agentTemplate: parentAgent,
490491
toolCall,
491492
state: {
492493
...baseState,
493-
agentTemplate: parentAgent,
494494
localAgentTemplates: { reviewer: childAgent },
495495
agentState: sessionState.mainAgentState,
496496
},
@@ -509,10 +509,10 @@ describe('Spawn Agents Permissions', () => {
509509

510510
const { result } = handleSpawnAgentInline({
511511
...handleSpawnAgentsBaseParams,
512+
agentTemplate: parentAgent,
512513
toolCall,
513514
state: {
514515
...baseState,
515-
agentTemplate: parentAgent,
516516
localAgentTemplates: {}, // Empty - agent not found
517517
agentState: sessionState.mainAgentState,
518518
},
@@ -530,10 +530,10 @@ describe('Spawn Agents Permissions', () => {
530530

531531
const { result } = handleSpawnAgentInline({
532532
...handleSpawnAgentsBaseParams,
533+
agentTemplate: parentAgent,
533534
toolCall,
534535
state: {
535536
...baseState,
536-
agentTemplate: parentAgent,
537537
localAgentTemplates: { 'codebuff/thinker@1.0.0': childAgent },
538538
agentState: sessionState.mainAgentState,
539539
},
@@ -551,10 +551,10 @@ describe('Spawn Agents Permissions', () => {
551551

552552
const { result } = handleSpawnAgentInline({
553553
...handleSpawnAgentsBaseParams,
554+
agentTemplate: parentAgent,
554555
toolCall,
555556
state: {
556557
...baseState,
557-
agentTemplate: parentAgent,
558558
localAgentTemplates: {
559559
thinker: childAgent,
560560
'codebuff/thinker@1.0.0': childAgent, // Register with both keys
@@ -575,10 +575,10 @@ describe('Spawn Agents Permissions', () => {
575575

576576
const { result } = handleSpawnAgentInline({
577577
...handleSpawnAgentsBaseParams,
578+
agentTemplate: parentAgent,
578579
toolCall,
579580
state: {
580581
...baseState,
581-
agentTemplate: parentAgent,
582582
localAgentTemplates: { 'codebuff/thinker@2.0.0': childAgent },
583583
agentState: sessionState.mainAgentState,
584584
},

‎packages/agent-runtime/src/__tests__/subagent-streaming.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe('Subagent Streaming', () => {
3636
>
3737
let handleSpawnAgentsBaseParams: ParamsExcluding<
3838
typeof handleSpawnAgents,
39-
'toolCall' | 'state'
39+
'toolCall' | 'state' | 'agentTemplate'
4040
>
4141
let baseState: Omit<
4242
ParamsOf<typeof handleSpawnAgents>['state'],
@@ -160,10 +160,10 @@ describe('Subagent Streaming', () => {
160160

161161
const { result } = handleSpawnAgents({
162162
...handleSpawnAgentsBaseParams,
163+
agentTemplate: parentTemplate,
163164
toolCall,
164165
state: {
165166
...baseState,
166-
agentTemplate: parentTemplate,
167167
localAgentTemplates: {
168168
[mockAgentTemplate.id]: mockAgentTemplate,
169169
},
@@ -214,10 +214,10 @@ describe('Subagent Streaming', () => {
214214

215215
const { result } = handleSpawnAgents({
216216
...handleSpawnAgentsBaseParams,
217+
agentTemplate: parentTemplate,
217218
toolCall,
218219
state: {
219220
...baseState,
220-
agentTemplate: parentTemplate,
221221
localAgentTemplates: {
222222
[mockAgentTemplate.id]: mockAgentTemplate,
223223
},

‎packages/agent-runtime/src/tools/handlers/handler-function-type.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ type PresentOrAbsent<K extends PropertyKey, V> =
2525
| { [P in K]: never }
2626
export type State = {
2727
creditsUsed?: number | Promise<number>
28-
agentTemplate: AgentTemplate
2928
localAgentTemplates: Record<string, AgentTemplate>
3029
sendSubagentChunk: SendSubagentChunkFn
3130
agentState: AgentState
@@ -56,6 +55,7 @@ export type CodebuffToolHandlerFunction<T extends ToolName = ToolName> = (
5655
toolCall: CodebuffToolCall<T>
5756

5857
agentStepId: string
58+
agentTemplate: AgentTemplate
5959
ancestorRunIds: string[]
6060
apiKey: string
6161
clientSessionId: string

‎packages/agent-runtime/src/tools/handlers/tool/spawn-agent-inline.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export const handleSpawnAgentInline = ((
2626
previousToolCallFinished: Promise<void>
2727
toolCall: CodebuffToolCall<ToolName>
2828

29+
agentTemplate: AgentTemplate
2930
clientSessionId: string
3031
fileContext: ProjectFileContext
3132
fingerprintId: string
@@ -36,7 +37,6 @@ export const handleSpawnAgentInline = ((
3637

3738
getLatestState: () => { messages: Message[] }
3839
state: {
39-
agentTemplate: AgentTemplate
4040
localAgentTemplates: Record<string, AgentTemplate>
4141
messages: Message[]
4242
agentState: AgentState
@@ -60,7 +60,8 @@ export const handleSpawnAgentInline = ((
6060
const {
6161
previousToolCallFinished,
6262
toolCall,
63-
63+
64+
agentTemplate: parentAgentTemplate,
6465
fingerprintId,
6566
userInputId,
6667
writeToClient,
@@ -74,7 +75,6 @@ export const handleSpawnAgentInline = ((
7475
params: spawnParams,
7576
} = toolCall.input
7677
const {
77-
agentTemplate: parentAgentTemplate,
7878
localAgentTemplates,
7979
agentState: parentAgentState,
8080
system,

0 commit comments

Comments
 (0)