From 5855134236067b9488e1e2c8a7893a304d6163fa Mon Sep 17 00:00:00 2001 From: yiling Date: Tue, 21 Jul 2026 15:04:38 +0800 Subject: [PATCH] fix(agent): pass latest version asset from version stack to prompt builder --- packages/agent/src/activities/agent.test.ts | 39 ++++++ packages/agent/src/activities/agent.ts | 26 +++- .../agent/src/workflows/agent-chat.test.ts | 51 +++++++ packages/e2e/workflow/agent-chat.test.ts | 129 ++++++++++++++++++ packages/workflow-core/src/activities/task.ts | 28 +++- 5 files changed, 270 insertions(+), 3 deletions(-) diff --git a/packages/agent/src/activities/agent.test.ts b/packages/agent/src/activities/agent.test.ts index 46d34bff..9e85ed08 100644 --- a/packages/agent/src/activities/agent.test.ts +++ b/packages/agent/src/activities/agent.test.ts @@ -596,6 +596,45 @@ describe('Agent Database Activities Integration', () => { const fetchedComment = await getCommentActivity(comment.id) expect(fetchedComment?.id).toBe(comment.id) }) + + it('should resolve version stack asset to its latest version file', async () => { + const stack = await prisma.asset.create({ + data: { + name: 'Stack', + type: AssetType.version_stack, + status: AssetStatus.uploaded, + projectId: project.id, + }, + }) + + await prisma.asset.create({ + data: { + name: 'v1.png', + type: AssetType.file, + mediaType: 'image/png', + status: AssetStatus.uploaded, + projectId: project.id, + parentId: stack.id, + sortIndex: 'a1', + }, + }) + + const v2 = await prisma.asset.create({ + data: { + name: 'v2.png', + type: AssetType.file, + mediaType: 'image/png', + status: AssetStatus.uploaded, + projectId: project.id, + parentId: stack.id, + sortIndex: 'a0', + }, + }) + + const fetchedAsset = await getAssetActivity(stack.id) + expect(fetchedAsset?.id).toBe(v2.id) + expect(fetchedAsset?.name).toBe('v2.png') + }) }) describe('getAssetPathContextActivity', () => { diff --git a/packages/agent/src/activities/agent.ts b/packages/agent/src/activities/agent.ts index d952b597..95bf284f 100644 --- a/packages/agent/src/activities/agent.ts +++ b/packages/agent/src/activities/agent.ts @@ -763,7 +763,7 @@ export async function getAgentAutofillContextActivity(params: { } export async function getAssetActivity(assetId: string) { - return prisma.asset.findUnique({ + const asset = await prisma.asset.findUnique({ where: { id: assetId }, include: { storageKey: true, @@ -774,6 +774,30 @@ export async function getAssetActivity(assetId: string) { }, }, }) + + if (asset && asset.type === AssetType.version_stack) { + const latestVersion = await prisma.asset.findFirst({ + where: { parentId: asset.id, isDeleted: false }, + orderBy: { sortIndex: 'asc' }, + include: { + storageKey: true, + project: { + include: { + team: true, + }, + }, + }, + }) + + if (latestVersion) { + return { + ...latestVersion, + project: latestVersion.project ?? asset.project, + } + } + } + + return asset } export async function getCommentActivity(commentId: string) { diff --git a/packages/agent/src/workflows/agent-chat.test.ts b/packages/agent/src/workflows/agent-chat.test.ts index 92726a65..180a29b2 100644 --- a/packages/agent/src/workflows/agent-chat.test.ts +++ b/packages/agent/src/workflows/agent-chat.test.ts @@ -516,4 +516,55 @@ describe('Agent Chat Workflow', () => { }), ) }) + + it('should handle version stack asset by building instructions with resolved latest version asset details', async () => { + mockActivities.getAssetActivity.mockImplementation(async (id: string) => { + if (id === 'vs-1') { + return { + id: 'v2-latest', + project: { teamId: 't1' }, + type: 'file', + name: 'latest-video.mp4', + mediaType: 'video/mp4', + media: { proxyType: 'video', duration: 42 }, + parentId: 'vs-1', + } + } + return null + }) + + const task = await prisma.workflowTask.create({ + data: { + type: 'chat', + status: 'pending', + assetId: 'vs-1', + payload: { + projectId: 'p1', + agent: { + prompt: 'Explain this version stack video', + sessionId: 'session-vs-123', + agentId: 'b1', + }, + }, + }, + }) + + await agentChat(task) + + const expectedInstruction = new AgentChatPromptBuilder('v2-latest') + .withContinuation(true) + .withPathContext('Path: folder/subfolder/file.png') + .withAssetDetails('latest-video.mp4', 'video/mp4', 42, undefined, 'video') + .build() + + expect(mockActivities.agentChatActivity).toHaveBeenCalledWith( + expect.objectContaining({ + teamId: 't1', + agentId: 'b1', + message: 'Explain this version stack video', + agentsInstruction: expectedInstruction, + sessionId: 'session-vs-123', + }), + ) + }) }) diff --git a/packages/e2e/workflow/agent-chat.test.ts b/packages/e2e/workflow/agent-chat.test.ts index 10669c2c..11a430c1 100644 --- a/packages/e2e/workflow/agent-chat.test.ts +++ b/packages/e2e/workflow/agent-chat.test.ts @@ -325,4 +325,133 @@ describe.each(['local', 'temporal'] as const)('Workflow E2E - agentChat (executo 'direct-session-456', ) }, 50000) + + it('should run agentChat workflow with version stack asset successfully', async () => { + const team = await prisma.team.create({ + data: { name: 'E2E Version Stack Team' }, + }) + + const project = await prisma.project.create({ + data: { name: 'E2E Version Stack Project', teamId: team.id }, + }) + + const agentUser = await prisma.user.create({ + data: { + name: 'E2E VS Agent User', + email: 'e2e-vs-agent@shumai.ai', + type: 'agent', + }, + }) + + await prisma.teamMember.create({ + data: { + teamId: team.id, + userId: agentUser.id, + role: 'editor', + }, + }) + + const provider = await prisma.provider.create({ + data: { + name: 'google', + teamId: team.id, + config: { api: 'google-generative-ai', apiKey: 'dummy-google-api-key' }, + }, + }) + + const model = await prisma.model.create({ + data: { + modelId: 'gemini', + name: 'Gemini', + providerId: provider.id, + config: { + input: ['text', 'image'], + cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, + contextWindow: 8192, + maxTokens: 2048, + reasoning: false, + }, + }, + }) + + await prisma.agent.create({ + data: { + id: agentUser.id, + teamId: team.id, + type: 'chat', + enabled: true, + providerId: provider.id, + modelId: model.id, + config: { + provider: 'google', + model: 'gemini', + }, + }, + }) + + const versionStack = await prisma.asset.create({ + data: { + name: 'VersionStack Container', + type: 'version_stack', + status: 'uploaded', + projectId: project.id, + }, + }) + + await prisma.asset.create({ + data: { + name: 'version-1.png', + type: 'file', + status: 'uploaded', + mediaType: 'image/png', + projectId: project.id, + parentId: versionStack.id, + sortIndex: 'a0', + }, + }) + + const regularUser = await prisma.user.create({ + data: { + name: 'Regular User 3', + email: 'user3@example.com', + type: 'human', + }, + }) + + await prisma.agentSession.create({ + data: { + id: 'vs-session-789', + agentId: agentUser.id, + userId: regularUser.id, + cwd: process.cwd(), + assetId: versionStack.id, + }, + }) + + const task = await prisma.workflowTask.create({ + data: { + type: 'chat', + status: 'pending', + assetId: versionStack.id, + projectId: project.id, + teamId: team.id, + payload: { + projectId: project.id, + agent: { + agentId: agentUser.id, + sessionId: 'vs-session-789', + prompt: 'Explain this version stack file', + userId: regularUser.id, + }, + }, + }, + }) + + const completedTask = await workflowService.executeWait(task, 45000) + + expect(completedTask.status).toBe('completed') + expect((completedTask.output as unknown as { sessionId: string })?.sessionId).toBe( + 'vs-session-789', + ) + }, 50000) }) diff --git a/packages/workflow-core/src/activities/task.ts b/packages/workflow-core/src/activities/task.ts index fe3347f6..d45c6a48 100644 --- a/packages/workflow-core/src/activities/task.ts +++ b/packages/workflow-core/src/activities/task.ts @@ -1,5 +1,5 @@ import { prisma } from '@shumai/db' -import { WorkflowTaskStatus, AssetStatus, Prisma } from '@shumai/db' +import { WorkflowTaskStatus, AssetStatus, AssetType, Prisma } from '@shumai/db' export async function getTranscodeWorkerQueueActivity(): Promise { return 'transcode_queue' @@ -20,7 +20,7 @@ export async function getAssetStatusActivity(params: { } export async function getAssetActivity(assetId: string) { - return prisma.asset.findUnique({ + const asset = await prisma.asset.findUnique({ where: { id: assetId }, include: { storageKey: true, @@ -31,6 +31,30 @@ export async function getAssetActivity(assetId: string) { }, }, }) + + if (asset && asset.type === AssetType.version_stack) { + const latestVersion = await prisma.asset.findFirst({ + where: { parentId: asset.id, isDeleted: false }, + orderBy: { sortIndex: 'asc' }, + include: { + storageKey: true, + project: { + include: { + team: true, + }, + }, + }, + }) + + if (latestVersion) { + return { + ...latestVersion, + project: latestVersion.project ?? asset.project, + } + } + } + + return asset } export interface UpdateTaskStatusParams {