agent-tower 0.5.3 → 0.5.4-beta.1

package/dist/services/__tests__/team-reconciler.service.test.js

@@ -327,6 +327,14 @@ describe('TeamReconcilerService', () => {
             workRequestId: request.id,
             memberId: members[0].id,
             workspaceId: workspace.id,
+            roomReplyReminderCount: 3,
+        });
+        await prisma.agentInvocation.update({
+            where: { id: invocation.id },
+            data: {
+                nextRoomReplyReminderAt: new Date(Date.UTC(2026, 0, 1, 0, 5, 0)),
+                firstNudgeAt: new Date(Date.UTC(2026, 0, 1, 0, 0, 0)),
+            },
         });
         expect(lockService.acquire(invocation.id, ['workspace:task:write'])).toBe(true);
         await prisma.roomMessage.create({
@@ -346,7 +354,12 @@ describe('TeamReconcilerService', () => {
         await service.handleSessionExit(invocation.sessionId);
         await expect(prisma.agentInvocation.findUnique({ where: { id: invocation.id } })).resolves.toMatchObject({
             status: 'COMPLETED',
+            roomReplyReminderCount: 0,
             nextRoomReplyReminderAt: null,
+            firstNudgeAt: null,
+        });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'COMPLETED',
         });
         expect(scheduler.releaseInvocationLocks).toHaveBeenCalledWith(invocation.id);
         expect(lockService.listLocks()).toEqual([]);
@@ -369,6 +382,117 @@ describe('TeamReconcilerService', () => {
         expect(messenger.sendMessage).toHaveBeenCalledWith(invocation.sessionId, TEAM_ROOM_REPLY_REMINDER);
         expect(scheduler.releaseInvocationLocks).not.toHaveBeenCalled();
     });
+    it('ignores forged non-agent RoomMessages with senderInvocationId during reconcile', async () => {
+        const { workspace, teamRun, members } = await createFixture();
+        const request = await createWorkRequest({ teamRunId: teamRun.id, targetMemberId: members[0].id });
+        const invocation = await createRunningInvocation({
+            teamRunId: teamRun.id,
+            workRequestId: request.id,
+            memberId: members[0].id,
+            workspaceId: workspace.id,
+            status: 'WAITING_ROOM_REPLY',
+            roomReplyReminderCount: 1,
+        });
+        await prisma.agentInvocation.update({
+            where: { id: invocation.id },
+            data: { nextRoomReplyReminderAt: new Date(Date.UTC(2026, 0, 1, 0, 1, 0)) },
+        });
+        await prisma.roomMessage.createMany({
+            data: [
+                {
+                    teamRunId: teamRun.id,
+                    senderType: 'user',
+                    senderId: null,
+                    senderInvocationId: invocation.id,
+                    kind: 'chat',
+                    content: 'Host note should not count as result',
+                    mentions: '[]',
+                    workRequestIds: '[]',
+                    artifactRefs: '[]',
+                    attachmentIds: '[]',
+                },
+                {
+                    teamRunId: teamRun.id,
+                    senderType: 'system',
+                    senderId: null,
+                    senderInvocationId: invocation.id,
+                    kind: 'system',
+                    content: 'System note should not count as result',
+                    mentions: '[]',
+                    workRequestIds: '[]',
+                    artifactRefs: '[]',
+                    attachmentIds: '[]',
+                },
+            ],
+        });
+        await service.reconcileInvocation(invocation.id);
+        await expect(prisma.agentInvocation.findUnique({ where: { id: invocation.id } })).resolves.toMatchObject({
+            status: 'WAITING_ROOM_REPLY',
+            roomReplyReminderCount: 1,
+        });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'STARTED',
+        });
+        expect(scheduler.releaseInvocationLocks).not.toHaveBeenCalled();
+        expect(scheduler.startNextSessions).not.toHaveBeenCalled();
+    });
+    it('ignores private agent RoomMessages with senderInvocationId during reconcile', async () => {
+        const { workspace, teamRun, members } = await createFixture({ memberCount: 2 });
+        const request = await createWorkRequest({ teamRunId: teamRun.id, targetMemberId: members[0].id });
+        const invocation = await createRunningInvocation({
+            teamRunId: teamRun.id,
+            workRequestId: request.id,
+            memberId: members[0].id,
+            workspaceId: workspace.id,
+            status: 'WAITING_ROOM_REPLY',
+            roomReplyReminderCount: 1,
+        });
+        await prisma.agentInvocation.update({
+            where: { id: invocation.id },
+            data: { nextRoomReplyReminderAt: new Date(Date.UTC(2026, 0, 1, 0, 1, 0)) },
+        });
+        const privateMessage = await prisma.roomMessage.create({
+            data: {
+                teamRunId: teamRun.id,
+                senderType: 'agent',
+                senderId: members[0].id,
+                senderInvocationId: invocation.id,
+                kind: 'work_request',
+                visibility: 'PRIVATE',
+                content: 'Private handoff should not count as a public result',
+                mentions: stringifyJson([]),
+                workRequestIds: stringifyJson([]),
+                artifactRefs: stringifyJson([]),
+                attachmentIds: stringifyJson([]),
+            },
+        });
+        await prisma.roomMessageParticipant.createMany({
+            data: [
+                {
+                    teamRunId: teamRun.id,
+                    roomMessageId: privateMessage.id,
+                    memberId: members[0].id,
+                    role: 'sender',
+                },
+                {
+                    teamRunId: teamRun.id,
+                    roomMessageId: privateMessage.id,
+                    memberId: members[1].id,
+                    role: 'recipient',
+                },
+            ],
+        });
+        await service.reconcileInvocation(invocation.id);
+        await expect(prisma.agentInvocation.findUnique({ where: { id: invocation.id } })).resolves.toMatchObject({
+            status: 'WAITING_ROOM_REPLY',
+            roomReplyReminderCount: 1,
+        });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'STARTED',
+        });
+        expect(scheduler.releaseInvocationLocks).not.toHaveBeenCalled();
+        expect(scheduler.startNextSessions).not.toHaveBeenCalled();
+    });
     it('does not send another reminder before the backoff time is due', async () => {
         const { workspace, teamRun, members } = await createFixture();
         const request = await createWorkRequest({ teamRunId: teamRun.id, targetMemberId: members[0].id });
@@ -421,11 +545,55 @@ describe('TeamReconcilerService', () => {
         await expect(service.reconcileDueRoomReplyReminders()).resolves.toBe(1);
         await expect(prisma.agentInvocation.findUnique({ where: { id: invocation.id } })).resolves.toMatchObject({
             status: 'FAILED',
+            roomReplyReminderCount: 0,
             nextRoomReplyReminderAt: null,
+            firstNudgeAt: null,
+        });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'FAILED',
         });
         expect(scheduler.releaseInvocationLocks).toHaveBeenCalledWith(invocation.id);
         expect(lockService.listLocks()).toEqual([]);
     });
