Skip to content

The open alternative to Salesforce, designed for AI.

Show the last message and a Needs input status in the chat inbox (#27236)

Félix Malfaitd7f88d3b3948
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
index 2c98bdae22e..1026585f021 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadListItem.tsx
@@ -3,7 +3,8 @@ import { type MouseEvent, useId } from 'react';
import { useLingui } from '@lingui/react/macro';
import { Key } from 'ts-key-enum';
import { isDefined, isNonEmptyString } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme';
+import { IconHandClick } from 'twenty-ui/icon';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
import { AiChatThreadActionsDropdown } from '@/ai/components/AiChatThreadActionsDropdown';
import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
@@ -81,10 +82,30 @@ const StyledThreadTitle = styled.div<{ $isUnread: boolean }>`
white-space: nowrap;
`;
-const StyledThreadPreview = styled.div`
+const StyledThreadSubtitle = styled.div`
+ align-items: center;
color: ${themeCssVariables.font.color.tertiary};
+ display: flex;
font-size: ${themeCssVariables.font.size.sm};
+ gap: ${themeCssVariables.spacing[1]};
min-height: ${themeCssVariables.spacing[4]};
+ min-width: 0;
+`;
+
+const StyledNeedsInput = styled.div<{ $isUnread: boolean }>`
+ align-items: center;
+ color: ${({ $isUnread }) =>
+ $isUnread
+ ? themeCssVariables.color.blue
+ : themeCssVariables.font.color.tertiary};
+ display: flex;
+ flex-shrink: 0;
+ font-weight: ${themeCssVariables.font.weight.medium};
+ gap: ${themeCssVariables.spacing[1]};
+`;
+
+const StyledThreadPreview = styled.div`
+ min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -139,6 +160,7 @@ export const AiChatThreadListItem = ({
onDetach,
}: AiChatThreadListItemProps) => {
const { t } = useLingui();
+ const theme = useTheme();
const {
isRenaming,
draftTitle,
@@ -158,6 +180,8 @@ export const AiChatThreadListItem = ({
);
const threadMembers = useAgentChatThreadMembers(thread);
const isShownAsUnread = !isDefined(thread.deletedAt) && isUnread;
+ const isAwaitingAnswer =
+ !isDefined(thread.deletedAt) && isDefined(thread.pendingQuestionMessageId);
const previewText = getAgentChatThreadPreviewText({
thread,
workspaceMembers: currentWorkspaceMembers,
@@ -262,7 +286,18 @@ export const AiChatThreadListItem = ({
</StyledActivityTime>
</StyledThreadHeading>
)}
- <StyledThreadPreview>{previewText}</StyledThreadPreview>
+ <StyledThreadSubtitle>
+ {isAwaitingAnswer && (
+ <StyledNeedsInput $isUnread={isShownAsUnread}>
+ <IconHandClick size={theme.icon.size.sm} />
+ {t`Needs input`}
+ </StyledNeedsInput>
+ )}
+ {isAwaitingAnswer && isNonEmptyString(previewText) && (
+ <span aria-hidden>·</span>
+ )}
+ <StyledThreadPreview>{previewText}</StyledThreadPreview>
+ </StyledThreadSubtitle>
</StyledThreadContent>
<StyledMenuTrigger
$isDropdownOpen={isDropdownOpen}
diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatThreadListItem.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatThreadListItem.test.tsx
new file mode 100644
index 00000000000..3b0c5284ee8
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatThreadListItem.test.tsx
@@ -0,0 +1,92 @@
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen } from '@testing-library/react';
+import { Provider as JotaiProvider } from 'jotai';
+import { SOURCE_LOCALE } from 'twenty-shared/translations';
+
+import { AiChatThreadListItem } from '@/ai/components/AiChatThreadListItem';
+import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';
+import {
+ jotaiStore,
+ resetJotaiStore,
+} from '@/ui/utilities/state/jotai/jotaiStore';
+import { messages } from '~/locales/generated/en';
+
+i18n.load({ [SOURCE_LOCALE]: messages });
+i18n.activate(SOURCE_LOCALE);
+
+jest.mock('@/ai/components/AiChatThreadActionsDropdown', () => ({
+ AiChatThreadActionsDropdown: () => null,
+}));
+
+jest.mock('@/ai/hooks/useAiChatThreadRename', () => ({
+ useAiChatThreadRename: () => ({
+ isRenaming: false,
+ draftTitle: '',
+ setDraftTitle: jest.fn(),
+ startRename: jest.fn(),
+ cancelRename: jest.fn(),
+ commitRename: jest.fn(),
+ }),
+}));
+
+const buildThread = (
+ thread: Partial<AgentChatThreadRecord>,
+): AgentChatThreadRecord => ({
+ __typename: 'AgentChatThread',
+ id: '6f1c2b0e-7a4d-4e8b-9c3f-2d5a1b8e7c60',
+ title: 'Q3 renewal outreach',
+ deletedAt: null,
+ createdAt: '2026-09-07T00:00:00.000Z',
+ updatedAt: '2026-09-07T00:00:00.000Z',
+ lastMessageText: 'Which plan should I quote?',
+ ...thread,
+});
+
+const renderListItem = (thread: AgentChatThreadRecord) =>
+ render(
+ <JotaiProvider store={jotaiStore}>
+ <I18nProvider i18n={i18n}>
+ <AiChatThreadListItem
+ thread={thread}
+ isSelected={false}
+ onClick={jest.fn()}
+ />
+ </I18nProvider>
+ </JotaiProvider>,
+ );
+
+describe('AiChatThreadListItem', () => {
+ beforeEach(() => {
+ resetJotaiStore();
+ });
+
+ it('shows the last message under the title', () => {
+ renderListItem(buildThread({}));
+
+ expect(screen.getByText('Which plan should I quote?')).toBeInTheDocument();
+ expect(screen.queryByText('Needs input')).not.toBeInTheDocument();
+ });
+
+ it('shows that the chat needs input while a question waits on an answer', () => {
+ renderListItem(
+ buildThread({
+ pendingQuestionMessageId: '0b6e3f1a-2c4d-4b8e-9a7f-1d3c5e7a9b20',
+ }),
+ );
+
+ expect(screen.getByText('Needs input')).toBeInTheDocument();
+ expect(screen.getByText('Which plan should I quote?')).toBeInTheDocument();
+ });
+
+ it('does not ask for input on a deleted chat', () => {
+ renderListItem(
+ buildThread({
+ deletedAt: '2026-09-08T00:00:00.000Z',
+ pendingQuestionMessageId: '0b6e3f1a-2c4d-4b8e-9a7f-1d3c5e7a9b20',
+ }),
+ );
+
+ expect(screen.queryByText('Needs input')).not.toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts b/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts
index d6e61140c62..5292bcf2c02 100644
--- a/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts
+++ b/packages/twenty-front/src/modules/ai/constants/AgentChatThreadListRecordGqlFields.ts
@@ -9,6 +9,7 @@ export const AGENT_CHAT_THREAD_LIST_RECORD_GQL_FIELDS = {
lastMessageSenderWorkspaceMemberId: true,
writerWorkspaceMemberIds: true,
workspaceMemberId: true,
+ pendingQuestionMessageId: true,
totalInputTokens: true,
totalOutputTokens: true,
totalCacheReadTokens: true,
diff --git a/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts b/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts
index 8df8f790ad2..ae805d6ee3f 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useChatThreadsForRecord.ts
@@ -34,6 +34,7 @@ const CHAT_THREADS_FOR_RECORD_GQL_FIELDS = {
lastMessageSenderWorkspaceMemberId: true,
writerWorkspaceMemberIds: true,
workspaceMemberId: true,
+ pendingQuestionMessageId: true,
},
};
diff --git a/packages/twenty-front/src/modules/ai/types/AgentChatThreadRecord.ts b/packages/twenty-front/src/modules/ai/types/AgentChatThreadRecord.ts
index eff738431a5..d5625d89b99 100644
--- a/packages/twenty-front/src/modules/ai/types/AgentChatThreadRecord.ts
+++ b/packages/twenty-front/src/modules/ai/types/AgentChatThreadRecord.ts
@@ -10,6 +10,7 @@ export type AgentChatThreadRecord = ObjectRecord & {
lastMessageSenderWorkspaceMemberId?: string | null;
writerWorkspaceMemberIds?: string[] | null;
workspaceMemberId?: string | null;
+ pendingQuestionMessageId?: string | null;
totalInputTokens?: number;
totalOutputTokens?: number;
totalCacheReadTokens?: number;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-thread-activity-columns.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-thread-activity-columns.constant.ts
index a7fb07cb388..3352b4c624e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-thread-activity-columns.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-thread-activity-columns.constant.ts
@@ -1 +1 @@
-export const AGENT_CHAT_THREAD_ACTIVITY_COLUMNS = `"lastActivityAt", "updatedAt", "lastMessageText", "lastMessageSenderWorkspaceMemberId", "writerWorkspaceMemberIds"`;
+export const AGENT_CHAT_THREAD_ACTIVITY_COLUMNS = `"lastActivityAt", "updatedAt", "lastMessageText", "lastMessageSenderWorkspaceMemberId", "writerWorkspaceMemberIds", "pendingQuestionMessageId"`;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts
index f8f6e154e34..dbeeb189a30 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts
@@ -1,4 +1,5 @@
import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';
+import { findAwaitingCallText } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util';
import { findLastMessageText } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-last-message-text.util';
import { updateAgentChatThreadUsage } from 'src/engine/metadata-modules/ai/ai-chat/utils/update-agent-chat-thread-usage.util';
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
@@ -703,7 +704,10 @@ export class StreamAgentChatJob {
turnModelId: string;
turnId: string;
}): Promise<AgentChatTurnOutcome | null> {
- const replyText = findLastMessageText(responseMessage.parts);
+ // A turn that only waits on the member still needs a preview in chat lists
+ const replyText =
+ findLastMessageText(responseMessage.parts) ??
+ findAwaitingCallText(responseMessage.parts);
const hasText = responseMessage.parts.some(
(part) => part.type === 'text' && isNonEmptyString(part.text),
);
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts
index 5fab6beba38..f1681665f49 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts
@@ -10,10 +10,19 @@ const QUESTIONS = [
},
];
+const CLEARED_THREAD = {
+ id: 'thread-id',
+ pendingQuestionMessageId: null,
+};
+
const buildService = ({ claimAffected = 1 } = {}) => {
const threadRepository = {
+ findOne: jest.fn().mockResolvedValue(CLEARED_THREAD),
update: jest.fn().mockResolvedValue({ affected: claimAffected }),
};
+ const threadRecordEventService = {
+ emitThreadUpdated: jest.fn().mockResolvedValue(undefined),
+ };
const messagePartRepository = {
find: jest.fn().mockResolvedValue([
{
@@ -42,12 +51,17 @@ const buildService = ({ claimAffected = 1 } = {}) => {
{} as never,
{} as never,
{} as never,
- {} as never,
+ threadRecordEventService as never,
{} as never,
{} as never,
);
- return { service, threadRepository, messagePartRepository };
+ return {
+ service,
+ threadRepository,
+ messagePartRepository,
+ threadRecordEventService,
+ };
};
const closeArguments = {
@@ -87,13 +101,84 @@ describe('AgentChatService closePendingToolCalls', () => {
});
});
- it('leaves the call as it is when an answer holds the conversation', async () => {
- const { service, messagePartRepository } = buildService({
- claimAffected: 0,
+ it('tells open chat lists the conversation no longer waits on an answer', async () => {
+ const { service, threadRecordEventService } = buildService();
+
+ await service.closePendingToolCalls(closeArguments);
+
+ expect(threadRecordEventService.emitThreadUpdated).toHaveBeenCalledTimes(1);
+ expect(threadRecordEventService.emitThreadUpdated).toHaveBeenCalledWith({
+ workspaceId: 'workspace-id',
+ threadBefore: {
+ ...CLEARED_THREAD,
+ pendingQuestionMessageId: 'question-message-id',
+ },
+ threadAfter: CLEARED_THREAD,
});
+ });
+
+ it('leaves the call as it is when an answer holds the conversation', async () => {
+ const { service, messagePartRepository, threadRecordEventService } =
+ buildService({
+ claimAffected: 0,
+ });
await service.closePendingToolCalls(closeArguments);
expect(messagePartRepository.writePart).not.toHaveBeenCalled();
+ expect(threadRecordEventService.emitThreadUpdated).not.toHaveBeenCalled();
+ });
+});
+
+describe('AgentChatService recordToolCallAnswer', () => {
+ const answerArguments = {
+ threadId: 'thread-id',
+ messageId: 'question-message-id',
+ partId: 'part-id',
+ toolOutput: { result: { status: 'answered' } },
+ workspaceId: 'workspace-id',
+ };
+
+ it('tells open chat lists once the last answer stops the wait', async () => {
+ const { service, messagePartRepository, threadRecordEventService } =
+ buildService();
+
+ messagePartRepository.writePart
+ .mockResolvedValueOnce(undefined)
+ .mockResolvedValueOnce([{ id: 'thread-id' }]);
+
+ await service.recordToolCallAnswer({
+ ...answerArguments,
+ isLastAnswer: true,
+ });
+
+ expect(threadRecordEventService.emitThreadUpdated).toHaveBeenCalledTimes(1);
+ });
+
+ it('stays quiet when another caller already stopped the wait', async () => {
+ const { service, messagePartRepository, threadRecordEventService } =
+ buildService();
+
+ messagePartRepository.writePart
+ .mockResolvedValueOnce(undefined)
+ .mockResolvedValueOnce([]);
+
+ await service.recordToolCallAnswer({
+ ...answerArguments,
+ isLastAnswer: true,
+ });
+
+ expect(threadRecordEventService.emitThreadUpdated).not.toHaveBeenCalled();
+ });
+
+ it('stays quiet while other calls still wait on an answer', async () => {
+ const { service, threadRecordEventService } = buildService();
+
+ await service.recordToolCallAnswer({
+ ...answerArguments,
+ isLastAnswer: false,
+ });
+
+ expect(threadRecordEventService.emitThreadUpdated).not.toHaveBeenCalled();
});
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service.ts
index a5103d68805..4f62f00aedc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service.ts
@@ -104,14 +104,20 @@ export class AgentChatThreadService {
workspaceId,
threadId,
text,
+ threadBefore,
}: {
workspaceId: string;
threadId: string;
text: string | null;
+ // Read before the message was written, so the event carries what the
+ // message changed, such as a question now waiting on the member
+ threadBefore?: AgentChatThreadWorkspaceEntity;
}): Promise<void> {
- const thread = await this.threadRepository.findOne(workspaceId, {
- where: { id: threadId },
- });
+ const thread =
+ threadBefore ??
+ (await this.threadRepository.findOne(workspaceId, {
+ where: { id: threadId },
+ }));
if (!isDefined(thread)) {
return;
@@ -164,7 +170,7 @@ export class AgentChatThreadService {
private async emitThreadActivityUpdated({
workspaceId,
thread,
- activity: { lastActivityAt, updatedAt, ...lastMessage },
+ activity: { lastActivityAt, updatedAt, ...recordedColumns },
}: {
workspaceId: string;
thread: AgentChatThreadWorkspaceEntity;
@@ -175,7 +181,7 @@ export class AgentChatThreadService {
threadBefore: thread,
threadAfter: {
...thread,
- ...lastMessage,
+ ...recordedColumns,
lastActivityAt: lastActivityAt?.toISOString() ?? thread.lastActivityAt,
updatedAt: updatedAt.toISOString(),
},
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
index e5d0e74c97a..46d555ec0a4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
@@ -3,7 +3,7 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-a
import { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { ExtendedUIMessage } from 'twenty-shared/ai';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
@@ -27,9 +27,12 @@ import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/s
import { AgentConversationWriterService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service';
import { AgentTitleGenerationService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-title-generation.service';
import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
+import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utils/format-error-with-cause.util';
@Injectable()
export class AgentChatService {
+ private readonly logger = new Logger(AgentChatService.name);
+
constructor(
@InjectAgentHistoryRepository('agentChatThread')
private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,
@@ -564,7 +567,7 @@ export class AgentChatService {
isLastAnswer: boolean;
workspaceId: string;
}): Promise<void> {
- await this.messagePartRepository.query(
+ const isPendingQuestionCleared = await this.messagePartRepository.query(
workspaceId,
async ({ manager, table }) => {
await manager.query(
@@ -572,14 +575,30 @@ export class AgentChatService {
[partId, JSON.stringify(toolOutput)],
);
- if (isLastAnswer) {
- await manager.query(
- `UPDATE ${table('agentChatThread')} SET "pendingQuestionMessageId" = NULL, "updatedAt" = now() WHERE id = $1 AND "pendingQuestionMessageId" = $2`,
- [threadId, messageId],
- );
+ if (!isLastAnswer) {
+ return false;
}
+
+ const clearedThreads = await manager.query<{ id: string }[]>(
+ `WITH cleared AS (
+ UPDATE ${table('agentChatThread')} SET "pendingQuestionMessageId" = NULL, "updatedAt" = now()
+ WHERE id = $1 AND "pendingQuestionMessageId" = $2
+ RETURNING id
+ ) SELECT id FROM cleared`,
+ [threadId, messageId],
+ );
+
+ return clearedThreads.length > 0;
},
);
+
+ if (isPendingQuestionCleared) {
+ await this.emitPendingQuestionCleared({
+ workspaceId,
+ threadId,
+ messageId,
+ });
+ }
}
// clearing the marker is the claim, so only one caller closes the calls
@@ -609,6 +628,40 @@ export class AgentChatService {
messageId,
workspaceId,
});
+
+ await this.emitPendingQuestionCleared({ workspaceId, threadId, messageId });
+ }
+
+ // Chat lists show which chats wait on an answer. The marker is already
+ // cleared, so a lost event must not fail the caller
+ private async emitPendingQuestionCleared({
+ workspaceId,
+ threadId,
+ messageId,
+ }: {
+ workspaceId: string;
+ threadId: string;
+ messageId: string;
+ }): Promise<void> {
+ try {
+ const thread = await this.threadRepository.findOne(workspaceId, {
+ where: { id: threadId },
+ });
+
+ if (!isDefined(thread)) {
+ return;
+ }
+
+ await this.threadRecordEventService.emitThreadUpdated({
+ workspaceId,
+ threadBefore: { ...thread, pendingQuestionMessageId: messageId },
+ threadAfter: thread,
+ });
+ } catch (error) {
+ this.logger.warn(
+ `Could not emit the cleared question on thread ${threadId}: ${formatErrorWithCause(error)}`,
+ );
+ }
}
async restoreThread({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts
index ee2f69477bf..c7f1cd033f1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts
@@ -154,6 +154,7 @@ export class AgentInboxService {
workspaceId,
threadId,
text: input.text,
+ threadBefore: thread,
});
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-activity.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-activity.type.ts
index 2f12363c7d3..f9e0e1880c6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-activity.type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-activity.type.ts
@@ -9,5 +9,6 @@ export type AgentChatThreadActivity = {
| 'lastMessageText'
| 'lastMessageSenderWorkspaceMemberId'
| 'writerWorkspaceMemberIds'
+ | 'pendingQuestionMessageId'
>
>;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-awaiting-call-text.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-awaiting-call-text.util.spec.ts
new file mode 100644
index 00000000000..df70ef3cf1b
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-awaiting-call-text.util.spec.ts
@@ -0,0 +1,101 @@
+import { type ExtendedUIMessagePart } from 'twenty-shared/ai';
+
+import { findAwaitingCallText } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util';
+
+const toolPart = ({
+ toolName,
+ input,
+ result = {},
+ status = 'pending',
+}: {
+ toolName: string;
+ input: unknown;
+ result?: Record<string, unknown>;
+ status?: 'pending' | 'failed';
+}) =>
+ ({
+ type: `tool-${toolName}`,
+ toolCallId: `${toolName}-1`,
+ state: 'output-available',
+ input,
+ output: { success: status === 'pending', result: { ...result, status } },
+ }) as ExtendedUIMessagePart;
+
+describe('findAwaitingCallText', () => {
+ it('returns null without a call waiting on the member', () => {
+ expect(
+ findAwaitingCallText([
+ { type: 'text', text: 'Draft ready' } as ExtendedUIMessagePart,
+ toolPart({
+ toolName: 'find_companies',
+ input: { question: 'Not a question call' },
+ }),
+ ]),
+ ).toBeNull();
+ });
+
+ it('returns the question asked', () => {
+ expect(
+ findAwaitingCallText([
+ toolPart({
+ toolName: 'ask_question',
+ input: {
+ header: 'Plan',
+ question: 'Which plan should I quote?',
+ options: [{ label: 'Pro' }, { label: 'Organization' }],
+ },
+ }),
+ ]),
+ ).toBe('Which plan should I quote?');
+ });
+
+ it('returns the fields a form asks for', () => {
+ expect(
+ findAwaitingCallText([
+ toolPart({
+ toolName: 'request_form',
+ input: {
+ fields: [
+ { name: 'company', label: 'Company', type: 'RECORD' },
+ { name: 'closeDate', label: 'Close date', type: 'DATE' },
+ ],
+ },
+ }),
+ ]),
+ ).toBe('Company, Close date');
+ });
+
+ it('returns the summary of the proposed action', () => {
+ expect(
+ findAwaitingCallText([
+ toolPart({
+ toolName: 'propose_tool_call',
+ input: { toolName: 'update_company', summary: 'Agent summary' },
+ result: {
+ proposal: { summary: 'Raise the Acme renewal to 120k' },
+ },
+ }),
+ ]),
+ ).toBe('Raise the Acme renewal to 120k');
+ });
+
+ it('ignores a call that was never shown to the member', () => {
+ expect(
+ findAwaitingCallText([
+ toolPart({
+ toolName: 'ask_question',
+ input: { question: 'Which plan?' },
+ status: 'failed',
+ }),
+ ]),
+ ).toBeNull();
+ });
+
+ it('ignores a question that is only whitespace', () => {
+ expect(
+ findAwaitingCallText([
+ toolPart({ toolName: 'ask_question', input: { question: ' ' } }),
+ ]),
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.ts
new file mode 100644
index 00000000000..d707475d131
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.ts
@@ -0,0 +1,78 @@
+import { isNonEmptyString, isString } from '@sniptt/guards';
+import { getToolName, isToolUIPart } from 'ai';
+import {
+ ASK_QUESTION_TOOL_NAME,
+ type ExtendedUIMessagePart,
+ PROPOSE_TOOL_CALL_TOOL_NAME,
+ REQUEST_FORM_TOOL_NAME,
+} from 'twenty-shared/ai';
+import { isDefined, isPlainObject } from 'twenty-shared/utils';
+
+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';
+
+const readNonEmptyString = (value: unknown): string | null =>
+ isString(value) && isNonEmptyString(value.trim()) ? value : null;
+
+const readAwaitingCallText = ({
+ toolName,
+ input,
+ output,
+}: {
+ toolName: string;
+ input: unknown;
+ output: unknown;
+}): string | null => {
+ const callInput = isPlainObject(input) ? input : {};
+
+ switch (toolName) {
+ case ASK_QUESTION_TOOL_NAME:
+ return readNonEmptyString(callInput.question);
+ case REQUEST_FORM_TOOL_NAME: {
+ const fieldLabels = (
+ Array.isArray(callInput.fields) ? callInput.fields : []
+ )
+ .map((field) =>
+ isPlainObject(field) ? readNonEmptyString(field.label) : null,
+ )
+ .filter(isDefined);
+
+ return fieldLabels.length > 0 ? fieldLabels.join(', ') : null;
+ }
+ case PROPOSE_TOOL_CALL_TOOL_NAME: {
+ // The server resolves the proposal shown to the member into the pending output
+ const proposal =
+ isPlainObject(output) &&
+ isPlainObject(output.result) &&
+ isPlainObject(output.result.proposal)
+ ? output.result.proposal
+ : {};
+
+ return (
+ readNonEmptyString(proposal.summary) ??
+ readNonEmptyString(callInput.summary)
+ );
+ }
+ default:
+ return null;
+ }
+};
+
+export const findAwaitingCallText = (
+ parts: ExtendedUIMessagePart[],
+): string | null =>
+ parts
+ .flatMap((part) => {
+ // A call that failed was never shown to the member
+ if (!isToolUIPart(part) || !isAwaitingPausingToolOutput(part.output)) {
+ return [];
+ }
+
+ const text = readAwaitingCallText({
+ toolName: getToolName(part),
+ input: part.input,
+ output: part.output,
+ });
+
+ return isDefined(text) ? [text] : [];
+ })
+ .pop() ?? null;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/touch-agent-chat-thread.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/touch-agent-chat-thread.util.ts
index f3a2c091e92..648e1015bb9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/touch-agent-chat-thread.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/touch-agent-chat-thread.util.ts
@@ -18,9 +18,9 @@ export const touchAgentChatThread = async ({
UPDATE ${table('agentChatThread')}
SET "updatedAt" = now()
WHERE id = $1
- RETURNING NULL::timestamptz AS "lastActivityAt", "updatedAt"
+ RETURNING NULL::timestamptz AS "lastActivityAt", "updatedAt", "pendingQuestionMessageId"
)
- SELECT "lastActivityAt", "updatedAt" FROM thread`,
+ SELECT "lastActivityAt", "updatedAt", "pendingQuestionMessageId" FROM thread`,
[threadId],
),
);