move util/messages to agent-runtime

Author: charleslien

backend/src/__tests__/run-agent-step-tools.test.ts

@@ -1,3 +1,4 @@
+import { asUserMessage } from '@codebuff/agent-runtime/util/messages'
 import * as bigquery from '@codebuff/bigquery'
 import * as analytics from '@codebuff/common/analytics'
 import db from '@codebuff/common/db'
@@ -19,11 +20,9 @@ import {
   spyOn,
 } from 'bun:test'
 
-// Mock imports
 import * as liveUserInputs from '../live-user-inputs'
 import { runAgentStep } from '../run-agent-step'
 import { clearAgentGeneratorCache } from '../run-programmatic-step'
-import { asUserMessage } from '../util/messages'
 
 import type { AgentTemplate } from '@codebuff/agent-runtime/templates/types'
 import type {

backend/src/admin/relabelRuns.ts

@@ -1,3 +1,4 @@
+import { messagesWithSystem } from '@codebuff/agent-runtime/util/messages'
 import {
   getTracesAndAllDataForUser,
   getTracesWithoutRelabels,
@@ -14,9 +15,8 @@ import { closeXml } from '@codebuff/common/util/xml'
 
 import { rerank } from '../llm-apis/relace-api'
 import { promptAiSdk } from '../llm-apis/vercel-ai-sdk/ai-sdk'
-import { messagesWithSystem } from '../util/messages'
 
-import type { System } from '../llm-apis/claude'
+import type { System } from '@codebuff/agent-runtime/llm-api/claude'
 import type {
   GetExpandedFileContextForTrainingBlobTrace,
   GetExpandedFileContextForTrainingTrace,

backend/src/find-files/request-files-prompt.ts

@@ -1,5 +1,10 @@
 import { dirname, isAbsolute, normalize } from 'path'
 
+import {
+  castAssistantMessage,
+  messagesWithSystem,
+  getMessagesSubset,
+} from '@codebuff/agent-runtime/util/messages'
 import { insertTrace } from '@codebuff/bigquery'
 import db from '@codebuff/common/db'
 import * as schema from '@codebuff/common/db/schema'
@@ -14,15 +19,10 @@ import { range, shuffle, uniq } from 'lodash'
 
 import { CustomFilePickerConfigSchema } from './custom-file-picker-config'
 import { promptFlashWithFallbacks } from '../llm-apis/gemini-with-fallbacks'
-import {
-  castAssistantMessage,
-  messagesWithSystem,
-  getMessagesSubset,
-} from '../util/messages'
 import { getRequestContext } from '../websockets/request-context'
 
 import type { CustomFilePickerConfig } from './custom-file-picker-config'
-import type { TextBlock } from '../llm-apis/claude'
+import type { TextBlock } from '@codebuff/agent-runtime/llm-api/claude'
 import type {
   GetExpandedFileContextForTrainingTrace,
   GetRelevantFilesTrace,

backend/src/main-prompt.ts

@@ -1,11 +1,11 @@
+import { expireMessages } from '@codebuff/agent-runtime/util/messages'
 import { AgentTemplateTypes } from '@codebuff/common/types/session-state'
 import { generateCompactId } from '@codebuff/common/util/string'
 import { uniq } from 'lodash'
 
 import { checkTerminalCommand } from './check-terminal-command'
 import { loopAgentSteps } from './run-agent-step'
 import { getAgentTemplate } from './templates/agent-registry'
-import { expireMessages } from './util/messages'
 
 import type { AgentTemplate } from '@codebuff/agent-runtime/templates/types'
 import type { ClientAction } from '@codebuff/common/actions'

backend/src/run-agent-step.ts

@@ -1,3 +1,10 @@
+import {
+  asSystemInstruction,
+  asSystemMessage,
+  buildUserMessageContent,
+  messagesWithSystem,
+  expireMessages,
+} from '@codebuff/agent-runtime/util/messages'
 import { countTokensJson } from '@codebuff/agent-runtime/util/token-counter'
 import { insertTrace } from '@codebuff/bigquery'
 import { trackEvent } from '@codebuff/common/analytics'
@@ -17,13 +24,6 @@ import { getAgentTemplate } from './templates/agent-registry'
 import { getAgentPrompt } from './templates/strings'
 import { processStreamWithTools } from './tools/stream-parser'
 import { getAgentOutput } from './util/agent-output'
-import {
-  asSystemInstruction,
-  asSystemMessage,
-  buildUserMessageContent,
-  messagesWithSystem,
-  expireMessages,
-} from './util/messages'
 import { getRequestContext } from './websockets/request-context'
 
 import type { AgentResponseTrace } from '@codebuff/bigquery'

backend/src/templates/strings.ts

@@ -2,6 +2,7 @@ import {
   PLACEHOLDER,
   placeholderValues,
 } from '@codebuff/agent-runtime/templates/types'
+import { parseUserMessage } from '@codebuff/agent-runtime/util/messages'
 import { CodebuffConfigSchema } from '@codebuff/common/json-config/constants'
 import { escapeString } from '@codebuff/common/util/string'
 import { schemaToJsonStr } from '@codebuff/common/util/zod-schema'
@@ -19,7 +20,6 @@ import {
   getShortToolInstructions,
   getToolsInstructions,
 } from '../tools/prompts'
-import { parseUserMessage } from '../util/messages'
 
 import type {
   AgentTemplate,

backend/src/tools/stream-parser.ts

@@ -1,3 +1,4 @@
+import { expireMessages } from '@codebuff/agent-runtime/util/messages'
 import {
   endToolTag,
   startToolTag,
@@ -9,7 +10,6 @@ import { generateCompactId } from '@codebuff/common/util/string'
 import { cloneDeep } from 'lodash'
 
 import { executeBatchStrReplaces } from './batch-str-replace'
-import { expireMessages } from '../util/messages'
 import { processStreamWithTags } from '../xml-stream-parser'
 import { executeCustomToolCall, executeToolCall } from './tool-executor'
 

backend/src/llm-apis/claude.ts renamed to packages/agent-runtime/src/llm-api/claude.ts

@@ -1,7 +1,7 @@
 // Simple text block type that doesn't depend on Anthropic SDK
 export type TextBlock = {
   text: string
-  type?: 'text'
+  type: 'text'
 }
 
 export type System = string | Array<TextBlock>

backend/src/util/__tests__/messages.test.ts renamed to packages/agent-runtime/src/util/__tests__/messages.test.ts

@@ -1,4 +1,3 @@
-import * as tokenCounter from '@codebuff/agent-runtime/util/token-counter'
 import {
   afterEach,
   beforeEach,
@@ -13,7 +12,9 @@ import {
   trimMessagesToFitTokenLimit,
   messagesWithSystem,
   getPreviouslyReadFiles,
-} from '../messages'
+} from '@codebuff/agent-runtime/util/messages'
+
+import * as tokenCounter from '../token-counter'
 
 import type { CodebuffToolMessage } from '@codebuff/common/tools/list'
 import type {