+    it('does not complete due reminders from forged non-agent RoomMessages with senderInvocationId', async () => {
+        const { workspace, teamRun, members } = await createFixture();
+        const request = await createWorkRequest({ teamRunId: teamRun.id, targetMemberId: members[0].id });
+        const invocation = await createRunningInvocation({
+            teamRunId: teamRun.id,
+            workRequestId: request.id,
+            memberId: members[0].id,
+            workspaceId: workspace.id,
+            status: 'WAITING_ROOM_REPLY',
+            roomReplyReminderCount: 1,
+        });
+        await prisma.agentInvocation.update({
+            where: { id: invocation.id },
+            data: { nextRoomReplyReminderAt: new Date(Date.UTC(2025, 11, 31, 23, 59, 59)) },
+        });
+        await prisma.roomMessage.create({
+            data: {
+                teamRunId: teamRun.id,
+                senderType: 'user',
+                senderId: null,
+                senderInvocationId: invocation.id,
+                kind: 'chat',
+                content: 'Forged result',
+                mentions: '[]',
+                workRequestIds: '[]',
+                artifactRefs: '[]',
+                attachmentIds: '[]',
+            },
+        });
+        await expect(service.reconcileDueRoomReplyReminders()).resolves.toBe(1);
+        await expect(prisma.agentInvocation.findUnique({ where: { id: invocation.id } })).resolves.toMatchObject({
+            status: 'WAITING_ROOM_REPLY',
+            roomReplyReminderCount: 2,
+        });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'STARTED',
+        });
+        expect(scheduler.releaseInvocationLocks).not.toHaveBeenCalled();
+    });
     it('moves an idle TeamRun task from IN_PROGRESS to IN_REVIEW and writes reviewReason', async () => {
         const { workspace, task, teamRun, members } = await createFixture({ taskStatus: TaskStatus.IN_PROGRESS });
         const request = await createWorkRequest({ teamRunId: teamRun.id, targetMemberId: members[0].id });
@@ -482,6 +650,9 @@ describe('TeamReconcilerService', () => {
             status: 'CANCELLED',
             nextRoomReplyReminderAt: null,
         });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'CANCELLED',
+        });
         expect(scheduler.releaseInvocationLocks).toHaveBeenCalledWith(invocation.id);
         expect(lockService.listLocks()).toEqual([]);
         expect(scheduler.startNextSessions).toHaveBeenCalledWith(teamRun.id);
