add getUserMessage and getSystemMessage functions

Author: charleslien

cli/src/commands/init.ts

@@ -7,6 +7,7 @@ import {
 } from '@codebuff/common/json-config/constants'
 
 import { getProjectRoot } from '../project-files'
+import { getSystemMessage } from '../utils/message-history'
 
 import type { PostUserMessageFn } from '../types/contracts/send-message'
 
@@ -19,13 +20,7 @@ export function handleInitializationFlowLocally(): {
   if (existsSync(configPath)) {
     const postUserMessage: PostUserMessageFn = (prev) => [
       ...prev,
-
-      {
-        id: `sys-${Date.now()}`,
-        variant: 'ai' as const,
-        content: `📋 ${codebuffConfigFile} already exists.`,
-        timestamp: new Date().toISOString(),
-      },
+      getSystemMessage(`📋 ${codebuffConfigFile} already exists.`),
     ]
     return {
       postUserMessage,
@@ -37,12 +32,7 @@ export function handleInitializationFlowLocally(): {
 
   const postUserMessage: PostUserMessageFn = (prev) => [
     ...prev,
-    {
-      id: `sys-${Date.now()}`,
-      variant: 'ai' as const,
-      content: `✅ Created \`${codebuffConfigFile}\``,
-      timestamp: new Date().toISOString(),
-    },
+    getSystemMessage(`✅ Created \`${codebuffConfigFile}\``),
   ]
   return { postUserMessage }
 }

cli/src/commands/router.ts

@@ -2,6 +2,7 @@ import { runTerminalCommand } from '@codebuff/sdk'
 
 import { handleInitializationFlowLocally } from './init'
 import { handleUsageCommand } from './usage'
+import { getSystemMessage, getUserMessage } from '../utils/message-history'
 
 import type { MultilineInputHandle } from '../components/multiline-input'
 import type { InputValue } from '../state/chat-store'
@@ -82,19 +83,8 @@ export async function routeUserPrompt(params: {
 
     setMessages((prev) => [
       ...prev,
-      {
-        id: `user-${Date.now()}`,
-        variant: 'user',
-        content: trimmed,
-        timestamp: new Date().toISOString(),
-      },
-      {
-        id: `sys-${Date.now()}`,
-        variant: 'ai',
-        content: '',
-        blocks: [resultBlock],
-        timestamp: new Date().toISOString(),
-      },
+      getUserMessage(trimmed),
+      getSystemMessage([resultBlock]),
     ])
 
     runTerminalCommand({
@@ -134,13 +124,12 @@ export async function routeUserPrompt(params: {
   const normalized = trimmed.startsWith('/') ? trimmed.slice(1) : trimmed
   const cmd = normalized.split(/\s+/)[0].toLowerCase()
   if (cmd === 'login' || cmd === 'signin') {
-    const msg = {
-      id: `sys-${Date.now()}`,
-      variant: 'ai' as const,
-      content: "You're already in the app. Use /logout to switch accounts.",
-      timestamp: new Date().toISOString(),
-    }
-    setMessages((prev) => [...prev, msg])
+    setMessages((prev) => [
+      ...prev,
+      getSystemMessage(
+        "You're already in the app. Use /logout to switch accounts.",
+      ),
+    ])
     setInputValue({ text: '', cursorPosition: 0, lastEditDueToNav: false })
     return
   }
@@ -151,13 +140,7 @@ export async function routeUserPrompt(params: {
 
     logoutMutation.mutate(undefined, {
       onSettled: () => {
-        const msg = {
-          id: `sys-${Date.now()}`,
-          variant: 'ai' as const,
-          content: 'Logged out.',
-          timestamp: new Date().toISOString(),
-        }
-        setMessages((prev) => [...prev, msg])
+        setMessages((prev) => [...prev, getSystemMessage('Logged out.')])
         setInputValue({ text: '', cursorPosition: 0, lastEditDueToNav: false })
         setTimeout(() => {
           setUser(null)

cli/src/commands/usage.ts

@@ -3,6 +3,8 @@ import { BACKEND_URL } from '@codebuff/sdk'
 import { useChatStore } from '../state/chat-store'
 import { getAuthToken } from '../utils/auth'
 import { logger } from '../utils/logger'
+import { getSystemMessage } from '../utils/message-history'
+
 import type { PostUserMessageFn } from '../types/contracts/send-message'
 
 interface UsageResponse {
@@ -22,12 +24,7 @@ export async function handleUsageCommand(): Promise<{
   if (!authToken) {
     const postUserMessage: PostUserMessageFn = (prev) => [
       ...prev,
-      {
-        id: `sys-${Date.now()}`,
-        variant: 'ai' as const,
-        content: 'Please log in first to view your usage.',
-        timestamp: new Date().toISOString(),
-      },
+      getSystemMessage('Please log in first to view your usage.'),
     ]
     return { postUserMessage }
   }
@@ -53,12 +50,7 @@ export async function handleUsageCommand(): Promise<{
 
       const postUserMessage: PostUserMessageFn = (prev) => [
         ...prev,
-        {
-          id: `sys-${Date.now()}`,
-          variant: 'ai' as const,
-          content: `Failed to fetch usage data: ${errorText}`,
-          timestamp: new Date().toISOString(),
-        },
+        getSystemMessage(`Failed to fetch usage data: ${errorText}`),
       ]
       return { postUserMessage }
     }
@@ -96,12 +88,7 @@ export async function handleUsageCommand(): Promise<{
 
     const postUserMessage: PostUserMessageFn = (prev) => [
       ...prev,
-      {
-        id: `sys-${Date.now()}`,
-        variant: 'ai' as const,
-        content: usageMessage,
-        timestamp: new Date().toISOString(),
-      },
+      getSystemMessage(usageMessage),
     ]
     return { postUserMessage }
   } catch (error) {
@@ -115,12 +102,7 @@ export async function handleUsageCommand(): Promise<{
 
     const postUserMessage: PostUserMessageFn = (prev) => [
       ...prev,
-      {
-        id: `sys-${Date.now()}`,
-        variant: 'ai' as const,
-        content: 'Error checking usage. Please try again later.',
-        timestamp: new Date().toISOString(),
-      },
+      getSystemMessage('Error checking usage. Please try again later.'),
     ]
     return { postUserMessage }
   }

cli/src/hooks/use-send-message.ts

@@ -13,6 +13,7 @@ import { formatTimestamp } from '../utils/helpers'
 import { loadAgentDefinitions } from '../utils/load-agent-definitions'
 import { getLoadedAgentsData } from '../utils/local-agent-registry'
 import { logger } from '../utils/logger'
+import { getUserMessage } from '../utils/message-history'
 
 import type { ElapsedTimeTracker } from './use-elapsed-time'
 import type { StreamStatus } from './use-message-queue'
@@ -404,7 +405,6 @@ export const useSendMessage = ({
   const sendMessage = useCallback<SendMessageFn>(
     async (params: ParamsOf<SendMessageFn>) => {
       const { content, agentMode, postUserMessage } = params
-      const timestamp = formatTimestamp()
 
       if (agentMode !== 'PLAN') {
         setHasReceivedPlanResponse(false)
@@ -425,14 +425,6 @@ export const useSendMessage = ({
       const shouldInsertDivider =
         lastMessageMode === null || lastMessageMode !== agentMode
 
-      // Add user message to UI first
-      const userMessage: ChatMessage = {
-        id: `user-${Date.now()}`,
-        variant: 'user',
-        content,
-        timestamp,
-      }
-
       applyMessageUpdate((prev) => {
         let newMessages = [...prev]
 
@@ -453,7 +445,8 @@ export const useSendMessage = ({
           newMessages.push(dividerMessage)
         }
 
-        newMessages.push(userMessage)
+        // Add user message to UI first
+        newMessages.push(getUserMessage(content))
 
         if (postUserMessage) {
           newMessages = postUserMessage(newMessages)

cli/src/utils/message-history.ts

@@ -4,8 +4,44 @@ import path from 'path'
 import { getConfigDir } from './auth'
 import { logger } from './logger'
 
+import type { ChatMessage, ContentBlock } from '../types/chat'
+
 const MAX_HISTORY_SIZE = 1000
 
+export function getUserMessage(message: string | ContentBlock[]): ChatMessage {
+  return {
+    id: `user-${Date.now()}`,
+    variant: 'user',
+    ...(typeof message === 'string'
+      ? {
+          content: message,
+        }
+      : {
+          content: '',
+          blocks: message,
+        }),
+    timestamp: new Date().toISOString(),
+  }
+}
+
+export function getSystemMessage(
+  content: string | ContentBlock[],
+): ChatMessage {
+  return {
+    id: `sys-${Date.now()}`,
+    variant: 'ai' as const,
+    ...(typeof content === 'string'
+      ? {
+          content,
+        }
+      : {
+          content: '',
+          blocks: content,
+        }),
+    timestamp: new Date().toISOString(),
+  }
+}
+
 /**
  * Get the message history file path
  */

cli/src/utils/slash-commands.ts

@@ -1,3 +1,5 @@
+import { getSystemMessage } from './message-history'
+
 import type { User } from './auth'
 import type { AgentMode } from './constants'
 import type { MultilineInputHandle } from '../components/multiline-input'
@@ -60,13 +62,12 @@ export function handleSlashCommands(params: {
   const normalized = trimmed.startsWith('/') ? trimmed.slice(1) : trimmed
   const cmd = normalized.split(/\s+/)[0].toLowerCase()
   if (cmd === 'login' || cmd === 'signin') {
-    const msg = {
-      id: `sys-${Date.now()}`,
-      variant: 'ai' as const,
-      content: "You're already in the app. Use /logout to switch accounts.",
-      timestamp: new Date().toISOString(),
-    }
-    setMessages((prev) => [...prev, msg])
+    setMessages((prev) => [
+      ...prev,
+      getSystemMessage(
+        "You're already in the app. Use /logout to switch accounts.",
+      ),
+    ])
     setInputValue('')
     return
   }