Expire user instructions message when spawning child

Author: jahooma

backend/src/tools/handlers/tool/spawn-agent-inline.ts

@@ -60,7 +60,7 @@ export const handleSpawnAgentInline = ((params: {
     userId,
     agentTemplate: parentAgentTemplate,
     localAgentTemplates,
-    agentState,
+    agentState: parentAgentState,
     system,
   } = validateSpawnState(state, 'spawn_agent_inline')
 
@@ -76,9 +76,10 @@ export const handleSpawnAgentInline = ((params: {
     // Create child agent state that shares message history with parent
     const childAgentState: AgentState = createAgentState(
       agentType,
-      agentState,
+      agentTemplate,
+      parentAgentState,
       getLatestState().messages,
-      agentState.agentContext,
+      parentAgentState.agentContext,
     )
 
     logAgentSpawn(
@@ -97,7 +98,7 @@ export const handleSpawnAgentInline = ((params: {
       prompt: prompt || '',
       params: agentParams,
       agentTemplate,
-      parentAgentState: agentState,
+      parentAgentState,
       agentState: childAgentState,
       fingerprintId,
       fileContext,
@@ -120,8 +121,8 @@ export const handleSpawnAgentInline = ((params: {
     state.messages = finalMessages
 
     // Update parent agent state to reflect shared message history
-    if (agentState && result.agentState) {
-      agentState.messageHistory = finalMessages
+    if (parentAgentState && result.agentState) {
+      parentAgentState.messageHistory = finalMessages
     }
 
     return undefined

backend/src/tools/handlers/tool/spawn-agent-utils.ts

@@ -15,6 +15,7 @@ import type {
 } from '@codebuff/common/types/session-state'
 import type { ProjectFileContext } from '@codebuff/common/util/file'
 import type { WebSocket } from 'ws'
+import { expireMessages } from '../../../util/messages'
 export interface SpawnAgentParams {
   agent_type: string
   prompt?: string
@@ -234,12 +235,17 @@ export function validateAgentInput(
  */
 export function createAgentState(
   agentType: string,
+  agentTemplate: AgentTemplate,
   parentAgentState: AgentState,
-  messageHistory: Message[],
+  parentMessageHistory: Message[],
   agentContext: Record<string, Subgoal>,
 ): AgentState {
   const agentId = generateCompactId()
 
+  const messageHistory = agentTemplate.includeMessageHistory
+    ? expireMessages(parentMessageHistory, 'userPrompt')
+    : []
+
   return {
     agentId,
     agentType,

backend/src/tools/handlers/tool/spawn-agents.ts

@@ -78,8 +78,7 @@ export const handleSpawnAgents = ((params: {
     userId,
     agentTemplate: parentAgentTemplate,
     localAgentTemplates,
-    messages,
-    agentState,
+    agentState: parentAgentState,
   } = validatedState
 
   const triggerSpawnAgents = async () => {
@@ -93,15 +92,11 @@ export const handleSpawnAgents = ((params: {
 
         validateAgentInput(agentTemplate, agentType, prompt, params)
 
-        const subAgentMessages: Message[] = []
-        if (agentTemplate.includeMessageHistory) {
-          subAgentMessages.push(...getLatestState().messages)
-        }
-
         const subAgentState = createAgentState(
           agentType,
-          agentState,
-          subAgentMessages,
+          agentTemplate,
+          parentAgentState,
+          getLatestState().messages,
           {},
         )
 
@@ -120,7 +115,7 @@ export const handleSpawnAgents = ((params: {
           prompt: prompt || '',
           params,
           agentTemplate,
-          parentAgentState: agentState,
+          parentAgentState,
           agentState: subAgentState,
           fingerprintId,
           fileContext,