@@ -514,6 +685,9 @@ describe('TeamReconcilerService', () => {
         await expect(prisma.agentInvocation.findUnique({ where: { id: invocation.id } })).resolves.toMatchObject({
             status: 'CANCELLED',
         });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'CANCELLED',
+        });
         await expect(prisma.task.findUnique({ where: { id: task.id } })).resolves.toMatchObject({
             status: TaskStatus.IN_PROGRESS,
         });
@@ -544,6 +718,9 @@ describe('TeamReconcilerService', () => {
             status: 'CANCELLED',
             nextRoomReplyReminderAt: null,
         });
+        await expect(prisma.workRequest.findUnique({ where: { id: request.id } })).resolves.toMatchObject({
+            status: 'CANCELLED',
+        });
         expect(scheduler.releaseInvocationLocks).toHaveBeenCalledWith(invocation.id);
         expect(lockService.listLocks()).toEqual([]);
         expect(scheduler.startNextSessions).not.toHaveBeenCalled();
@@ -662,7 +839,7 @@ describe('TeamReconcilerService', () => {
                 expect(createdRequest).toMatchObject({
                     requesterType: 'agent',
                     requesterMemberId: members[0].id,
-                    status: 'STARTED',
+                    status: 'FAILED',
                 });
                 createdRequestId = createdRequest.id;
             });
@@ -713,6 +890,21 @@ describe('TeamReconcilerService', () => {
             workspaceId: workspace.id,
         });
         const longContent = `Long Team Room detail\n${'visible detail '.repeat(80)}`;
