add keepLastTags

Author: charleslien

.agents/types/agent-definition.ts

@@ -92,13 +92,6 @@ export interface AgentDefinition {
     params?: JsonObjectSchema
   }
 
-  /** Whether to include conversation history from the parent agent in context.
-   *
-   * Defaults to false.
-   * Use this when the agent needs to know all the previous messages in the conversation.
-   */
-  includeMessageHistory?: boolean
-
   /** How the agent should output a response to its parent (defaults to 'last_message')
    *
    * last_message: The last message from the agent, typically after using tools.
@@ -121,6 +114,13 @@ export interface AgentDefinition {
    * This field is key if the agent is intended to be spawned by other agents. */
   spawnerPrompt?: string
 
+  /** Whether to include conversation history from the parent agent in context.
+   *
+   * Defaults to false.
+   * Use this when the agent needs to know all the previous messages in the conversation.
+   */
+  includeMessageHistory?: boolean
+
   /** Whether to inherit the parent agent's system prompt instead of using this agent's own systemPrompt.
    *
    * Defaults to false.

.agents/types/util-types.ts

@@ -142,6 +142,7 @@ const auxiliaryDataSchema = z.object({
     .union([z.literal('agentStep'), z.literal('userPrompt')])
     .optional(),
   keepDuringTruncation: z.boolean().optional(),
+  keepLastTags: z.string().array().optional(),
 })
 
 export const systemMessageSchema = z
@@ -184,22 +185,12 @@ export const toolMessageSchema = z
   .and(auxiliaryDataSchema)
 export type ToolMessage = z.infer<typeof toolMessageSchema>
 
-export const messageSchema = z
-  .union([
-    systemMessageSchema,
-    userMessageSchema,
-    assistantMessageSchema,
-    toolMessageSchema,
-  ])
-  .and(
-    z.object({
-      providerOptions: providerMetadataSchema.optional(),
-      timeToLive: z
-        .union([z.literal('agentStep'), z.literal('userPrompt')])
-        .optional(),
-      keepDuringTruncation: z.boolean().optional(),
-    }),
-  )
+export const messageSchema = z.union([
+  systemMessageSchema,
+  userMessageSchema,
+  assistantMessageSchema,
+  toolMessageSchema,
+])
 export type Message = z.infer<typeof messageSchema>
 
 // ===== MCP Server Types =====
@@ -227,7 +218,6 @@ export const mcpConfigSchema = z.union([
 ])
 export type MCPConfig = z.input<typeof mcpConfigSchema>
 
-
 // ============================================================================
 // Logger Interface
 // ============================================================================

backend/src/llm-apis/vercel-ai-sdk/ai-sdk.ts

@@ -1,4 +1,3 @@
-import { google } from '@ai-sdk/google'
 import { openai } from '@ai-sdk/openai'
 import {
   finetunedVertexModels,
@@ -97,6 +96,10 @@ export const promptAiSdkStream = async function* (
 
   let aiSDKModel = modelToAiSDKModel(options.model)
 
+  console.log('\n\n\n\n\n\n\n\n\nasdf')
+  console.dir({ messages: convertCbToModelMessages(options) }, { depth: null })
+  console.log('qwer')
+
   const response = streamText({
     ...options,
     model: aiSDKModel,

backend/src/main-prompt.ts

@@ -203,7 +203,6 @@ export const mainPrompt = async (
     clientSessionId,
     onResponseChunk,
     localAgentTemplates,
-    clearUserPromptMessagesAfterResponse: false,
   })
 
   logger.debug({ agentState, output }, 'Main prompt finished')

backend/src/run-agent-step.ts

@@ -407,7 +407,7 @@ export const loopAgentSteps = async (
     userId,
     clientSessionId,
     onResponseChunk,
-    clearUserPromptMessagesAfterResponse = false,
+    clearUserPromptMessagesAfterResponse = true,
     parentSystemPrompt,
   }: {
     userInputId: string
@@ -528,8 +528,7 @@ export const loopAgentSteps = async (
     instructionsPrompt && {
       role: 'user' as const,
       content: instructionsPrompt,
-      timeToLive: 'userPrompt' as const,
-      keepDuringTruncation: true,
+      keepLastTags: ['INSTRUCTIONS_PROMPT'],
     },
   )
 

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

@@ -306,7 +306,7 @@ export async function executeSubagent({
   clientSessionId,
   onResponseChunk,
   isOnlyChild = false,
-  clearUserPromptMessagesAfterResponse = false,
+  clearUserPromptMessagesAfterResponse = true,
   parentSystemPrompt,
 }: {
   ws: WebSocket

common/src/templates/initial-agents-dir/types/util-types.ts

@@ -142,6 +142,7 @@ const auxiliaryDataSchema = z.object({
     .union([z.literal('agentStep'), z.literal('userPrompt')])
     .optional(),
   keepDuringTruncation: z.boolean().optional(),
+  keepLastTags: z.string().array().optional(),
 })
 
 export const systemMessageSchema = z
@@ -184,22 +185,12 @@ export const toolMessageSchema = z
   .and(auxiliaryDataSchema)
 export type ToolMessage = z.infer<typeof toolMessageSchema>
 
-export const messageSchema = z
-  .union([
-    systemMessageSchema,
-    userMessageSchema,
-    assistantMessageSchema,
-    toolMessageSchema,
-  ])
-  .and(
-    z.object({
-      providerOptions: providerMetadataSchema.optional(),
-      timeToLive: z
-        .union([z.literal('agentStep'), z.literal('userPrompt')])
-        .optional(),
-      keepDuringTruncation: z.boolean().optional(),
-    }),
-  )
+export const messageSchema = z.union([
+  systemMessageSchema,
+  userMessageSchema,
+  assistantMessageSchema,
+  toolMessageSchema,
+])
 export type Message = z.infer<typeof messageSchema>
 
 // ===== MCP Server Types =====
@@ -227,7 +218,6 @@ export const mcpConfigSchema = z.union([
 ])
 export type MCPConfig = z.input<typeof mcpConfigSchema>
 
-
 // ============================================================================
 // Logger Interface
 // ============================================================================

common/src/types/messages/codebuff-message.ts

@@ -16,6 +16,7 @@ const auxiliaryDataSchema = z.object({
     .union([z.literal('agentStep'), z.literal('userPrompt')])
     .optional(),
   keepDuringTruncation: z.boolean().optional(),
+  keepLastTags: z.string().array().optional(),
 })
 
 export const systemMessageSchema = z
@@ -68,20 +69,10 @@ export const toolMessageSchema = z
   .and(auxiliaryDataSchema)
 export type ToolMessage = z.infer<typeof toolMessageSchema>
 
-export const messageSchema = z
-  .union([
-    systemMessageSchema,
-    userMessageSchema,
-    assistantMessageSchema,
-    toolMessageSchema,
-  ])
-  .and(
-    z.object({
-      providerOptions: providerMetadataSchema.optional(),
-      timeToLive: z
-        .union([z.literal('agentStep'), z.literal('userPrompt')])
-        .optional(),
-      keepDuringTruncation: z.boolean().optional(),
-    }),
-  )
+export const messageSchema = z.union([
+  systemMessageSchema,
+  userMessageSchema,
+  assistantMessageSchema,
+  toolMessageSchema,
+])
 export type Message = z.infer<typeof messageSchema>

common/src/util/messages.ts

@@ -211,7 +211,6 @@ export function convertCbToModelMessages({
 
     const lastMessage = aggregated[aggregated.length - 1]
     if (
-      lastMessage.keepDuringTruncation !== message.keepDuringTruncation ||
       lastMessage.timeToLive !== message.timeToLive ||
       !isEqual(lastMessage.providerOptions, message.providerOptions)
     ) {