refactor(activities): always format comments as user role messages in aiChatActivity

This commit is contained in:
yiling
2026-05-22 09:25:27 +08:00
parent e50b895ed5
commit 107f2e8a7a
2 changed files with 42 additions and 42 deletions
+34 -8
View File
@@ -51,6 +51,9 @@ describe('Agent Activities', () => {
const user1 = await prisma.user.create({
data: { name: 'User One', email: 'user1@example.com' },
})
const agentUser = await prisma.user.create({
data: { id: 'agent-user-id', name: 'Smart Agent', email: 'agent@example.com', type: 'agent' },
})
const project = await prisma.project.create({
data: { name: 'p1', teamId: team.id },
})
@@ -64,7 +67,7 @@ describe('Agent Activities', () => {
},
})
// Create existing comment 1
// Create existing comment 1 (User)
const comment1 = await prisma.assetComment.create({
data: {
assetId: file.id,
@@ -73,6 +76,15 @@ describe('Agent Activities', () => {
},
})
// Create existing comment 1.5 (Agent)
const commentAgent = await prisma.assetComment.create({
data: {
assetId: file.id,
creatorId: agentUser.id,
message: 'I am helping',
},
})
// Create triggering comment 2 (Rule 1: no reply, mentions agent)
const comment2 = await prisma.assetComment.create({
data: {
@@ -105,23 +117,37 @@ describe('Agent Activities', () => {
expect(createdSessionId).toBeDefined()
expect(createdSessionId).not.toBe('generated-session-id')
// Verify session entries were populated with comment1 as context
// Verify session entries were populated with comment1 and commentAgent as context
const entries = await prisma.agentSessionEntry.findMany({
where: { sessionId: createdSessionId },
orderBy: { id: 'asc' },
})
expect(entries.length).toBe(1)
const entryData = entries[0].entry as unknown as SessionTreeEntry
expect(entryData.id).toBeDefined()
expect(entryData.id).not.toBe(comment1.id)
if (entryData.type === 'message') {
const msg = entryData.message as { role: 'user'; content: { type: 'text'; text: string }[] }
expect(entries.length).toBe(2)
// Verify User Comment Entry
const entryData1 = entries[0].entry as unknown as SessionTreeEntry
expect(entryData1.id).toBeDefined()
expect(entryData1.id).not.toBe(comment1.id)
if (entryData1.type === 'message') {
const msg = entryData1.message as { role: 'user'; content: { type: 'text'; text: string }[] }
expect(msg.content[0].text).toBe('[User One]: First comment message')
expect(msg.role).toBe('user')
} else {
throw new Error('Expected entry to be a message')
}
// Verify Agent Comment Entry
const entryData2 = entries[1].entry as unknown as SessionTreeEntry
expect(entryData2.id).toBeDefined()
expect(entryData2.id).not.toBe(commentAgent.id)
if (entryData2.type === 'message') {
const msg = entryData2.message as { role: 'user'; content: { type: 'text'; text: string }[] }
expect(msg.content[0].text).toBe('[Agent Message][Smart Agent]: I am helping')
expect(msg.role).toBe('user')
} else {
throw new Error('Expected entry to be a message')
}
})
it('should support deleteCommentActivity', async () => {
+8 -34
View File
@@ -127,46 +127,20 @@ export async function aiChatActivity(params: AiChatParams) {
let prevId: string | null = null
for (const c of existingComments) {
const isAgent = c.creator?.type === 'agent' || c.sessionId !== null
const role = isAgent ? ('assistant' as const) : ('user' as const)
let messageContent = c.message || ''
// Prepend user name to user messages to ensure agent knows who sent what
if (!isAgent && c.creator?.name) {
if (isAgent) {
const agentName = c.creator?.name || 'Ai Agent'
messageContent = `[Agent Message][${agentName}]: ${messageContent}`
} else if (c.creator?.name) {
messageContent = `[${c.creator.name}]: ${messageContent}`
}
const entryId = ulid()
let message: AgentMessage
if (role === 'user') {
message = {
role: 'user',
content: [{ type: 'text', text: messageContent }],
timestamp: c.createdAt.getTime(),
}
} else {
message = {
role: 'assistant',
content: [{ type: 'text', text: messageContent }],
api: 'openai-completions',
provider: 'openai',
model: 'gpt-4',
usage: {
input: 0,
output: 0,
cacheRead: 0,
cacheWrite: 0,
totalTokens: 0,
cost: {
input: 0,
output: 0,
cacheRead: 0,
cacheWrite: 0,
total: 0,
},
},
stopReason: 'stop',
timestamp: c.createdAt.getTime(),
}
const message: AgentMessage = {
role: 'user',
content: [{ type: 'text', text: messageContent }],
timestamp: c.createdAt.getTime(),
}
const entryJson: SessionTreeEntry = {