+        const earlierMessage = await prisma.roomMessage.create({
+            data: {
+                teamRunId: teamRun.id,
+                senderType: 'user',
+                senderId: members[0].id,
+                senderInvocationId: null,
+                kind: 'chat',
+                visibility: 'PUBLIC',
+                content: 'Earlier visible message',
+                mentions: stringifyJson([]),
+                artifactRefs: stringifyJson([]),
+                attachmentIds: stringifyJson([]),
+                workRequestIds: stringifyJson([]),
+            },
+        });
         const roomMessage = await prisma.roomMessage.create({
             data: {
                 teamRunId: teamRun.id,
@@ -728,6 +920,33 @@ describe('TeamReconcilerService', () => {
                 workRequestIds: stringifyJson([]),
             },
         });
+        await prisma.roomMessage.update({
+            where: { id: earlierMessage.id },
+            data: { createdAt: new Date('2026-01-01T00:00:00.000Z') },
+        });
+        await prisma.roomMessage.update({
+            where: { id: roomMessage.id },
+            data: { createdAt: new Date('2026-01-01T00:00:01.000Z') },
+        });
+        const agentMessage = await prisma.roomMessage.create({
+            data: {
+                teamRunId: teamRun.id,
+                senderType: 'agent',
+                senderId: members[0].id,
+                senderInvocationId: invocation.id,
+                kind: 'review',
+                visibility: 'PUBLIC',
+                content: 'Agent review summary',
+                mentions: stringifyJson([]),
+                artifactRefs: stringifyJson([]),
+                attachmentIds: stringifyJson([]),
+                workRequestIds: stringifyJson(['work-request-from-agent-message']),
+            },
+        });
+        await prisma.roomMessage.update({
+            where: { id: agentMessage.id },
+            data: { createdAt: new Date('2026-01-01T00:00:02.000Z') },
+        });
         const app = Fastify({ logger: false });
         try {
             setTeamRunEnv({
@@ -750,11 +969,28 @@ describe('TeamReconcilerService', () => {
             expect(restListResponse.statusCode).toBe(200);
             const restList = restListResponse.json();
             expect(restList[0]).toMatchObject({
+                id: earlierMessage.id,
+                contentMode: 'full',
+                fullContentAvailable: false,
+                isTruncated: false,
+            });
+            expect(restList[1]).toMatchObject({
                 id: roomMessage.id,
+                contentMode: 'preview',
+                fullContentAvailable: true,
                 isTruncated: true,
             });
-            expect(restList[0].content).toBe(restList[0].contentPreview);
-            expect(restList[0].content).not.toBe(longContent);
+            expect(restList[1].content).toBe(restList[1].contentPreview);
+            expect(restList[1].content).not.toBe(longContent);
+            const limitedRestListResponse = await app.inject({
+                method: 'GET',
+                url: `/api/team-runs/${teamRun.id}/messages?limit=1`,
+                headers: { 'x-agent-tower-invocation-id': invocation.id },
+            });
+            expect(limitedRestListResponse.statusCode).toBe(200);
+            expect(limitedRestListResponse.json().map((message) => message.id)).toEqual([
+                agentMessage.id,
+            ]);
             const restDetailResponse = await app.inject({
                 method: 'GET',
                 url: `/api/team-runs/${teamRun.id}/messages/${roomMessage.id}`,
@@ -764,7 +1000,9 @@ describe('TeamReconcilerService', () => {
             expect(restDetailResponse.json()).toMatchObject({
                 id: roomMessage.id,
                 content: longContent,
-                contentPreview: restList[0].contentPreview,
+                contentPreview: restList[1].contentPreview,
+                contentMode: 'full',
+                fullContentAvailable: false,
                 isTruncated: true,
             });
             const server = await createMcpServer(`http://127.0.0.1:${address.port}`);
@@ -780,12 +1018,60 @@ describe('TeamReconcilerService', () => {
                 expect(listResult.isError).not.toBe(true);
                 const mcpList = JSON.parse(getMcpToolText(listResult));
                 expect(mcpList[0]).toMatchObject({
+                    id: earlierMessage.id,
+                    kind: 'chat',
+                    sender: {
+                        type: 'user',
+                        memberId: members[0].id,
+                        name: members[0].name,
+                    },
+                    content: 'Earlier visible message',
+                    fullContentAvailable: false,
+                    mentions: [],
+                });
+                expect(mcpList[0]).not.toHaveProperty('teamRunId');
+                expect(mcpList[0]).not.toHaveProperty('senderId');
+                expect(mcpList[0]).not.toHaveProperty('senderInvocationId');
+                expect(mcpList[0]).not.toHaveProperty('visibility');
+                expect(mcpList[0]).not.toHaveProperty('contentPreview');
+                expect(mcpList[0]).not.toHaveProperty('contentMode');
+                expect(mcpList[0]).not.toHaveProperty('isTruncated');
+                expect(mcpList[0]).not.toHaveProperty('participants');
+                expect(mcpList[0]).not.toHaveProperty('recipientMemberIds');
+                expect(mcpList[0]).not.toHaveProperty('participantMemberIds');
+                expect(mcpList[1]).toMatchObject({
                     id: roomMessage.id,
-                    isTruncated: true,
+                    kind: 'chat',
+                    sender: { type: 'user' },
+                    fullContentAvailable: true,
+                    mentions: [],
+                });
+                expect(mcpList[1].content).toBe(restList[1].contentPreview);
+                expect(mcpList[1].content).not.toBe(longContent);
+                expect(mcpList[2]).toMatchObject({
+                    id: agentMessage.id,
+                    kind: 'review',
+                    sender: {
+                        type: 'agent',
+                        memberId: members[0].id,
+                        name: members[0].name,
+                    },
+                    content: 'Agent review summary',
+                    fullContentAvailable: false,
+                    mentions: [],
+                    workRequestIds: ['work-request-from-agent-message'],
                 });
-                expect(mcpList[0].contentPreview).toBeUndefined();
-                expect(mcpList[0].content).toBe(restList[0].contentPreview);
-                expect(mcpList[0].content).not.toBe(longContent);
+                expect(mcpList[2]).not.toHaveProperty('senderInvocationId');
+                const limitedListResult = await client.callTool({
+                    name: 'list_room_messages',
+                    arguments: {
+                        limit: 1,
+                    },
+                });
+                expect(limitedListResult.isError).not.toBe(true);
+                expect(JSON.parse(getMcpToolText(limitedListResult)).map((message) => message.id)).toEqual([
+                    agentMessage.id,
+                ]);
                 const detailResult = await client.callTool({
                     name: 'get_room_message',
                     arguments: {
@@ -796,7 +1082,9 @@ describe('TeamReconcilerService', () => {
                 expect(JSON.parse(getMcpToolText(detailResult))).toMatchObject({
                     id: roomMessage.id,
                     content: longContent,
-                    contentPreview: restList[0].contentPreview,
+                    contentPreview: restList[1].contentPreview,
+                    contentMode: 'full',
+                    fullContentAvailable: false,
                     isTruncated: true,
                 });
             }
@@ -893,7 +1181,7 @@ describe('TeamReconcilerService', () => {
                 expect(createdRequest).toMatchObject({
                     requesterType: 'agent',
                     requesterMemberId: members[0].id,
-                    status: 'STARTED',
+                    status: 'FAILED',
                 });
                 createdRequestId = createdRequest.id;
             });
@@ -1598,6 +1886,14 @@ describe('TeamReconcilerService', () => {
             });
             expect(noStopResult.isError).toBe(true);
             expect(getMcpToolText(noStopResult)).toContain('stopMemberWork');
+            const noMergeResult = await callToolForCurrentMember(noRead, noReadInvocation.id, {
+                name: 'merge_workspace',
+                arguments: {
+                    workspace_id: noRead.workspace.id,
+                },
+            });
+            expect(noMergeResult.isError).toBe(true);
+            expect(getMcpToolText(noMergeResult)).toContain('mergeWorkspace');
             await expect(prisma.roomMessage.count({
                 where: {
                     content: {
@@ -1758,7 +2054,7 @@ describe('TeamReconcilerService', () => {
                 status: 'CANCELLED',
             });
             await expect(prisma.workRequest.findUnique({ where: { id: otherRequest.id } })).resolves.toMatchObject({
-                status: 'STARTED',
+                status: 'FAILED',
             });
             await expect(prisma.workRequest.findUnique({ where: { id: ownPendingRejection.id } })).resolves.toMatchObject({
                 status: 'REJECTED',