The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Make the agent chat states plain states (#27558)
Félix Malfait2abdaf05cf7a
diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsxindex cc0844792f8..7bb097ca9be 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatMessagesFetchEffect.tsx@@ -6,27 +6,26 @@ import { isDefined } from 'twenty-shared/utils';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';import { AGENT_CHAT_NEW_THREAD_DRAFT_KEY } from '@/ai/states/agentChatDraftsByThreadIdState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatFetchedMessagesComponentFamilyState } from '@/ai/states/agentChatFetchedMessagesComponentFamilyState';-import { agentChatFirstLiveSeqComponentFamilyState } from '@/ai/states/agentChatFirstLiveSeqComponentFamilyState';-import { agentChatHandleEventCallbackComponentFamilyState } from '@/ai/states/agentChatHandleEventCallbackComponentFamilyState';-import { agentChatIsAwaitingPersistedRefetchComponentFamilyState } from '@/ai/states/agentChatIsAwaitingPersistedRefetchComponentFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatFetchedMessagesFamilyState } from '@/ai/states/agentChatFetchedMessagesFamilyState';+import { agentChatFirstLiveSeqFamilyState } from '@/ai/states/agentChatFirstLiveSeqFamilyState';+import { agentChatHandleEventCallbackFamilyState } from '@/ai/states/agentChatHandleEventCallbackFamilyState';+import { agentChatIsAwaitingPersistedRefetchFamilyState } from '@/ai/states/agentChatIsAwaitingPersistedRefetchFamilyState';import { agentChatMessagesLoadingState } from '@/ai/states/agentChatMessagesLoadingState';-import { agentChatQueuedMessagesComponentFamilyState } from '@/ai/states/agentChatQueuedMessagesComponentFamilyState';+import { agentChatQueuedMessagesFamilyState } from '@/ai/states/agentChatQueuedMessagesFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { skipMessagesSkeletonUntilLoadedState } from '@/ai/states/skipMessagesSkeletonUntilLoadedState';import { mapDBMessagesToUIMessages } from '@/ai/utils/mapDBMessagesToUIMessages';import { SSE_CLIENT_RECONNECTED_EVENT_NAME } from '@/sse-db-event/constants/SseClientReconnectedEventName';import { useQueryWithCallbacks } from '@/apollo/hooks/useQueryWithCallbacks';import { useListenToBrowserEvent } from '@/browser-event/hooks/useListenToBrowserEvent';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import {GetChatMessagesDocument,type GetChatMessagesQuery,} from '~/generated-metadata/graphql';+import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';export const AgentChatMessagesFetchEffect = () => {const store = useStore();@@ -47,32 +46,21 @@ export const AgentChatMessagesFetchEffect = () => {skipMessagesSkeletonUntilLoadedState,);- const setAgentChatFetchedMessages = useSetAtomComponentFamilyState(- agentChatFetchedMessagesComponentFamilyState,+ const setAgentChatFetchedMessages = useSetAtomFamilyState(+ agentChatFetchedMessagesFamilyState,{ threadId: currentAiChatThread },);- const setAgentChatQueuedMessages = useSetAtomComponentFamilyState(- agentChatQueuedMessagesComponentFamilyState,+ const setAgentChatQueuedMessages = useSetAtomFamilyState(+ agentChatQueuedMessagesFamilyState,{ threadId: currentAiChatThread },);- const setAgentChatIsAwaitingPersistedRefetch = useSetAtomComponentFamilyState(- agentChatIsAwaitingPersistedRefetchComponentFamilyState,+ const setAgentChatIsAwaitingPersistedRefetch = useSetAtomFamilyState(+ agentChatIsAwaitingPersistedRefetchFamilyState,{ threadId: currentAiChatThread },);- const handleEventCallbackFamilyCallback =- useAtomComponentFamilyStateCallbackState(- agentChatHandleEventCallbackComponentFamilyState,- );- const errorFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatErrorComponentFamilyState,- );- const firstLiveSeqFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatFirstLiveSeqComponentFamilyState,- );-const handleFirstLoad = useCallback((_data: GetChatMessagesQuery) => {setSkipMessagesSkeletonUntilLoaded(false);@@ -83,7 +71,7 @@ export const AgentChatMessagesFetchEffect = () => {const handleDataLoaded = useCallback((data: GetChatMessagesQuery) => {const error = store.get(- errorFamilyCallback({ threadId: currentAiChatThread }),+ agentChatErrorFamilyState.atomFamily({ threadId: currentAiChatThread }),);if (isGraphqlErrorOfType(error, 'NOT_FOUND')) {return;@@ -112,14 +100,16 @@ export const AgentChatMessagesFetchEffect = () => {const familyKey = { threadId };const handleEvent = store.get(- handleEventCallbackFamilyCallback(familyKey),+ agentChatHandleEventCallbackFamilyState.atomFamily(familyKey),);if (!isDefined(handleEvent)) {return;}- const firstLiveSeq = store.get(firstLiveSeqFamilyCallback(familyKey));+ const firstLiveSeq = store.get(+ agentChatFirstLiveSeqFamilyState.atomFamily(familyKey),+ );for (let index = 0; index < catchup.chunks.length; index++) {handleEvent({@@ -139,13 +129,10 @@ export const AgentChatMessagesFetchEffect = () => {},[currentAiChatThread,- errorFamilyCallback,setAgentChatFetchedMessages,setAgentChatQueuedMessages,setAgentChatIsAwaitingPersistedRefetch,store,- handleEventCallbackFamilyCallback,- firstLiveSeqFamilyCallback,],);diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatProvider.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatProvider.tsxindex cac5bbf0eb0..cee09919748 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatProvider.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatProvider.tsx@@ -4,8 +4,6 @@ import { AgentChatRuntimeEffects } from '@/ai/components/AgentChatRuntimeEffectsimport { AgentChatThreadInitializationEffect } from '@/ai/components/AgentChatThreadInitializationEffect';import { AgentChatThreadParticipantOperationsEffect } from '@/ai/components/AgentChatThreadParticipantOperationsEffect';import { AgentChatThreadRecordOperationsEffect } from '@/ai/components/AgentChatThreadRecordOperationsEffect';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';type AgentChatProviderProps = {children: ReactNode;@@ -13,14 +11,10 @@ type AgentChatProviderProps = {export const AgentChatProvider = ({ children }: AgentChatProviderProps) => (<Suspense fallback={null}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: AGENT_CHAT_INSTANCE_ID }}- >- <AgentChatThreadInitializationEffect />- <AgentChatThreadRecordOperationsEffect />- <AgentChatThreadParticipantOperationsEffect />- <AgentChatRuntimeEffects />- {children}- </AgentChatComponentInstanceContext.Provider>+ <AgentChatThreadInitializationEffect />+ <AgentChatThreadRecordOperationsEffect />+ <AgentChatThreadParticipantOperationsEffect />+ <AgentChatRuntimeEffects />+ {children}</Suspense>);diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatStreamKeepAliveEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatStreamKeepAliveEffect.tsxindex 3b5b3d21baf..e23f1331cfd 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatStreamKeepAliveEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatStreamKeepAliveEffect.tsx@@ -6,9 +6,9 @@ import { isDefined, isValidUuid } from 'twenty-shared/utils';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';import { AGENT_CHAT_STREAM_LIVENESS_CHECK_INTERVAL_IN_MS } from '@/ai/constants/AgentChatStreamLivenessCheckIntervalInMs';import { AGENT_CHAT_STREAM_LIVENESS_TIMEOUT_IN_MS } from '@/ai/constants/AgentChatStreamLivenessTimeoutInMs';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';import { agentChatStreamLastEventTimestampState } from '@/ai/states/agentChatStreamLastEventTimestampState';import { agentChatStreamRecoveryAttemptsState } from '@/ai/states/agentChatStreamRecoveryAttemptsState';import { agentChatStreamResubscribeNonceState } from '@/ai/states/agentChatStreamResubscribeNonceState';@@ -19,7 +19,6 @@ import { useListenToBrowserEvent } from '@/browser-event/hooks/useListenToBrowseimport { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';import { SSE_CLIENT_RECONNECTED_EVENT_NAME } from '@/sse-db-event/constants/SseClientReconnectedEventName';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';const MAX_SILENT_RECOVERY_ATTEMPTS = 3;@@ -28,25 +27,16 @@ export const AgentChatStreamKeepAliveEffect = () => {const store = useStore();const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const isStreamingFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatIsStreamingComponentFamilyState,- );- const isAwaitingFirstChunkFamilyCallback =- useAtomComponentFamilyStateCallbackState(- agentChatIsAwaitingFirstChunkComponentFamilyState,- );- const errorFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatErrorComponentFamilyState,- );-const hasActiveSubscription =isDefined(currentAiChatThread) && isValidUuid(currentAiChatThread);const recoverStreamIfStalled = useCallback(() => {const familyKey = { threadId: currentAiChatThread };- const isStreaming = store.get(isStreamingFamilyCallback(familyKey));+ const isStreaming = store.get(+ agentChatIsStreamingFamilyState.atomFamily(familyKey),+ );const isAwaitingFirstChunk = store.get(- isAwaitingFirstChunkFamilyCallback(familyKey),+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily(familyKey),);if (!isStreaming && !isAwaitingFirstChunk) {@@ -61,14 +51,17 @@ export const AgentChatStreamKeepAliveEffect = () => {if (recoveryAttempts >= MAX_SILENT_RECOVERY_ATTEMPTS) {store.set(- errorFamilyCallback(familyKey),+ agentChatErrorFamilyState.atomFamily(familyKey),createAiChatCodedError(t`Connection to the assistant was lost. Reload to see the response.`,AiChatErrorCode.CONNECTION_LOST,),);- store.set(isStreamingFamilyCallback(familyKey), false);- store.set(isAwaitingFirstChunkFamilyCallback(familyKey), false);+ store.set(agentChatIsStreamingFamilyState.atomFamily(familyKey), false);+ store.set(+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily(familyKey),+ false,+ );store.set(agentChatStreamRecoveryAttemptsState.atom, 0);store.set(agentChatStreamLastEventTimestampState.atom, Date.now());@@ -82,13 +75,7 @@ export const AgentChatStreamKeepAliveEffect = () => {store.set(agentChatStreamLastEventTimestampState.atom, Date.now());store.set(agentChatStreamResubscribeNonceState.atom, (nonce) => nonce + 1);dispatchBrowserEvent(AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME);- }, [- store,- isStreamingFamilyCallback,- isAwaitingFirstChunkFamilyCallback,- errorFamilyCallback,- currentAiChatThread,- ]);+ }, [store, currentAiChatThread]);useEffect(() => {if (!hasActiveSubscription) {@@ -109,7 +96,7 @@ export const AgentChatStreamKeepAliveEffect = () => {if (timeSinceLastEventInMs <= AGENT_CHAT_STREAM_LIVENESS_TIMEOUT_IN_MS) {store.set(agentChatStreamRecoveryAttemptsState.atom, 0);- const errorAtom = errorFamilyCallback({+ const errorAtom = agentChatErrorFamilyState.atomFamily({threadId: currentAiChatThread,});const currentError = store.get(errorAtom);@@ -132,7 +119,6 @@ export const AgentChatStreamKeepAliveEffect = () => {hasActiveSubscription,store,recoverStreamIfStalled,- errorFamilyCallback,currentAiChatThread,]);diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatStreamSubscriptionEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatStreamSubscriptionEffect.tsxindex 7e4d08194ed..739e091eaee 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatStreamSubscriptionEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatStreamSubscriptionEffect.tsx@@ -7,17 +7,17 @@ import { useAgentChatSubscription } from '@/ai/hooks/useAgentChatSubscription';import { useEnsureAgentChatThreadExistsForDraft } from '@/ai/hooks/useEnsureAgentChatThreadExistsForDraft';import { useEnsureAgentChatThreadIdForSend } from '@/ai/hooks/useEnsureAgentChatThreadIdForSend';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatFetchedMessagesComponentFamilyState } from '@/ai/states/agentChatFetchedMessagesComponentFamilyState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatIsAwaitingPersistedRefetchComponentFamilyState } from '@/ai/states/agentChatIsAwaitingPersistedRefetchComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatFetchedMessagesFamilyState } from '@/ai/states/agentChatFetchedMessagesFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatIsAwaitingPersistedRefetchFamilyState } from '@/ai/states/agentChatIsAwaitingPersistedRefetchFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { useListenToBrowserEvent } from '@/browser-event/hooks/useListenToBrowserEvent';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';export const AgentChatStreamSubscriptionEffect = () => {const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);@@ -40,28 +40,28 @@ export const AgentChatStreamSubscriptionEffect = () => {useAgentChatSubscription(subscriptionThreadId);- const agentChatFetchedMessages = useAtomComponentFamilyStateValue(- agentChatFetchedMessagesComponentFamilyState,+ const agentChatFetchedMessages = useAtomFamilyStateValue(+ agentChatFetchedMessagesFamilyState,{ threadId: currentAiChatThread },);- const setAgentChatMessages = useSetAtomComponentFamilyState(- agentChatMessagesComponentFamilyState,+ const setAgentChatMessages = useSetAtomFamilyState(+ agentChatMessagesFamilyState,{ threadId: currentAiChatThread },);- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: currentAiChatThread },);- const agentChatIsAwaitingPersistedRefetch = useAtomComponentFamilyStateValue(- agentChatIsAwaitingPersistedRefetchComponentFamilyState,+ const agentChatIsAwaitingPersistedRefetch = useAtomFamilyStateValue(+ agentChatIsAwaitingPersistedRefetchFamilyState,{ threadId: currentAiChatThread },);- const agentChatIsAwaitingFirstChunk = useAtomComponentFamilyStateValue(- agentChatIsAwaitingFirstChunkComponentFamilyState,+ const agentChatIsAwaitingFirstChunk = useAtomFamilyStateValue(+ agentChatIsAwaitingFirstChunkFamilyState,{ threadId: currentAiChatThread },);diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatStreamingAutoScrollEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatStreamingAutoScrollEffect.tsxindex 15d94c0ef7a..4cba2f94207 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatStreamingAutoScrollEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatStreamingAutoScrollEffect.tsx@@ -2,20 +2,20 @@ import { isNonEmptyArray } from '@sniptt/guards';import { useEffect } from 'react';import { isDefined } from 'twenty-shared/utils';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { agentChatIsScrolledToBottomComponentSelector } from '@/ai/states/selectors/agentChatIsScrolledToBottomComponentSelector';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { scrollAiChatToBottom } from '@/ai/utils/scrollAiChatToBottom';import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';export const AgentChatStreamingAutoScrollEffect = () => {const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatMessages = useAtomComponentFamilyStateValue(- agentChatMessagesComponentFamilyState,+ const agentChatMessages = useAtomFamilyStateValue(+ agentChatMessagesFamilyState,{ threadId: currentAiChatThread },);diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatStreamingPartsDiffSyncEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatStreamingPartsDiffSyncEffect.tsxindex d829616d72c..ac979dd9eb1 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatStreamingPartsDiffSyncEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatStreamingPartsDiffSyncEffect.tsx@@ -1,15 +1,15 @@import { useUpdateStreamingPartsWithDiff } from '@/ai/hooks/useUpdateStreamingPartsWithDiff';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useEffect } from 'react';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';export const AgentChatStreamingPartsDiffSyncEffect = () => {const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatMessages = useAtomComponentFamilyStateValue(- agentChatMessagesComponentFamilyState,+ const agentChatMessages = useAtomFamilyStateValue(+ agentChatMessagesFamilyState,{ threadId: currentAiChatThread },);diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsxindex 3e0da753990..bf7ad87d569 100644--- a/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx+++ b/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx@@ -7,7 +7,7 @@ import { useRefreshAgentChatThreads } from '@/ai/hooks/useRefreshAgentChatThreadimport { AGENT_CHAT_NEW_THREAD_DRAFT_KEY } from '@/ai/states/agentChatDraftsByThreadIdState';import { agentChatThreadListState } from '@/ai/states/agentChatThreadListState';import { agentChatThreadsLoadingState } from '@/ai/states/agentChatThreadsLoadingState';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { agentChatThreadRecordFamilySelector } from '@/ai/states/selectors/agentChatThreadRecordFamilySelector';import { agentChatVisibleThreadsSelector } from '@/ai/states/selectors/agentChatVisibleThreadsSelector';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';@@ -19,7 +19,6 @@ import { useIsWorkspaceActivationStatusEqualsTo } from '@/workspace/hooks/useIsWimport { WorkspaceActivationStatus } from 'twenty-shared/workspace';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';@@ -48,9 +47,6 @@ export const AgentChatThreadInitializationEffect = () => {const setAgentChatThreadsLoading = useSetAtomState(agentChatThreadsLoadingState,);- const agentChatUsageFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatUsageComponentFamilyState,- );const store = useStore();const agentChatVisibleThreads = useAtomStateValue(agentChatVisibleThreadsSelector,@@ -126,7 +122,7 @@ export const AgentChatThreadInitializationEffect = () => {if (isDefined(selectedThread)) {store.set(- agentChatUsageFamilyCallback({ threadId: selectedThread.id }),+ agentChatUsageFamilyState.atomFamily({ threadId: selectedThread.id }),getAgentChatUsageFromThread(selectedThread),);}@@ -145,7 +141,7 @@ export const AgentChatThreadInitializationEffect = () => {setCurrentAiChatThread(firstThread.id);store.set(- agentChatUsageFamilyCallback({ threadId: firstThread.id }),+ agentChatUsageFamilyState.atomFamily({ threadId: firstThread.id }),getAgentChatUsageFromThread(firstThread),);} else {@@ -161,7 +157,6 @@ export const AgentChatThreadInitializationEffect = () => {areAgentChatThreadsLoaded,setCurrentAiChatThread,store,- agentChatUsageFamilyCallback,]);return null;diff --git a/packages/twenty-front/src/modules/ai/components/AiChatEditorSection.tsx b/packages/twenty-front/src/modules/ai/components/AiChatEditorSection.tsxindex 271327e6ac3..3a4838b00c6 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatEditorSection.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatEditorSection.tsx@@ -28,10 +28,9 @@ import { useInsertDictatedText } from '@/ai/dictation/hooks/useInsertDictatedTeximport { useIsAiChatComposerCentered } from '@/ai/hooks/useIsAiChatComposerCentered';import { useHasReachedAiChatCreditsCap } from '@/ai/hooks/useHasReachedAiChatCreditsCap';import { useHasReachedAiChatUsageLimit } from '@/ai/hooks/useHasReachedAiChatUsageLimit';-import { agentChatHasMessageComponentSelector } from '@/ai/states/selectors/agentChatHasMessageComponentSelector';+import { agentChatHasMessageSelector } from '@/ai/states/selectors/agentChatHasMessageSelector';import { aiModelsState } from '@/client-config/states/aiModelsState';import { useIsMobile } from 'twenty-ui/utilities';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';const StyledInputArea = styled(StyledAiChatContentContainer)<{@@ -171,9 +170,7 @@ const EditableAiChatEditorSection = () => {/></StyledInputBox>);- const hasMessages = useAtomComponentSelectorValue(- agentChatHasMessageComponentSelector,- );+ const agentChatHasMessage = useAtomStateValue(agentChatHasMessageSelector);return (<>@@ -186,7 +183,7 @@ const EditableAiChatEditorSection = () => {onInterimText={setDictationInterimText}onFinalText={insertDictatedText}/>- {!hasMessages && (+ {!agentChatHasMessage && (<StyledMessageListPlaceholder><AiChatEmptyState isCentered={isComposerCentered} /><AiChatStandaloneError />diff --git a/packages/twenty-front/src/modules/ai/components/AiChatErrorUnderMessageList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatErrorUnderMessageList.tsxindex 4b59e644826..b5c71289573 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatErrorUnderMessageList.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatErrorUnderMessageList.tsx@@ -1,16 +1,15 @@import { AiChatErrorRenderer } from '@/ai/components/AiChatErrorRenderer';import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { agentChatMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatMessageComponentFamilySelector';-import { agentChatMessageIdsComponentSelector } from '@/ai/states/selectors/agentChatMessageIdsComponentSelector';-import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';+import { agentChatMessageFamilySelector } from '@/ai/states/selectors/agentChatMessageFamilySelector';+import { agentChatMessageIdsSelector } from '@/ai/states/selectors/agentChatMessageIdsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';import { themeCssVariables } from 'twenty-ui/theme';+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';const StyledErrorWrapper = styled.div`padding-top: ${themeCssVariables.spacing[3]};@@ -20,22 +19,19 @@ export const AiChatErrorUnderMessageList = () => {const agentChatDisplayedThread = useAtomStateValue(agentChatDisplayedThreadState,);- const agentChatError = useAtomComponentFamilyStateValue(- agentChatErrorComponentFamilyState,- { threadId: agentChatDisplayedThread },- );- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,+ const agentChatError = useAtomFamilyStateValue(agentChatErrorFamilyState, {+ threadId: agentChatDisplayedThread,+ });+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: agentChatDisplayedThread },);- const agentChatMessageIds = useAtomComponentSelectorValue(- agentChatMessageIdsComponentSelector,- );+ const agentChatMessageIds = useAtomStateValue(agentChatMessageIdsSelector);const lastMessageId = agentChatMessageIds.at(-1);- const agentChatMessage = useAtomComponentFamilySelectorValue(- agentChatMessageComponentFamilySelector,+ const agentChatMessage = useAtomFamilySelectorValue(+ agentChatMessageFamilySelector,{ messageId: lastMessageId },);diff --git a/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx b/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsxindex bd89b886f1c..d7e113a0545 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatLastMessageWithStreamingState.tsx@@ -1,37 +1,35 @@import { AiChatMessage } from '@/ai/components/AiChatMessage';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { agentChatLastMessageIdComponentSelector } from '@/ai/states/selectors/agentChatLastMessageIdComponentSelector';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';+import { agentChatLastMessageIdSelector } from '@/ai/states/selectors/agentChatLastMessageIdSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';export const AiChatLastMessageWithStreamingState = () => {- const lastMessageId = useAtomComponentSelectorValue(- agentChatLastMessageIdComponentSelector,+ const agentChatLastMessageId = useAtomStateValue(+ agentChatLastMessageIdSelector,);const agentChatDisplayedThread = useAtomStateValue(agentChatDisplayedThreadState,);- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,- { threadId: agentChatDisplayedThread },- );- const agentChatError = useAtomComponentFamilyStateValue(- agentChatErrorComponentFamilyState,+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: agentChatDisplayedThread },);+ const agentChatError = useAtomFamilyStateValue(agentChatErrorFamilyState, {+ threadId: agentChatDisplayedThread,+ });- if (!isDefined(lastMessageId)) {+ if (!isDefined(agentChatLastMessageId)) {return null;}return (<AiChatMessage- messageId={lastMessageId}+ messageId={agentChatLastMessageId}isLastMessageStreaming={agentChatIsStreaming}error={agentChatError ?? undefined}/>diff --git a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsxindex 13da3379723..68419f3ecae 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx@@ -10,14 +10,12 @@ import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';import { AiChatAssistantMessageRenderer } from '@/ai/components/AiChatAssistantMessageRenderer';import { AiChatErrorRenderer } from '@/ai/components/AiChatErrorRenderer';-import { agentChatFirstUnreadMessageIdComponentSelector } from '@/ai/states/selectors/agentChatFirstUnreadMessageIdComponentSelector';-import { agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector';-import { agentChatMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatMessageComponentFamilySelector';+import { agentChatFirstUnreadMessageIdSelector } from '@/ai/states/selectors/agentChatFirstUnreadMessageIdSelector';+import { agentChatIsMessageBeforeFirstUserMessageFamilySelector } from '@/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageFamilySelector';+import { agentChatMessageFamilySelector } from '@/ai/states/selectors/agentChatMessageFamilySelector';import { getAgentChatSenderLabel } from '@/ai/utils/getAgentChatSenderLabel';import { type AiChatError } from '@/ai/types/AiChatError';import { LightCopyIconButton } from '@/ui/input/components/LightCopyIconButton';-import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isExtendedFileUIPart } from 'twenty-shared/ai';@@ -26,6 +24,7 @@ import { themeCssVariables } from 'twenty-ui/theme';import { LabeledDivider } from '@/ui/layout/line/components/LabeledDivider';import { dateLocaleState } from '@/localization/states/dateLocaleState';import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { FeatureFlagKey } from '~/generated-metadata/graphql';@@ -188,19 +187,19 @@ export const AiChatMessage = ({const currentWorkspaceMembers = useAtomStateValue(currentWorkspaceMembersState,);- const agentChatMessage = useAtomComponentFamilySelectorValue(- agentChatMessageComponentFamilySelector,+ const agentChatMessage = useAtomFamilySelectorValue(+ agentChatMessageFamilySelector,{ messageId },);- const isMessageBeforeFirstUserMessage = useAtomComponentFamilySelectorValue(- agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector,+ const isMessageBeforeFirstUserMessage = useAtomFamilySelectorValue(+ agentChatIsMessageBeforeFirstUserMessageFamilySelector,{ messageId },);const { localeCatalog } = useAtomStateValue(dateLocaleState);- const firstUnreadMessageId = useAtomComponentSelectorValue(- agentChatFirstUnreadMessageIdComponentSelector,+ const agentChatFirstUnreadMessageId = useAtomStateValue(+ agentChatFirstUnreadMessageIdSelector,);const isAiChatInboxEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED,@@ -235,7 +234,7 @@ export const AiChatMessage = ({return (<>- {isAiChatInboxEnabled && firstUnreadMessageId === messageId && (+ {isAiChatInboxEnabled && agentChatFirstUnreadMessageId === messageId && (<LabeledDividertextPosition="end"color={themeCssVariables.tag.text.red}diff --git a/packages/twenty-front/src/modules/ai/components/AiChatNonLastMessageIdsList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatNonLastMessageIdsList.tsxindex 0bd93b5b429..5420bffc528 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatNonLastMessageIdsList.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatNonLastMessageIdsList.tsx@@ -1,10 +1,10 @@import { AiChatMessage } from '@/ai/components/AiChatMessage';-import { agentChatNonLastMessageIdsComponentSelector } from '@/ai/states/selectors/agentChatNonLastMessageIdsComponentSelector';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';+import { agentChatNonLastMessageIdsSelector } from '@/ai/states/selectors/agentChatNonLastMessageIdsSelector';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';export const AiChatNonLastMessageIdsList = () => {- const agentChatNonLastMessageIds = useAtomComponentSelectorValue(- agentChatNonLastMessageIdsComponentSelector,+ const agentChatNonLastMessageIds = useAtomStateValue(+ agentChatNonLastMessageIdsSelector,);return agentChatNonLastMessageIds.map((messageId) => (diff --git a/packages/twenty-front/src/modules/ai/components/AiChatPendingResponseIndicator.tsx b/packages/twenty-front/src/modules/ai/components/AiChatPendingResponseIndicator.tsxindex 645872423e0..80042de3688 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatPendingResponseIndicator.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatPendingResponseIndicator.tsx@@ -3,11 +3,11 @@ import { isDefined } from 'twenty-shared/utils';import { AiChatInitialLoadingIndicator } from '@/ai/components/AiChatInitialLoadingIndicator';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';const StyledPendingResponseWrapper = styled.div`align-items: flex-start;@@ -19,18 +19,17 @@ export const AiChatPendingResponseIndicator = () => {const agentChatDisplayedThread = useAtomStateValue(agentChatDisplayedThreadState,);- const agentChatIsAwaitingFirstChunk = useAtomComponentFamilyStateValue(- agentChatIsAwaitingFirstChunkComponentFamilyState,+ const agentChatIsAwaitingFirstChunk = useAtomFamilyStateValue(+ agentChatIsAwaitingFirstChunkFamilyState,{ threadId: agentChatDisplayedThread },);- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,- { threadId: agentChatDisplayedThread },- );- const agentChatError = useAtomComponentFamilyStateValue(- agentChatErrorComponentFamilyState,+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: agentChatDisplayedThread },);+ const agentChatError = useAtomFamilyStateValue(agentChatErrorFamilyState, {+ threadId: agentChatDisplayedThread,+ });const shouldRender =agentChatIsAwaitingFirstChunk &&diff --git a/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx b/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsxindex 7f6f079a80f..fc42d785c52 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatQueuedMessages.tsx@@ -4,14 +4,14 @@ import { styled } from '@linaria/react';import { plural, t } from '@lingui/core/macro';import { useDeleteQueuedMessage } from '@/ai/hooks/useDeleteQueuedMessage';-import { agentChatQueuedMessagesComponentFamilyState } from '@/ai/states/agentChatQueuedMessagesComponentFamilyState';+import { agentChatQueuedMessagesFamilyState } from '@/ai/states/agentChatQueuedMessagesFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';import { LightIconButton } from 'twenty-ui/components/input';import { IconX } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';const StyledQueueContainer = styled(StyledAiChatContentContainer)`display: flex;@@ -47,8 +47,8 @@ const StyledQueuedText = styled.span`export const AiChatQueuedMessages = () => {const isReadOnly = useIsCurrentAiChatThreadReadOnly();const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatQueuedMessages = useAtomComponentFamilyStateValue(- agentChatQueuedMessagesComponentFamilyState,+ const agentChatQueuedMessages = useAtomFamilyStateValue(+ agentChatQueuedMessagesFamilyState,{ threadId: currentAiChatThread },);const { deleteQueuedMessage } = useDeleteQueuedMessage();diff --git a/packages/twenty-front/src/modules/ai/components/AiChatStandaloneError.tsx b/packages/twenty-front/src/modules/ai/components/AiChatStandaloneError.tsxindex c6509317d24..7e200f6bfbe 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatStandaloneError.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatStandaloneError.tsx@@ -3,14 +3,13 @@ import { styled } from '@linaria/react';import { themeCssVariables } from 'twenty-ui/theme';import { AiChatErrorRenderer } from '@/ai/components/AiChatErrorRenderer';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatHasMessageComponentSelector } from '@/ai/states/selectors/agentChatHasMessageComponentSelector';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatHasMessageSelector } from '@/ai/states/selectors/agentChatHasMessageSelector';import { agentChatIsLoadingSelector } from '@/ai/states/selectors/agentChatIsLoadingSelector';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';const StyledErrorContainer = styled(StyledAiChatContentContainer)`display: flex;@@ -25,17 +24,14 @@ export const AiChatStandaloneError = () => {const agentChatDisplayedThread = useAtomStateValue(agentChatDisplayedThreadState,);- const agentChatError = useAtomComponentFamilyStateValue(- agentChatErrorComponentFamilyState,- { threadId: agentChatDisplayedThread },- );+ const agentChatError = useAtomFamilyStateValue(agentChatErrorFamilyState, {+ threadId: agentChatDisplayedThread,+ });- const hasMessages = useAtomComponentSelectorValue(- agentChatHasMessageComponentSelector,- );+ const agentChatHasMessage = useAtomStateValue(agentChatHasMessageSelector);const shouldRender =- !hasMessages && isDefined(agentChatError) && !agentChatIsLoading;+ !agentChatHasMessage && isDefined(agentChatError) && !agentChatIsLoading;if (!shouldRender) {return null;diff --git a/packages/twenty-front/src/modules/ai/components/AiChatTabMessageList.tsx b/packages/twenty-front/src/modules/ai/components/AiChatTabMessageList.tsxindex 2fcdbfbd6a0..f93c972309e 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatTabMessageList.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatTabMessageList.tsx@@ -9,17 +9,17 @@ import { AiChatScrollToBottomButton } from '@/ai/components/AiChatScrollToBottomimport { AiChatThreadInboxStateNotice } from '@/ai/components/AiChatThreadInboxStateNotice';import { AgentChatScrollToBottomOnDisplayedThreadChangeLayoutEffect } from '@/ai/components/AgentChatScrollToBottomOnDisplayedThreadChangeLayoutEffect';import { AgentChatStreamingAutoScrollEffect } from '@/ai/components/AgentChatStreamingAutoScrollEffect';-import { agentChatHasMessageComponentSelector } from '@/ai/states/selectors/agentChatHasMessageComponentSelector';+import { agentChatHasMessageSelector } from '@/ai/states/selectors/agentChatHasMessageSelector';import { AiChatSurfaceContext } from '@/ai/contexts/AiChatSurfaceContext';import { useIsWorkspaceSetupChat } from '@/ai/hooks/useIsWorkspaceSetupChat';import { getAiChatScrollWrapperInstanceId } from '@/ai/utils/getAiChatScrollWrapperInstanceId';import { WorkspaceSetupChatPreamble } from '@/onboarding/components/WorkspaceSetupChatPreamble';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/states/contexts/ScrollWrapperComponentInstanceContext';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { styled } from '@linaria/react';import { Suspense, useContext } from 'react';import { themeCssVariables } from 'twenty-ui/theme';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';const StyledScrollWrapperContainer = styled.div`display: flex;@@ -49,9 +49,7 @@ const StyledMessageListContent = styled(StyledAiChatContentContainer)`export const AiChatTabMessageList = () => {const isWorkspaceSetupChat = useIsWorkspaceSetupChat();const aiChatSurface = useContext(AiChatSurfaceContext);- const agentChatHasMessage = useAtomComponentSelectorValue(- agentChatHasMessageComponentSelector,- );+ const agentChatHasMessage = useAtomStateValue(agentChatHasMessageSelector);const scrollWrapperInstanceId = getAiChatScrollWrapperInstanceId(aiChatSurface ?? AI_CHAT_SURFACE.SIDE_PANEL,diff --git a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatFormCard.stories.tsx b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatFormCard.stories.tsxindex fbd1c52d272..2f7af4a69fc 100644--- a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatFormCard.stories.tsx+++ b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatFormCard.stories.tsx@@ -5,7 +5,6 @@ import { FieldMetadataType } from 'twenty-shared/types';import { ComponentDecorator } from 'twenty-ui/testing';import { AiChatFormCard } from '@/ai/components/AiChatFormCard';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';@@ -35,15 +34,11 @@ const meta: Meta<typeof AiChatFormCard> = {component: AiChatFormCard,decorators: [(Story) => (- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: 'agentChatFormCardStory' }}- >- <StoreSeeder>- <StyledContainer>- <Story />- </StyledContainer>- </StoreSeeder>- </AgentChatComponentInstanceContext.Provider>+ <StoreSeeder>+ <StyledContainer>+ <Story />+ </StyledContainer>+ </StoreSeeder>),ToastDecorator,ComponentDecorator,diff --git a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatMessage.stories.tsx b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatMessage.stories.tsxindex bf8f9d89c22..69c77165821 100644--- a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatMessage.stories.tsx+++ b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatMessage.stories.tsx@@ -11,9 +11,8 @@ import { ComponentDecorator } from 'twenty-ui/testing';import { AiChatMessage } from '@/ai/components/AiChatMessage';import { MarkdownLoadingSkeleton } from '@/ai/components/LazyMarkdownRenderer';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { styled } from '@linaria/react';@@ -29,8 +28,6 @@ const StyledConversationContainer = styled.div`padding: 24px;`;-const INSTANCE_ID = 'agentChatStoryInstance';-const mockUserMessage: ExtendedUIMessage = {id: 'msg-user-1',role: 'user',@@ -294,10 +291,7 @@ const AgentChatMessagesSetterEffect = ({store.set(agentChatDisplayedThreadState.atom, currentThreadId);store.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: currentThreadId },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: currentThreadId }),messages,);}, [messages, store]);@@ -305,15 +299,13 @@ const AgentChatMessagesSetterEffect = ({return null;};-const AgentChatInstanceDecorator: Decorator = (Story) => (- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >+const AgentChatMessagesDecorator: Decorator = (Story) => (+ <><AgentChatMessagesSetterEffect messages={allMockMessages} /><Suspense fallback={<MarkdownLoadingSkeleton />}><Story /></Suspense>- </AgentChatComponentInstanceContext.Provider>+ </>);const meta: Meta<typeof AiChatMessage> = {@@ -323,7 +315,7 @@ const meta: Meta<typeof AiChatMessage> = {ComponentDecorator,RootDecorator,ToastDecorator,- AgentChatInstanceDecorator,+ AgentChatMessagesDecorator,],parameters: {container: { width: 700 },diff --git a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatQuestionCard.stories.tsx b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatQuestionCard.stories.tsxindex 1713bae104e..3e12955d538 100644--- a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatQuestionCard.stories.tsx+++ b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatQuestionCard.stories.tsx@@ -5,7 +5,6 @@ import { expect, userEvent, within } from 'storybook/test';import { ComponentDecorator } from 'twenty-ui/testing';import { AiChatQuestionCard } from '@/ai/components/AiChatQuestionCard';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { type AgentChatPendingQuestion } from '@/ai/types/AgentChatPendingQuestion';@@ -20,8 +19,6 @@ const StyledContainer = styled.div`padding: 24px;`;-const INSTANCE_ID = 'agentChatQuestionCardStory';-const EMAIL_TYPE_QUESTION = {header: 'Email type',question: 'What type of emails would you like to send?',@@ -105,15 +102,11 @@ const meta: Meta<typeof AiChatQuestionCard> = {component: AiChatQuestionCard,decorators: [(Story) => (- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- <StoreSeeder>- <StyledContainer>- <Story />- </StyledContainer>- </StoreSeeder>- </AgentChatComponentInstanceContext.Provider>+ <StoreSeeder>+ <StyledContainer>+ <Story />+ </StyledContainer>+ </StoreSeeder>),ToastDecorator,ComponentDecorator,diff --git a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatTab.stories.tsx b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatTab.stories.tsxindex fbd52079c49..2ffaaed80bf 100644--- a/packages/twenty-front/src/modules/ai/components/__stories__/AiChatTab.stories.tsx+++ b/packages/twenty-front/src/modules/ai/components/__stories__/AiChatTab.stories.tsx@@ -5,9 +5,7 @@ import { expect, waitFor, within } from 'storybook/test';import { ComponentDecorator } from 'twenty-ui/testing';import { AiChatTab } from '@/ai/components/AiChatTab';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';import { AI_CHAT_SURFACE } from '@/ai/constants/AiChatSurface';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { AiChatSurfaceContext } from '@/ai/contexts/AiChatSurfaceContext';import { hasRequestedWorkspaceSetupChatState } from '@/onboarding/states/hasRequestedWorkspaceSetupChatState';import { shouldOpenAiChatAfterOnboardingState } from '@/onboarding/states/shouldOpenAiChatAfterOnboardingState';@@ -32,15 +30,11 @@ const WorkspaceSetupChatStory = () => {}, [store]);return isReady ? (- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: AGENT_CHAT_INSTANCE_ID }}- >- <AiChatSurfaceContext.Provider value={AI_CHAT_SURFACE.SIDE_PANEL}>- <Suspense fallback={null}>- <AiChatTab />- </Suspense>- </AiChatSurfaceContext.Provider>- </AgentChatComponentInstanceContext.Provider>+ <AiChatSurfaceContext.Provider value={AI_CHAT_SURFACE.SIDE_PANEL}>+ <Suspense fallback={null}>+ <AiChatTab />+ </Suspense>+ </AiChatSurfaceContext.Provider>) : null;};diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEditorSection.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEditorSection.test.tsxindex 7f041c80156..ba193d84fe3 100644--- a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEditorSection.test.tsx+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEditorSection.test.tsx@@ -8,7 +8,6 @@ import { Editor } from '@tiptap/react';import { type ReactNode } from 'react';import { AiChatEditorSection } from '@/ai/components/AiChatEditorSection';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';import { AGENT_CHAT_NEW_THREAD_DRAFT_KEY } from '@/ai/states/agentChatDraftsByThreadIdState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';@@ -50,11 +49,7 @@ const renderEditorSectionOnNewChat = () => {return render(<MetadataAndApolloWrapper><I18nProvider i18n={i18n}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: 'agentChatComponentInstance' }}- >- <AiChatEditorSection />- </AgentChatComponentInstanceContext.Provider>+ <AiChatEditorSection /></I18nProvider></MetadataAndApolloWrapper>,);diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEmptyState.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEmptyState.test.tsxindex ec2445a87d2..0197413d470 100644--- a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEmptyState.test.tsx+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatEmptyState.test.tsx@@ -4,10 +4,9 @@ import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';import { AiChatEmptyState } from '@/ai/components/AiChatEmptyState';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import {jotaiStore,@@ -18,17 +17,10 @@ jest.mock('@/ai/components/suggested-prompts/AiChatSuggestedPrompts', () => ({AiChatSuggestedPrompts: () => <div data-testid="suggested-prompts" />,}));-const INSTANCE_ID = 'aiChatEmptyStateTest';const THREAD_ID = AGENT_CHAT_NEW_THREAD_DRAFT_KEY;const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);describe('AiChatEmptyState', () => {@@ -49,9 +41,8 @@ describe('AiChatEmptyState', () => {it('should render nothing when the current thread is awaiting its first chunk', () => {jotaiStore.set(- agentChatIsAwaitingFirstChunkComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({+ threadId: THREAD_ID,}),true,);@@ -65,10 +56,7 @@ describe('AiChatEmptyState', () => {it('should render nothing when the current thread is streaming', () => {jotaiStore.set(- agentChatIsStreamingComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatIsStreamingFamilyState.atomFamily({ threadId: THREAD_ID }),true,);diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageList.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageList.test.tsxindex f449c7d1ac2..e2c3d34ef37 100644--- a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageList.test.tsx+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageList.test.tsx@@ -5,7 +5,7 @@ import { AI_CHAT_SURFACE } from '@/ai/constants/AiChatSurface';import { AiChatSurfaceContext } from '@/ai/contexts/AiChatSurfaceContext';import { type AiChatSurface } from '@/ai/types/AiChatSurface';-const mockUseAtomComponentSelectorValue = jest.fn();+const mockUseAtomStateValue = jest.fn();const mockUseIsWorkspaceSetupChat = jest.fn(() => false);jest.mock('@/ai/hooks/useIsWorkspaceSetupChat', () => ({@@ -16,15 +16,8 @@ jest.mock('@/onboarding/components/WorkspaceSetupChatPreamble', () => ({WorkspaceSetupChatPreamble: () => <div data-testid="preamble" />,}));-jest.mock(- '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue',- () => ({- useAtomComponentSelectorValue: () => mockUseAtomComponentSelectorValue(),- }),-);-jest.mock('@/ui/utilities/state/jotai/hooks/useAtomStateValue', () => ({- useAtomStateValue: () => false,+ useAtomStateValue: () => mockUseAtomStateValue(),}));jest.mock('@/ui/utilities/scroll/components/ScrollWrapper', () => ({@@ -79,7 +72,7 @@ describe('AiChatTabMessageList', () => {});it('should render nothing with no messages and no preamble', () => {- mockUseAtomComponentSelectorValue.mockReturnValue(false);+ mockUseAtomStateValue.mockReturnValue(false);const { container } = render(<AiChatTabMessageList />);@@ -87,7 +80,7 @@ describe('AiChatTabMessageList', () => {});it('should render the preamble outside the scroll container with no messages', () => {- mockUseAtomComponentSelectorValue.mockReturnValue(false);+ mockUseAtomStateValue.mockReturnValue(false);mockUseIsWorkspaceSetupChat.mockReturnValue(true);@@ -98,7 +91,7 @@ describe('AiChatTabMessageList', () => {});it('should render the preamble inside the message list once messages exist', () => {- mockUseAtomComponentSelectorValue.mockReturnValue(true);+ mockUseAtomStateValue.mockReturnValue(true);mockUseIsWorkspaceSetupChat.mockReturnValue(true);@@ -110,7 +103,7 @@ describe('AiChatTabMessageList', () => {});it('should give each surface its own scroll wrapper instance id', () => {- mockUseAtomComponentSelectorValue.mockReturnValue(true);+ mockUseAtomStateValue.mockReturnValue(true);const renderForSurface = (surface: AiChatSurface) =>render(diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageListPreamble.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageListPreamble.test.tsxindex df1479d6856..d472b260f1e 100644--- a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageListPreamble.test.tsx+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatTabMessageListPreamble.test.tsx@@ -3,12 +3,11 @@ import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';import type * as React from 'react';import { AiChatNonLastMessageIdsList } from '@/ai/components/AiChatNonLastMessageIdsList';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { AiChatTabMessageList } from '@/ai/components/AiChatTabMessageList';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';import {jotaiStore,resetJotaiStore,@@ -71,17 +70,12 @@ jest.mock('@/ai/components/LazyMarkdownRenderer', () => ({MarkdownLoadingSkeleton: () => <div role="status">Loading conversation</div>,}));-const INSTANCE_ID = 'aiChatTabMessageListPreambleTest';const THREAD_ID = 'thread-1';const renderPreambleBranch = () =>render(<JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- <AiChatTabMessageList />- </AgentChatComponentInstanceContext.Provider>+ <AiChatTabMessageList /></JotaiProvider>,);@@ -94,9 +88,8 @@ describe('AiChatTabMessageList preamble branch', () => {it('should render the preamble with the pending response loader when the displayed thread is awaiting its first chunk', () => {jotaiStore.set(- agentChatIsAwaitingFirstChunkComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({+ threadId: THREAD_ID,}),true,);@@ -122,10 +115,7 @@ describe('AiChatTabMessageList loading', () => {resetJotaiStore();jotaiStore.set(agentChatDisplayedThreadState.atom, THREAD_ID);jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: THREAD_ID }),[{ id: 'message-1', role: 'user', parts: [] }],);});diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsxindex 13e7210a9dc..e76b468aea6 100644--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx@@ -19,15 +19,15 @@ import { useAiChatUsage } from '@/ai/hooks/useAiChatUsage';import { useAiModelTiers } from '@/ai/hooks/useAiModelTiers';import { useWorkspaceAiModelTiers } from '@/ai/hooks/useWorkspaceAiModelTiers';import { useIsWorkspaceSetupChat } from '@/ai/hooks/useIsWorkspaceSetupChat';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { agentChatUserSelectedModelTierState } from '@/ai/states/agentChatUserSelectedModelTierState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { getUsageLimitRingColor } from '@/settings/billing/utils/getUsageLimitRingColor';import { computeUsageLimitProgress } from '@/settings/billing/utils/computeUsageLimitProgress';import { StyledInformationCard } from '@/ui/layout/information-card/components/StyledInformationCard';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { formatNumber } from '@/localization/utils/formatNumber';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';const StyledTrigger = styled.button`align-items: center;@@ -78,10 +78,9 @@ export const AiChatContextUsageButton = () => {const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatUsage = useAtomComponentFamilyStateValue(- agentChatUsageComponentFamilyState,- { threadId: currentAiChatThread },- );+ const agentChatUsage = useAtomFamilyStateValue(agentChatUsageFamilyState, {+ threadId: currentAiChatThread,+ });const tiers = useAiModelTiers();diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsxindex 0f00ec86b9c..ae1bbec3a76 100644--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx@@ -12,11 +12,11 @@ import {} from 'twenty-ui/icon';import { themeCssVariables, useTheme } from 'twenty-ui/theme';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { formatNumber } from '@/localization/utils/formatNumber';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';const StyledSection = styled.div`display: flex;@@ -37,10 +37,9 @@ export const AiChatContextUsageDetails = () => {const { t } = useLingui();const theme = useTheme();const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatUsage = useAtomComponentFamilyStateValue(- agentChatUsageComponentFamilyState,- { threadId: currentAiChatThread },- );+ const agentChatUsage = useAtomFamilyStateValue(agentChatUsageFamilyState, {+ threadId: currentAiChatThread,+ });if (!isDefined(agentChatUsage)) {return null;}diff --git a/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsxindex 19a3fd62d13..98872eaab42 100644--- a/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx+++ b/packages/twenty-front/src/modules/ai/components/internal/SendMessageButton.tsx@@ -1,15 +1,15 @@import { AGENT_CHAT_STOP_EVENT_NAME } from '@/ai/constants/AgentChatStopEventName';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';import { agentChatIsLoadingSelector } from '@/ai/states/selectors/agentChatIsLoadingSelector';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { agentChatInputIsEmptySelector } from '@/ai/states/selectors/agentChatInputIsEmptySelector';import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { t } from '@lingui/core/macro';import { IconButton } from 'twenty-ui/components/input';import { IconArrowUp, IconPlayerStop } from 'twenty-ui/icon';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';type SendMessageButtonProps = {onSend: () => void;@@ -27,12 +27,12 @@ export const SendMessageButton = ({const agentChatIsLoading = useAtomStateValue(agentChatIsLoadingSelector);const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: currentAiChatThread },);- const agentChatIsAwaitingFirstChunk = useAtomComponentFamilyStateValue(- agentChatIsAwaitingFirstChunkComponentFamilyState,+ const agentChatIsAwaitingFirstChunk = useAtomFamilyStateValue(+ agentChatIsAwaitingFirstChunkFamilyState,{ threadId: currentAiChatThread },);diff --git a/packages/twenty-front/src/modules/ai/components/internal/__stories__/AiChatContextUsageButton.stories.tsx b/packages/twenty-front/src/modules/ai/components/internal/__stories__/AiChatContextUsageButton.stories.tsxindex fb8f123cb8c..4a5f88240a5 100644--- a/packages/twenty-front/src/modules/ai/components/internal/__stories__/AiChatContextUsageButton.stories.tsx+++ b/packages/twenty-front/src/modules/ai/components/internal/__stories__/AiChatContextUsageButton.stories.tsx@@ -6,11 +6,10 @@ import { expect, userEvent, waitFor, within } from 'storybook/test';import { ComponentDecorator } from 'twenty-ui/testing';import { AiChatContextUsageButton } from '@/ai/components/internal/AiChatContextUsageButton';import { AiChatContextUsageDetails } from '@/ai/components/internal/AiChatContextUsageDetails';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import {- agentChatUsageComponentFamilyState,+ agentChatUsageFamilyState,type AgentChatUsageState,-} from '@/ai/states/agentChatUsageComponentFamilyState';+} from '@/ai/states/agentChatUsageFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { GetAiChatUsageDocument } from '~/generated-metadata/graphql';@@ -50,48 +49,41 @@ const UsageStory = ({const storyStore = createStore();storyStore.set(currentAiChatThreadState.atom, 'story-thread');storyStore.set(- agentChatUsageComponentFamilyState.atomFamily({- instanceId: 'usage-story',- familyKey: { threadId: 'story-thread' },- }),+ agentChatUsageFamilyState.atomFamily({ threadId: 'story-thread' }),usage,);return storyStore;});return (<Provider store={store}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: 'usage-story' }}- >- <MockedProvider- mocks={[- {- request: { query: GetAiChatUsageDocument },- maxUsageCount: Infinity,- delay: loading ? Infinity : 0,- ...(error- ? { error: new Error('Usage unavailable') }- : {- result: {- data: {- aiChatUsage:- limit === null- ? null- : {- limitValue: limit,- consumedValue: consumed,- periodEnd: null,- kind: 'allowance',- },- },+ <MockedProvider+ mocks={[+ {+ request: { query: GetAiChatUsageDocument },+ maxUsageCount: Infinity,+ delay: loading ? Infinity : 0,+ ...(error+ ? { error: new Error('Usage unavailable') }+ : {+ result: {+ data: {+ aiChatUsage:+ limit === null+ ? null+ : {+ limitValue: limit,+ consumedValue: consumed,+ periodEnd: null,+ kind: 'allowance',+ },},- }),- },- ]}- >- {children ?? <AiChatContextUsageButton />}- </MockedProvider>- </AgentChatComponentInstanceContext.Provider>+ },+ }),+ },+ ]}+ >+ {children ?? <AiChatContextUsageButton />}+ </MockedProvider></Provider>);};diff --git a/packages/twenty-front/src/modules/ai/constants/AgentChatInstanceId.ts b/packages/twenty-front/src/modules/ai/constants/AgentChatInstanceId.tsdeleted file mode 100644index ca04db96e39..00000000000--- a/packages/twenty-front/src/modules/ai/constants/AgentChatInstanceId.ts+++ /dev/null@@ -1 +0,0 @@-export const AGENT_CHAT_INSTANCE_ID = 'agentChatComponentInstance';diff --git a/packages/twenty-front/src/modules/ai/contexts/AgentChatComponentInstanceContext.ts b/packages/twenty-front/src/modules/ai/contexts/AgentChatComponentInstanceContext.tsdeleted file mode 100644index 31753932fff..00000000000--- a/packages/twenty-front/src/modules/ai/contexts/AgentChatComponentInstanceContext.ts+++ /dev/null@@ -1,4 +0,0 @@-import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext';--export const AgentChatComponentInstanceContext =- createComponentInstanceContext();diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatPendingToolCalls.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatPendingToolCalls.test.tsxindex ff3b0756a0b..28062d882b5 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatPendingToolCalls.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatPendingToolCalls.test.tsx@@ -3,20 +3,16 @@ import { Provider } from 'jotai';import { type ReactNode } from 'react';import { type ExtendedUIMessage } from 'twenty-shared/ai';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { useAgentChatPendingToolCalls } from '@/ai/hooks/useAgentChatPendingToolCalls';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import {jotaiStore,resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';-const key = {- instanceId: 'pending-test',- familyKey: { threadId: 'thread-id' },-};+const key = { threadId: 'thread-id' };const QUESTIONS = [{ header: 'Plan', question: 'Which plan?', options: [] }];@@ -29,20 +25,14 @@ const questionsCall = (toolCallId: string, status: string) => ({});const wrapper = ({ children }: { children: ReactNode }) => (- <Provider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: 'pending-test' }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </Provider>+ <Provider store={jotaiStore}>{children}</Provider>);describe('useAgentChatPendingToolCalls', () => {beforeEach(() => {resetJotaiStore();jotaiStore.set(agentChatDisplayedThreadState.atom, 'thread-id');- jotaiStore.set(agentChatMessagesComponentFamilyState.atomFamily(key), [+ jotaiStore.set(agentChatMessagesFamilyState.atomFamily(key), [{id: 'assistant-1',role: 'assistant',@@ -67,10 +57,7 @@ describe('useAgentChatPendingToolCalls', () => {});it('waits on nothing while the turn is still streaming', () => {- jotaiStore.set(- agentChatIsStreamingComponentFamilyState.atomFamily(key),- true,- );+ jotaiStore.set(agentChatIsStreamingFamilyState.atomFamily(key), true);const { result } = renderHook(() => useAgentChatPendingToolCalls(), {wrapper,diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatSubscription.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatSubscription.test.tsxindex 52f26a938ce..d9888f9dfb9 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatSubscription.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useAgentChatSubscription.test.tsx@@ -3,12 +3,11 @@ import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { useAgentChatSubscription } from '@/ai/hooks/useAgentChatSubscription';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';-import { agentChatFetchedMessagesComponentFamilyState } from '@/ai/states/agentChatFetchedMessagesComponentFamilyState';-import { agentChatQueuedMessagesComponentFamilyState } from '@/ai/states/agentChatQueuedMessagesComponentFamilyState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';+import { agentChatFetchedMessagesFamilyState } from '@/ai/states/agentChatFetchedMessagesFamilyState';+import { agentChatQueuedMessagesFamilyState } from '@/ai/states/agentChatQueuedMessagesFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';import { sseClientState } from '@/sse-db-event/states/sseClientState';import {jotaiStore,@@ -27,20 +26,13 @@ const disconnect = jest.fn();jest.mock('@/ai/hooks/useRefreshAgentChatThreads', () => ({useRefreshAgentChatThreads: () => ({ refreshAgentChatThreads }),}));-const key = { instanceId: 'sharing-test', familyKey: { threadId: 'thread' } };-const messagesAtom = agentChatMessagesComponentFamilyState.atomFamily(key);-const fetchedAtom =- agentChatFetchedMessagesComponentFamilyState.atomFamily(key);-const queuedAtom = agentChatQueuedMessagesComponentFamilyState.atomFamily(key);-const errorAtom = agentChatErrorComponentFamilyState.atomFamily(key);+const key = { threadId: 'thread' };+const messagesAtom = agentChatMessagesFamilyState.atomFamily(key);+const fetchedAtom = agentChatFetchedMessagesFamilyState.atomFamily(key);+const queuedAtom = agentChatQueuedMessagesFamilyState.atomFamily(key);+const errorAtom = agentChatErrorFamilyState.atomFamily(key);const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: key.instanceId }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);const denial = [{ message: 'Thread not found', extensions: { code: 'NOT_FOUND' } },diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useAnswerAgentChatToolCall.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useAnswerAgentChatToolCall.test.tsxindex be6eaca2b10..27ba23f003c 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useAnswerAgentChatToolCall.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useAnswerAgentChatToolCall.test.tsx@@ -4,12 +4,11 @@ import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';import { type ExtendedUIMessage } from 'twenty-shared/ai';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';import { useAnswerAgentChatToolCall } from '@/ai/hooks/useAnswerAgentChatToolCall';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import {jotaiStore,resetJotaiStore,@@ -27,13 +26,10 @@ jest.mock('@/ai/hooks/useAgentChatModelId', () => ({useAgentChatModelId: () => ({ modelIdForRequest: 'model-id' }),}));-const key = {- instanceId: AGENT_CHAT_INSTANCE_ID,- familyKey: { threadId: 'thread-id' },-};-const messagesAtom = agentChatMessagesComponentFamilyState.atomFamily(key);+const key = { threadId: 'thread-id' };+const messagesAtom = agentChatMessagesFamilyState.atomFamily(key);const isAwaitingFirstChunkAtom =- agentChatIsAwaitingFirstChunkComponentFamilyState.atomFamily(key);+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily(key);const PENDING_OUTPUT = { result: { questions: [], status: 'pending' } };const ANSWERED_OUTPUT = { result: { questions: [], status: 'answered' } };diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useCanRetryCurrentAiChatTurn.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useCanRetryCurrentAiChatTurn.test.tsxindex eb10fcbcb83..42580e4f04d 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useCanRetryCurrentAiChatTurn.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useCanRetryCurrentAiChatTurn.test.tsx@@ -2,9 +2,8 @@ import { setAgentChatThreadPermissions } from '@/ai/testing/setAgentChatThreadPeimport { renderHook } from '@testing-library/react';import { Provider } from 'jotai';import { type ReactNode } from 'react';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { useCanRetryCurrentAiChatTurn } from '@/ai/hooks/useCanRetryCurrentAiChatTurn';@@ -15,13 +14,7 @@ import {} from '@/ui/utilities/state/jotai/jotaiStore';const wrapper = ({ children }: { children: ReactNode }) => (- <Provider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: 'sender-test' }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </Provider>+ <Provider store={jotaiStore}>{children}</Provider>);describe('Shared chat execution controls', () => {@@ -50,10 +43,7 @@ describe('Shared chat execution controls', () => {canSoftDelete: false,});jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: 'sender-test',- familyKey: { threadId: 'thread' },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: 'thread' }),[{id: 'message',diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useHasReachedAiChatCreditsCap.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useHasReachedAiChatCreditsCap.test.tsxindex 7fec6d5639f..df8f0f14d80 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useHasReachedAiChatCreditsCap.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useHasReachedAiChatCreditsCap.test.tsx@@ -3,10 +3,9 @@ import { renderHook } from '@testing-library/react';import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { useHasReachedAiChatCreditsCap } from '@/ai/hooks/useHasReachedAiChatCreditsCap';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';import { AiChatErrorCode } from '@/ai/utils/aiChatErrorCode';import { createAiChatCodedError } from '@/ai/utils/createAiChatCodedError';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';@@ -16,25 +15,15 @@ import {} from '@/ui/utilities/state/jotai/jotaiStore';import { mockCurrentWorkspace } from '~/testing/mock-data/users';-const INSTANCE_ID = 'useHasReachedAiChatCreditsCapTest';const THREAD_ID = 'thread-1';const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);const setThreadError = (error: Error | CombinedGraphQLErrors) => {jotaiStore.set(- agentChatErrorComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatErrorFamilyState.atomFamily({ threadId: THREAD_ID }),error,);};diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useIsAiChatComposerCentered.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useIsAiChatComposerCentered.test.tsxindex dd108fa1683..b56944d2270 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useIsAiChatComposerCentered.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useIsAiChatComposerCentered.test.tsx@@ -4,11 +4,10 @@ import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';import { AI_CHAT_SURFACE } from '@/ai/constants/AiChatSurface';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { AiChatSurfaceContext } from '@/ai/contexts/AiChatSurfaceContext';import { useIsAiChatComposerCentered } from '@/ai/hooks/useIsAiChatComposerCentered';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { agentChatMessagesLoadingState } from '@/ai/states/agentChatMessagesLoadingState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { threadIdCreatedFromDraftState } from '@/ai/states/threadIdCreatedFromDraftState';@@ -19,7 +18,6 @@ import {resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';-const INSTANCE_ID = 'aiChatComposerCenteredTest';const THREAD_ID = AGENT_CHAT_NEW_THREAD_DRAFT_KEY;const renderForSurface = ({@@ -29,13 +27,9 @@ const renderForSurface = ({} = {}) => {const Wrapper = ({ children }: { children: ReactNode }) => (<JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- <AiChatSurfaceContext.Provider value={surface}>- {children}- </AiChatSurfaceContext.Provider>- </AgentChatComponentInstanceContext.Provider>+ <AiChatSurfaceContext.Provider value={surface}>+ {children}+ </AiChatSurfaceContext.Provider></JotaiProvider>);@@ -84,10 +78,7 @@ describe('useIsAiChatComposerCentered', () => {act(() =>jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: 'draft-thread' },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: 'draft-thread' }),[{ id: 'message-1', role: 'user', parts: [] }],),);@@ -111,10 +102,7 @@ describe('useIsAiChatComposerCentered', () => {it('should not center the composer once the thread has messages', () => {jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: THREAD_ID }),[{ id: 'message-1', role: 'user', parts: [] }],);diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useProcessWorkspaceSetupCompletion.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useProcessWorkspaceSetupCompletion.test.tsxindex 1130f3664d8..878d7fd724f 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useProcessWorkspaceSetupCompletion.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useProcessWorkspaceSetupCompletion.test.tsx@@ -6,9 +6,8 @@ import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';import { type ExtendedUIMessage } from 'twenty-shared/ai';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { useProcessWorkspaceSetupCompletion } from '@/ai/hooks/useProcessWorkspaceSetupCompletion';-import { processedWorkspaceSetupCompletionIdsComponentState } from '@/ai/states/processedWorkspaceSetupCompletionIdsComponentState';+import { processedWorkspaceSetupCompletionIdsState } from '@/ai/states/processedWorkspaceSetupCompletionIdsState';import { shouldContinueAiChatInSidePanelState } from '@/ai/states/shouldContinueAiChatInSidePanelState';import {jotaiStore,@@ -40,17 +39,11 @@ jest.mock('@/ai/hooks/useIsWorkspaceSetupChat', () => ({useIsWorkspaceSetupChat: () => isWorkspaceSetupChat,}));-const INSTANCE_ID = 'processWorkspaceSetupCompletionTest';-const Wrapper = ({ children }: { children: ReactNode }) => (<JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- <AiChatSurfaceContext.Provider value={AI_CHAT_SURFACE.PAGE}>- {children}- </AiChatSurfaceContext.Provider>- </AgentChatComponentInstanceContext.Provider>+ <AiChatSurfaceContext.Provider value={AI_CHAT_SURFACE.PAGE}>+ {children}+ </AiChatSurfaceContext.Provider></JotaiProvider>);@@ -70,11 +63,7 @@ const buildCompletionMessage = (toolCallId: string) =>]);const getProcessedToolCallIds = () =>- jotaiStore.get(- processedWorkspaceSetupCompletionIdsComponentState.atomFamily({- instanceId: INSTANCE_ID,- }),- );+ jotaiStore.get(processedWorkspaceSetupCompletionIdsState.atom);describe('useProcessWorkspaceSetupCompletion', () => {beforeEach(() => {diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useRefreshAgentChatThreads.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useRefreshAgentChatThreads.test.tsxindex e3878e4e7f9..0bdbeb745d8 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useRefreshAgentChatThreads.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useRefreshAgentChatThreads.test.tsx@@ -6,9 +6,8 @@ import { useRefreshAgentChatThreads } from '@/ai/hooks/useRefreshAgentChatThreadimport { agentChatThreadListState } from '@/ai/states/agentChatThreadListState';import { agentChatThreadParticipantsState } from '@/ai/states/agentChatThreadParticipantsState';import { agentChatThreadStreamedParticipantsState } from '@/ai/states/agentChatThreadStreamedParticipantsState';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';import { agentChatThreadRecordUpdateCountState } from '@/ai/states/agentChatThreadRecordUpdateCountState';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { agentChatThreadsSelector } from '@/ai/states/selectors/agentChatThreadsSelector';import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';@@ -489,10 +488,7 @@ describe('useRefreshAgentChatThreads', () => {expect(store.get(- agentChatUsageComponentFamilyState.atomFamily({- instanceId: AGENT_CHAT_INSTANCE_ID,- familyKey: { threadId: 'old-thread' },- }),+ agentChatUsageFamilyState.atomFamily({ threadId: 'old-thread' }),),).toMatchObject({ inputTokens: 42 });});diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useSelectAiChatThread.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useSelectAiChatThread.test.tsxindex 2fd1ce0563d..f91b3dafeaf 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useSelectAiChatThread.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useSelectAiChatThread.test.tsx@@ -1,5 +1,4 @@-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { setAgentChatThreadList } from '@/ai/testing/setAgentChatThreadList';import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';import { act, renderHook } from '@testing-library/react';@@ -78,9 +77,8 @@ describe('useSelectAiChatThread', () => {totalOutputCredits: 50000,};setAgentChatThreadList(jotaiStore, [thread]);- const usageAtom = agentChatUsageComponentFamilyState.atomFamily({- instanceId: AGENT_CHAT_INSTANCE_ID,- familyKey: { threadId: thread.id },+ const usageAtom = agentChatUsageFamilyState.atomFamily({+ threadId: thread.id,});const { result } = renderHook(() => useSelectAiChatThread(), {wrapper: Wrapper,diff --git a/packages/twenty-front/src/modules/ai/hooks/__tests__/useUpdateStreamingPartsWithDiff.test.tsx b/packages/twenty-front/src/modules/ai/hooks/__tests__/useUpdateStreamingPartsWithDiff.test.tsxindex 6ce0aafa97b..6af65157c33 100644--- a/packages/twenty-front/src/modules/ai/hooks/__tests__/useUpdateStreamingPartsWithDiff.test.tsx+++ b/packages/twenty-front/src/modules/ai/hooks/__tests__/useUpdateStreamingPartsWithDiff.test.tsx@@ -4,7 +4,6 @@ import { type ReactNode } from 'react';import { Temporal } from 'temporal-polyfill';import { type ExtendedUIMessage } from 'twenty-shared/ai';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { sleep } from '~/utils/sleep';import { useUpdateStreamingPartsWithDiff } from '@/ai/hooks/useUpdateStreamingPartsWithDiff';@@ -45,13 +44,7 @@ const buildMessage = (const renderUpdateStreamingPartsWithDiff = () => {const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: 'streaming-navigation-test' }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);return renderHook(() => useUpdateStreamingPartsWithDiff(), {diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.tsindex fdd616d8dd1..fccfa2ccd3a 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts@@ -32,7 +32,9 @@ import { agentChatSelectedFilesState } from '@/ai/states/agentChatSelectedFilesSimport { agentChatSentMessageHandOffState } from '@/ai/states/agentChatSentMessageHandOffState';import { agentChatUploadedFilesState } from '@/ai/states/agentChatUploadedFilesState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';-import { getAgentChatThreadAtoms } from '@/ai/utils/getAgentChatThreadAtoms';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { getConversationTargetsFromSerializedDocument } from '@/ai/utils/getConversationTargetsFromSerializedDocument';import { getParticipantMentionsFromSerializedDocument } from '@/ai/utils/getParticipantMentionsFromSerializedDocument';import { isAiChatCreditsExhaustedError } from '@/ai/utils/isAiChatCreditsExhaustedError';@@ -157,8 +159,10 @@ export const useAgentChat = (status: 'sent',};- const { messagesAtom, errorAtom, isAwaitingFirstChunkAtom } =- getAgentChatThreadAtoms(threadId);+ const messagesAtom = agentChatMessagesFamilyState.atomFamily({ threadId });+ const errorAtom = agentChatErrorFamilyState.atomFamily({ threadId });+ const isAwaitingFirstChunkAtom =+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({ threadId });const removeOptimisticUserMessage = () => {store.set(messagesAtom, (messages) =>messages.filter((message) => message.id !== messageId),@@ -298,7 +302,7 @@ export const useAgentChat = (}store.set(- getAgentChatThreadAtoms(threadId).isAwaitingFirstChunkAtom,+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({ threadId }),false,);diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChatPendingToolCalls.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChatPendingToolCalls.tsindex d215d88dbc2..1d4b65f40bd 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChatPendingToolCalls.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChatPendingToolCalls.ts@@ -2,23 +2,22 @@ import { useMemo } from 'react';import { isDefined } from 'twenty-shared/utils';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';import { type AgentChatPendingToolCall } from '@/ai/types/AgentChatPendingToolCall';import { parsePendingToolCall } from '@/ai/utils/parsePendingToolCall';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';export const useAgentChatPendingToolCalls = (): AgentChatPendingToolCall[] => {const agentChatDisplayedThread = useAtomStateValue(agentChatDisplayedThreadState,);- const agentChatMessages = useAtomComponentSelectorValue(- agentChatDisplayedThreadMessagesComponentSelector,+ const agentChatDisplayedThreadMessages = useAtomStateValue(+ agentChatDisplayedThreadMessagesSelector,);- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: agentChatDisplayedThread },);@@ -26,11 +25,11 @@ export const useAgentChatPendingToolCalls = (): AgentChatPendingToolCall[] => {() =>agentChatIsStreaming? []- : agentChatMessages.flatMap((message) =>+ : agentChatDisplayedThreadMessages.flatMap((message) =>message.parts.map(parsePendingToolCall).filter((pendingToolCall) => isDefined(pendingToolCall)),),- [agentChatMessages, agentChatIsStreaming],+ [agentChatDisplayedThreadMessages, agentChatIsStreaming],);};diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.tsindex 4d36d12e0e9..509a94b7dfb 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChatSubscription.ts@@ -1,8 +1,8 @@import { useRefreshAgentChatThreadPermissions } from '@/ai/hooks/useRefreshAgentChatThreadPermissions';import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';-import { agentChatFetchedMessagesComponentFamilyState } from '@/ai/states/agentChatFetchedMessagesComponentFamilyState';-import { agentChatQueuedMessagesComponentFamilyState } from '@/ai/states/agentChatQueuedMessagesComponentFamilyState';+import { agentChatFetchedMessagesFamilyState } from '@/ai/states/agentChatFetchedMessagesFamilyState';+import { agentChatQueuedMessagesFamilyState } from '@/ai/states/agentChatQueuedMessagesFamilyState';import { useRefreshAgentChatThreads } from '@/ai/hooks/useRefreshAgentChatThreads';import { isChatAccessDenied } from '@/ai/utils/isChatAccessDenied';import { useEffect } from 'react';@@ -21,16 +21,16 @@ import { v4 } from 'uuid';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';import { useApplyAgentChatThreadUpdate } from '@/ai/hooks/useApplyAgentChatThreadUpdate';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatFirstLiveSeqComponentFamilyState } from '@/ai/states/agentChatFirstLiveSeqComponentFamilyState';-import { agentChatHandleEventCallbackComponentFamilyState } from '@/ai/states/agentChatHandleEventCallbackComponentFamilyState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatIsAwaitingPersistedRefetchComponentFamilyState } from '@/ai/states/agentChatIsAwaitingPersistedRefetchComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatFirstLiveSeqFamilyState } from '@/ai/states/agentChatFirstLiveSeqFamilyState';+import { agentChatHandleEventCallbackFamilyState } from '@/ai/states/agentChatHandleEventCallbackFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatIsAwaitingPersistedRefetchFamilyState } from '@/ai/states/agentChatIsAwaitingPersistedRefetchFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { agentChatStreamLastEventTimestampState } from '@/ai/states/agentChatStreamLastEventTimestampState';import { agentChatStreamResubscribeNonceState } from '@/ai/states/agentChatStreamResubscribeNonceState';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { agentChatThreadRecordFamilySelector } from '@/ai/states/selectors/agentChatThreadRecordFamilySelector';import { AiChatErrorCode } from '@/ai/utils/aiChatErrorCode';import { createAiChatCodedError } from '@/ai/utils/createAiChatCodedError';@@ -38,7 +38,6 @@ import { createStreamChunkSequencer } from '@/ai/utils/createStreamChunkSequenceimport { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';import { sseClientState } from '@/sse-db-event/states/sseClientState';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { markWorkspaceCreditsExhausted } from '@/workspace/utils/updateWorkspaceResourceCreditCap';import {@@ -127,41 +126,6 @@ export const useAgentChatSubscription = (threadId: string | null) => {agentChatStreamResubscribeNonceState,);- const errorFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatErrorComponentFamilyState,- );- const isStreamingFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatIsStreamingComponentFamilyState,- );- const isAwaitingFirstChunkFamilyCallback =- useAtomComponentFamilyStateCallbackState(- agentChatIsAwaitingFirstChunkComponentFamilyState,- );- const firstLiveSeqFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatFirstLiveSeqComponentFamilyState,- );- const isAwaitingPersistedRefetchFamilyCallback =- useAtomComponentFamilyStateCallbackState(- agentChatIsAwaitingPersistedRefetchComponentFamilyState,- );- const handleEventCallbackFamilyCallback =- useAtomComponentFamilyStateCallbackState(- agentChatHandleEventCallbackComponentFamilyState,- );- const fetchedMessagesFamilyCallback =- useAtomComponentFamilyStateCallbackState(- agentChatFetchedMessagesComponentFamilyState,- );- const queuedMessagesFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatQueuedMessagesComponentFamilyState,- );- const messagesFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatMessagesComponentFamilyState,- );- const usageFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatUsageComponentFamilyState,- );-useEffect(() => {if (!isDefined(threadId) || !isDefined(sseClient)) {return;@@ -169,19 +133,23 @@ export const useAgentChatSubscription = (threadId: string | null) => {const familyKey = { threadId };- const errorAtom = errorFamilyCallback(familyKey);- const isStreamingAtom = isStreamingFamilyCallback(familyKey);+ const errorAtom = agentChatErrorFamilyState.atomFamily(familyKey);+ const isStreamingAtom =+ agentChatIsStreamingFamilyState.atomFamily(familyKey);const isAwaitingFirstChunkAtom =- isAwaitingFirstChunkFamilyCallback(familyKey);- const firstLiveSeqAtom = firstLiveSeqFamilyCallback(familyKey);+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily(familyKey);+ const firstLiveSeqAtom =+ agentChatFirstLiveSeqFamilyState.atomFamily(familyKey);const isAwaitingPersistedRefetchAtom =- isAwaitingPersistedRefetchFamilyCallback(familyKey);+ agentChatIsAwaitingPersistedRefetchFamilyState.atomFamily(familyKey);const handleEventCallbackAtom =- handleEventCallbackFamilyCallback(familyKey);- const messagesAtom = messagesFamilyCallback(familyKey);- const fetchedMessagesAtom = fetchedMessagesFamilyCallback(familyKey);- const queuedMessagesAtom = queuedMessagesFamilyCallback(familyKey);- const usageAtom = usageFamilyCallback(familyKey);+ agentChatHandleEventCallbackFamilyState.atomFamily(familyKey);+ const messagesAtom = agentChatMessagesFamilyState.atomFamily(familyKey);+ const fetchedMessagesAtom =+ agentChatFetchedMessagesFamilyState.atomFamily(familyKey);+ const queuedMessagesAtom =+ agentChatQueuedMessagesFamilyState.atomFamily(familyKey);+ const usageAtom = agentChatUsageFamilyState.atomFamily(familyKey);let bridge: TransformStream<UIMessageChunk> | null = null;let throttleTimer: ReturnType<typeof setTimeout> | null = null;@@ -524,16 +492,6 @@ export const useAgentChatSubscription = (threadId: string | null) => {sseClient,agentChatStreamResubscribeNonce,store,- errorFamilyCallback,- isStreamingFamilyCallback,- isAwaitingFirstChunkFamilyCallback,- firstLiveSeqFamilyCallback,- isAwaitingPersistedRefetchFamilyCallback,- handleEventCallbackFamilyCallback,- messagesFamilyCallback,- fetchedMessagesFamilyCallback,- queuedMessagesFamilyCallback,- usageFamilyCallback,refreshAgentChatThreads,refreshAgentChatThreadPermissions,applyAgentChatThreadUpdate,diff --git a/packages/twenty-front/src/modules/ai/hooks/useAnswerAgentChatToolCall.ts b/packages/twenty-front/src/modules/ai/hooks/useAnswerAgentChatToolCall.tsindex 4cad9c49057..9e0fff5ff72 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAnswerAgentChatToolCall.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAnswerAgentChatToolCall.ts@@ -7,7 +7,9 @@ import { useAgentChatModelId } from '@/ai/hooks/useAgentChatModelId';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';import { AiChatErrorCode } from '@/ai/utils/aiChatErrorCode';import { findToolPartOutput } from '@/ai/utils/findToolPartOutput';-import { getAgentChatThreadAtoms } from '@/ai/utils/getAgentChatThreadAtoms';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import { isAiChatCreditsExhaustedError } from '@/ai/utils/isAiChatCreditsExhaustedError';import { toAiChatError } from '@/ai/utils/toAiChatError';import { updateToolPartOutput } from '@/ai/utils/updateToolPartOutput';@@ -43,8 +45,12 @@ export const useAnswerAgentChatToolCall = () => {return false;}- const { messagesAtom, errorAtom, isAwaitingFirstChunkAtom } =- getAgentChatThreadAtoms(threadId);+ const messagesAtom = agentChatMessagesFamilyState.atomFamily({+ threadId,+ });+ const errorAtom = agentChatErrorFamilyState.atomFamily({ threadId });+ const isAwaitingFirstChunkAtom =+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({ threadId });const previousToolOutput = findToolPartOutput({messages: store.get(messagesAtom),diff --git a/packages/twenty-front/src/modules/ai/hooks/useCanRetryCurrentAiChatTurn.ts b/packages/twenty-front/src/modules/ai/hooks/useCanRetryCurrentAiChatTurn.tsindex 61fc2f36a3f..7f696102a31 100644--- a/packages/twenty-front/src/modules/ai/hooks/useCanRetryCurrentAiChatTurn.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useCanRetryCurrentAiChatTurn.ts@@ -1,17 +1,16 @@import { useIsCurrentAiChatThreadReadOnly } from '@/ai/hooks/useIsCurrentAiChatThreadReadOnly';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';export const useCanRetryCurrentAiChatTurn = () => {const isReadOnly = useIsCurrentAiChatThreadReadOnly();- const agentChatMessages = useAtomComponentSelectorValue(- agentChatDisplayedThreadMessagesComponentSelector,+ const agentChatDisplayedThreadMessages = useAtomStateValue(+ agentChatDisplayedThreadMessagesSelector,);const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);- const lastUserMessage = agentChatMessages.findLast(+ const lastUserMessage = agentChatDisplayedThreadMessages.findLast((message) => message.role === 'user' && message.status !== 'queued',);const senderId = lastUserMessage?.metadata?.senderUserWorkspaceId;diff --git a/packages/twenty-front/src/modules/ai/hooks/useHasReachedAiChatCreditsCap.ts b/packages/twenty-front/src/modules/ai/hooks/useHasReachedAiChatCreditsCap.tsindex 9cfda6ea416..c82e74d293b 100644--- a/packages/twenty-front/src/modules/ai/hooks/useHasReachedAiChatCreditsCap.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useHasReachedAiChatCreditsCap.ts@@ -1,11 +1,11 @@import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';import { isAiChatCreditsExhaustedError } from '@/ai/utils/isAiChatCreditsExhaustedError';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { hasReachedCurrentBillingPeriodCapSelector } from '@/workspace/states/hasReachedCurrentBillingPeriodCapSelector';import { isResourceCreditSubscriptionItem } from '@/workspace/utils/isResourceCreditSubscriptionItem';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';// The credits error renders nothing, so this keeps the banner mounted. The resource credit item's flag is// authoritative; the thread error stands in only without the item, else it would outlive an upgrade.@@ -18,10 +18,9 @@ export const useHasReachedAiChatCreditsCap = () => {const agentChatDisplayedThread = useAtomStateValue(agentChatDisplayedThreadState,);- const agentChatError = useAtomComponentFamilyStateValue(- agentChatErrorComponentFamilyState,- { threadId: agentChatDisplayedThread },- );+ const agentChatError = useAtomFamilyStateValue(agentChatErrorFamilyState, {+ threadId: agentChatDisplayedThread,+ });if (hasReachedCurrentBillingPeriodCap) {return true;diff --git a/packages/twenty-front/src/modules/ai/hooks/useProcessWorkspaceSetupCompletion.ts b/packages/twenty-front/src/modules/ai/hooks/useProcessWorkspaceSetupCompletion.tsindex 4df798e216a..14bc2048679 100644--- a/packages/twenty-front/src/modules/ai/hooks/useProcessWorkspaceSetupCompletion.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useProcessWorkspaceSetupCompletion.ts@@ -4,8 +4,7 @@ import { AI_CHAT_SURFACE } from '@/ai/constants/AiChatSurface';import { shouldOpenAiChatAfterOnboardingState } from '@/onboarding/states/shouldOpenAiChatAfterOnboardingState';import { useIsWorkspaceSetupChat } from '@/ai/hooks/useIsWorkspaceSetupChat';import { useReturnFromExpandedAiChat } from '@/ai/hooks/useReturnFromExpandedAiChat';-import { processedWorkspaceSetupCompletionIdsComponentState } from '@/ai/states/processedWorkspaceSetupCompletionIdsComponentState';-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';+import { processedWorkspaceSetupCompletionIdsState } from '@/ai/states/processedWorkspaceSetupCompletionIdsState';import { extractCompletedWorkspaceSetupToolParts } from '@/ai/utils/extractCompletedWorkspaceSetupToolParts';import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePath';import { isSettingsPath } from '~/utils/isSettingsPath';@@ -22,16 +21,14 @@ export const useProcessWorkspaceSetupCompletion = () => {destinationPath: defaultHomePagePath,});- const processedCompletionIdsState = useAtomComponentStateCallbackState(- processedWorkspaceSetupCompletionIdsComponentState,- );-const store = useStore();const processWorkspaceSetupCompletion = (message: Pick<ExtendedUIMessage, 'parts'>,) => {- const processedCompletionIds = store.get(processedCompletionIdsState);+ const processedCompletionIds = store.get(+ processedWorkspaceSetupCompletionIdsState.atom,+ );const completionIds = new Set([...processedCompletionIds,...extractCompletedWorkspaceSetupToolParts(message.parts).map(@@ -43,7 +40,9 @@ export const useProcessWorkspaceSetupCompletion = () => {return;}- store.set(processedCompletionIdsState, [...completionIds]);+ store.set(processedWorkspaceSetupCompletionIdsState.atom, [+ ...completionIds,+ ]);if (!isWorkspaceSetupChat) {return;diff --git a/packages/twenty-front/src/modules/ai/hooks/useRefreshAgentChatThreads.ts b/packages/twenty-front/src/modules/ai/hooks/useRefreshAgentChatThreads.tsindex f0ec32b08cf..63cc6e409bd 100644--- a/packages/twenty-front/src/modules/ai/hooks/useRefreshAgentChatThreads.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useRefreshAgentChatThreads.ts@@ -1,5 +1,4 @@import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';import { AGENT_CHAT_THREAD_LIST_FILTER } from '@/ai/constants/AgentChatThreadListFilter';import { AGENT_CHAT_THREAD_LIST_RECORD_GQL_FIELDS } from '@/ai/constants/AgentChatThreadListRecordGqlFields';import { useRefreshAgentChatThreadPermissions } from '@/ai/hooks/useRefreshAgentChatThreadPermissions';@@ -7,7 +6,7 @@ import { agentChatThreadListState } from '@/ai/states/agentChatThreadListState';import { agentChatThreadParticipantsState } from '@/ai/states/agentChatThreadParticipantsState';import { agentChatThreadRecordUpdateCountState } from '@/ai/states/agentChatThreadRecordUpdateCountState';import { agentChatThreadStreamedParticipantsState } from '@/ai/states/agentChatThreadStreamedParticipantsState';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';import { getAgentChatThreadLastActivityFieldName } from '@/ai/utils/getAgentChatThreadLastActivityFieldName';@@ -274,9 +273,8 @@ export const useRefreshAgentChatThreads = () => {addAgentChatThreadParticipants(page.participants);// The chat may have been selected before its record loaded, when usage couldn't be restored.- const usageAtom = agentChatUsageComponentFamilyState.atomFamily({- instanceId: AGENT_CHAT_INSTANCE_ID,- familyKey: { threadId: thread.id },+ const usageAtom = agentChatUsageFamilyState.atomFamily({+ threadId: thread.id,});if (!isDefined(store.get(usageAtom))) {diff --git a/packages/twenty-front/src/modules/ai/hooks/useRetryChatMessage.ts b/packages/twenty-front/src/modules/ai/hooks/useRetryChatMessage.tsindex d8da65b0ed6..5db17a94679 100644--- a/packages/twenty-front/src/modules/ai/hooks/useRetryChatMessage.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useRetryChatMessage.ts@@ -6,7 +6,8 @@ import { isDefined } from 'twenty-shared/utils';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';import { useAgentChatModelId } from '@/ai/hooks/useAgentChatModelId';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { getAgentChatThreadAtoms } from '@/ai/utils/getAgentChatThreadAtoms';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';import { isAiChatCreditsExhaustedError } from '@/ai/utils/isAiChatCreditsExhaustedError';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';@@ -28,8 +29,9 @@ export const useRetryChatMessage = () => {return;}- const { errorAtom, isAwaitingFirstChunkAtom } =- getAgentChatThreadAtoms(threadId);+ const errorAtom = agentChatErrorFamilyState.atomFamily({ threadId });+ const isAwaitingFirstChunkAtom =+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({ threadId });const previousError = store.get(errorAtom);store.set(errorAtom, null);diff --git a/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts b/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.tsindex ae8540e2a25..d11054b9598 100644--- a/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts@@ -1,38 +1,34 @@import { isDefined } from 'twenty-shared/utils';import { useIsOnNewAiChatSlot } from '@/ai/hooks/useIsOnNewAiChatSlot';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatIsStreamingComponentFamilyState } from '@/ai/states/agentChatIsStreamingComponentFamilyState';+import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';+import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';import { agentChatThreadsLoadingState } from '@/ai/states/agentChatThreadsLoadingState';-import { agentChatHasMessageComponentSelector } from '@/ai/states/selectors/agentChatHasMessageComponentSelector';+import { agentChatHasMessageSelector } from '@/ai/states/selectors/agentChatHasMessageSelector';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { useIsMobile } from 'twenty-ui/utilities';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';export const useShouldShowAiChatEmptyState = () => {const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);- const agentChatError = useAtomComponentFamilyStateValue(- agentChatErrorComponentFamilyState,+ const agentChatError = useAtomFamilyStateValue(agentChatErrorFamilyState, {+ threadId: currentAiChatThread,+ });+ const agentChatIsAwaitingFirstChunk = useAtomFamilyStateValue(+ agentChatIsAwaitingFirstChunkFamilyState,{ threadId: currentAiChatThread },);- const agentChatIsAwaitingFirstChunk = useAtomComponentFamilyStateValue(- agentChatIsAwaitingFirstChunkComponentFamilyState,- { threadId: currentAiChatThread },- );- const agentChatIsStreaming = useAtomComponentFamilyStateValue(- agentChatIsStreamingComponentFamilyState,+ const agentChatIsStreaming = useAtomFamilyStateValue(+ agentChatIsStreamingFamilyState,{ threadId: currentAiChatThread },);const agentChatThreadsLoading = useAtomStateValue(agentChatThreadsLoadingState,);- const hasMessages = useAtomComponentSelectorValue(- agentChatHasMessageComponentSelector,- );+ const agentChatHasMessage = useAtomStateValue(agentChatHasMessageSelector);const isMobile = useIsMobile();@@ -41,7 +37,7 @@ export const useShouldShowAiChatEmptyState = () => {return (isOnNewAiChatSlot &&!isMobile &&- !hasMessages &&+ !agentChatHasMessage &&!isDefined(agentChatError) &&!agentChatThreadsLoading &&!agentChatIsAwaitingFirstChunk &&diff --git a/packages/twenty-front/src/modules/ai/hooks/useSwitchAgentChatThreadWithDraft.ts b/packages/twenty-front/src/modules/ai/hooks/useSwitchAgentChatThreadWithDraft.tsindex a1a895d47cc..9c7ad3ac078 100644--- a/packages/twenty-front/src/modules/ai/hooks/useSwitchAgentChatThreadWithDraft.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useSwitchAgentChatThreadWithDraft.ts@@ -1,9 +1,7 @@-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';-import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { agentChatThreadRecordFamilySelector } from '@/ai/states/selectors/agentChatThreadRecordFamilySelector';import { getAgentChatUsageFromThread } from '@/ai/utils/getAgentChatUsageFromThread';-import { useAtomComponentFamilyStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateCallbackState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useStore } from 'jotai';import { useCallback } from 'react';@@ -14,10 +12,6 @@ export const useSwitchAgentChatThreadWithDraft = () => {currentAiChatThreadState,);const store = useStore();- const usageFamilyCallback = useAtomComponentFamilyStateCallbackState(- agentChatUsageComponentFamilyState,- AGENT_CHAT_INSTANCE_ID,- );const switchThreadWithDraft = useCallback((toThreadId: string) => {@@ -31,12 +25,12 @@ export const useSwitchAgentChatThreadWithDraft = () => {);store.set(- usageFamilyCallback({ threadId: toThreadId }),+ agentChatUsageFamilyState.atomFamily({ threadId: toThreadId }),isDefined(thread) ? getAgentChatUsageFromThread(thread) : null,);}},- [currentAiChatThread, setCurrentAiChatThread, store, usageFamilyCallback],+ [currentAiChatThread, setCurrentAiChatThread, store],);return { switchThreadWithDraft };diff --git a/packages/twenty-front/src/modules/ai/states/agentChatErrorComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatErrorComponentFamilyState.tsdeleted file mode 100644index 5ce4ec92aca..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatErrorComponentFamilyState.ts+++ /dev/null@@ -1,13 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { type AiChatError } from '@/ai/types/AiChatError';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';--export const agentChatErrorComponentFamilyState =- createAtomComponentFamilyState<- AiChatError | null,- { threadId: string | null }- >({- key: 'agentChatErrorComponentFamilyState',- defaultValue: null,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatErrorFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatErrorFamilyState.tsnew file mode 100644index 00000000000..29f42da2d17--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatErrorFamilyState.ts@@ -0,0 +1,10 @@+import { type AiChatError } from '@/ai/types/AiChatError';+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';++export const agentChatErrorFamilyState = createAtomFamilyState<+ AiChatError | null,+ { threadId: string | null }+>({+ key: 'agentChatErrorFamilyState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatFetchedMessagesComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatFetchedMessagesComponentFamilyState.tsdeleted file mode 100644index fbe4dc97e01..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatFetchedMessagesComponentFamilyState.ts+++ /dev/null@@ -1,13 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { type ExtendedUIMessage } from 'twenty-shared/ai';--export const agentChatFetchedMessagesComponentFamilyState =- createAtomComponentFamilyState<- ExtendedUIMessage[],- { threadId: string | null }- >({- key: 'agentChatFetchedMessagesComponentFamilyState',- defaultValue: [],- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatFetchedMessagesFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatFetchedMessagesFamilyState.tsnew file mode 100644index 00000000000..019f8ff3881--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatFetchedMessagesFamilyState.ts@@ -0,0 +1,10 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';+import { type ExtendedUIMessage } from 'twenty-shared/ai';++export const agentChatFetchedMessagesFamilyState = createAtomFamilyState<+ ExtendedUIMessage[],+ { threadId: string | null }+>({+ key: 'agentChatFetchedMessagesFamilyState',+ defaultValue: [],+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatFirstLiveSeqComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatFirstLiveSeqComponentFamilyState.tsdeleted file mode 100644index 4098ff98cbf..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatFirstLiveSeqComponentFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';--export const agentChatFirstLiveSeqComponentFamilyState =- createAtomComponentFamilyState<number | null, { threadId: string | null }>({- key: 'agentChatFirstLiveSeqComponentFamilyState',- defaultValue: null,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatFirstLiveSeqFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatFirstLiveSeqFamilyState.tsnew file mode 100644index 00000000000..786d657242f--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatFirstLiveSeqFamilyState.ts@@ -0,0 +1,9 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';++export const agentChatFirstLiveSeqFamilyState = createAtomFamilyState<+ number | null,+ { threadId: string | null }+>({+ key: 'agentChatFirstLiveSeqFamilyState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatHandleEventCallbackComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatHandleEventCallbackComponentFamilyState.tsdeleted file mode 100644index b621af624dc..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatHandleEventCallbackComponentFamilyState.ts+++ /dev/null@@ -1,14 +0,0 @@-import { type AgentChatSubscriptionEvent } from 'twenty-shared/ai';--import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';--export const agentChatHandleEventCallbackComponentFamilyState =- createAtomComponentFamilyState<- ((event: AgentChatSubscriptionEvent) => void) | null,- { threadId: string | null }- >({- key: 'agentChatHandleEventCallbackComponentFamilyState',- defaultValue: null,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatHandleEventCallbackFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatHandleEventCallbackFamilyState.tsnew file mode 100644index 00000000000..db53bcd886f--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatHandleEventCallbackFamilyState.ts@@ -0,0 +1,11 @@+import { type AgentChatSubscriptionEvent } from 'twenty-shared/ai';++import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';++export const agentChatHandleEventCallbackFamilyState = createAtomFamilyState<+ ((event: AgentChatSubscriptionEvent) => void) | null,+ { threadId: string | null }+>({+ key: 'agentChatHandleEventCallbackFamilyState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState.tsdeleted file mode 100644index 050f9353948..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';--export const agentChatIsAwaitingFirstChunkComponentFamilyState =- createAtomComponentFamilyState<boolean, { threadId: string | null }>({- key: 'agentChatIsAwaitingFirstChunkComponentFamilyState',- defaultValue: false,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingFirstChunkFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingFirstChunkFamilyState.tsnew file mode 100644index 00000000000..9b919ed02c9--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingFirstChunkFamilyState.ts@@ -0,0 +1,9 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';++export const agentChatIsAwaitingFirstChunkFamilyState = createAtomFamilyState<+ boolean,+ { threadId: string | null }+>({+ key: 'agentChatIsAwaitingFirstChunkFamilyState',+ defaultValue: false,+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingPersistedRefetchComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingPersistedRefetchComponentFamilyState.tsdeleted file mode 100644index 7674fb040a4..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingPersistedRefetchComponentFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';--export const agentChatIsAwaitingPersistedRefetchComponentFamilyState =- createAtomComponentFamilyState<boolean, { threadId: string | null }>({- key: 'agentChatIsAwaitingPersistedRefetchComponentFamilyState',- defaultValue: false,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingPersistedRefetchFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingPersistedRefetchFamilyState.tsnew file mode 100644index 00000000000..6358105c033--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatIsAwaitingPersistedRefetchFamilyState.ts@@ -0,0 +1,7 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';++export const agentChatIsAwaitingPersistedRefetchFamilyState =+ createAtomFamilyState<boolean, { threadId: string | null }>({+ key: 'agentChatIsAwaitingPersistedRefetchFamilyState',+ defaultValue: false,+ });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsStreamingComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsStreamingComponentFamilyState.tsdeleted file mode 100644index c4309053ef8..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatIsStreamingComponentFamilyState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';--export const agentChatIsStreamingComponentFamilyState =- createAtomComponentFamilyState<boolean, { threadId: string | null }>({- key: 'agentChatIsStreamingComponentFamilyState',- defaultValue: false,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatIsStreamingFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatIsStreamingFamilyState.tsnew file mode 100644index 00000000000..7d4836ff026--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatIsStreamingFamilyState.ts@@ -0,0 +1,9 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';++export const agentChatIsStreamingFamilyState = createAtomFamilyState<+ boolean,+ { threadId: string | null }+>({+ key: 'agentChatIsStreamingFamilyState',+ defaultValue: false,+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentFamilyState.tsdeleted file mode 100644index 47b11c78204..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatMessagesComponentFamilyState.ts+++ /dev/null@@ -1,13 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { type ExtendedUIMessage } from 'twenty-shared/ai';--export const agentChatMessagesComponentFamilyState =- createAtomComponentFamilyState<- ExtendedUIMessage[],- { threadId: string | null }- >({- key: 'agentChatMessagesComponentFamilyState',- defaultValue: [],- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatMessagesFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatMessagesFamilyState.tsnew file mode 100644index 00000000000..268c1999e0f--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatMessagesFamilyState.ts@@ -0,0 +1,10 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';+import { type ExtendedUIMessage } from 'twenty-shared/ai';++export const agentChatMessagesFamilyState = createAtomFamilyState<+ ExtendedUIMessage[],+ { threadId: string | null }+>({+ key: 'agentChatMessagesFamilyState',+ defaultValue: [],+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatQueuedMessagesComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatQueuedMessagesComponentFamilyState.tsdeleted file mode 100644index 82aecda7aaf..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatQueuedMessagesComponentFamilyState.ts+++ /dev/null@@ -1,13 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { type ExtendedUIMessage } from 'twenty-shared/ai';--export const agentChatQueuedMessagesComponentFamilyState =- createAtomComponentFamilyState<- ExtendedUIMessage[],- { threadId: string | null }- >({- key: 'agentChatQueuedMessagesComponentFamilyState',- defaultValue: [],- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatQueuedMessagesFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatQueuedMessagesFamilyState.tsnew file mode 100644index 00000000000..a1e5772b4cc--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatQueuedMessagesFamilyState.ts@@ -0,0 +1,10 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';+import { type ExtendedUIMessage } from 'twenty-shared/ai';++export const agentChatQueuedMessagesFamilyState = createAtomFamilyState<+ ExtendedUIMessage[],+ { threadId: string | null }+>({+ key: 'agentChatQueuedMessagesFamilyState',+ defaultValue: [],+});diff --git a/packages/twenty-front/src/modules/ai/states/agentChatUsageComponentFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatUsageComponentFamilyState.tsdeleted file mode 100644index 911d38d4c6b..00000000000--- a/packages/twenty-front/src/modules/ai/states/agentChatUsageComponentFamilyState.ts+++ /dev/null@@ -1,29 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-import { type AiChatUsageMetadata } from 'twenty-shared/ai';--export type AgentChatLastMessageUsage = Omit<- AiChatUsageMetadata,- 'conversationSize'->;--export type AgentChatUsageState = {- lastMessage: AgentChatLastMessageUsage | null;- cachedInputTokens: number;- conversationSize: number;- contextWindowTokens: number;- inputTokens: number;- outputTokens: number;- inputCredits: number;- outputCredits: number;-};--export const agentChatUsageComponentFamilyState =- createAtomComponentFamilyState<- AgentChatUsageState | null,- { threadId: string | null }- >({- key: 'agentChatUsageComponentFamilyState',- defaultValue: null,- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/agentChatUsageFamilyState.ts b/packages/twenty-front/src/modules/ai/states/agentChatUsageFamilyState.tsnew file mode 100644index 00000000000..8ad4c02efa5--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/agentChatUsageFamilyState.ts@@ -0,0 +1,26 @@+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';+import { type AiChatUsageMetadata } from 'twenty-shared/ai';++export type AgentChatLastMessageUsage = Omit<+ AiChatUsageMetadata,+ 'conversationSize'+>;++export type AgentChatUsageState = {+ lastMessage: AgentChatLastMessageUsage | null;+ cachedInputTokens: number;+ conversationSize: number;+ contextWindowTokens: number;+ inputTokens: number;+ outputTokens: number;+ inputCredits: number;+ outputCredits: number;+};++export const agentChatUsageFamilyState = createAtomFamilyState<+ AgentChatUsageState | null,+ { threadId: string | null }+>({+ key: 'agentChatUsageFamilyState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/ai/states/processedWorkspaceSetupCompletionIdsComponentState.ts b/packages/twenty-front/src/modules/ai/states/processedWorkspaceSetupCompletionIdsComponentState.tsdeleted file mode 100644index 198aad47723..00000000000--- a/packages/twenty-front/src/modules/ai/states/processedWorkspaceSetupCompletionIdsComponentState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const processedWorkspaceSetupCompletionIdsComponentState =- createAtomComponentState<string[]>({- key: 'processedWorkspaceSetupCompletionIdsComponentState',- defaultValue: [],- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/processedWorkspaceSetupCompletionIdsState.ts b/packages/twenty-front/src/modules/ai/states/processedWorkspaceSetupCompletionIdsState.tsnew file mode 100644index 00000000000..a977d648efc--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/processedWorkspaceSetupCompletionIdsState.ts@@ -0,0 +1,8 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const processedWorkspaceSetupCompletionIdsState = createAtomState<+ string[]+>({+ key: 'processedWorkspaceSetupCompletionIdsState',+ defaultValue: [],+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatFirstUnreadMessageIdComponentSelector.test.tsx b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatFirstUnreadMessageIdSelector.test.tsxsimilarity index 80%rename from packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatFirstUnreadMessageIdComponentSelector.test.tsxrename to packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatFirstUnreadMessageIdSelector.test.tsxindex 44dfdbf4607..b60cbecc3e4 100644--- a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatFirstUnreadMessageIdComponentSelector.test.tsx+++ b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatFirstUnreadMessageIdSelector.test.tsx@@ -2,23 +2,21 @@ import { renderHook } from '@testing-library/react';import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';import {type AgentChatThreadVisit,agentChatThreadVisitState,} from '@/ai/states/agentChatThreadVisitState';-import { agentChatFirstUnreadMessageIdComponentSelector } from '@/ai/states/selectors/agentChatFirstUnreadMessageIdComponentSelector';+import { agentChatFirstUnreadMessageIdSelector } from '@/ai/states/selectors/agentChatFirstUnreadMessageIdSelector';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import {jotaiStore,resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-const INSTANCE_ID = 'agentChatFirstUnreadMessageIdTest';const THREAD_ID = 'thread';const ME = 'my-user-workspace-id';const TEAMMATE = 'teammate-user-workspace-id';@@ -44,13 +42,7 @@ const MESSAGES = [];const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);const getFirstUnreadMessageId = (@@ -62,23 +54,17 @@ const getFirstUnreadMessageId = (isKeptUnread: false,});jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: THREAD_ID }),messages,);return renderHook(- () =>- useAtomComponentSelectorValue(- agentChatFirstUnreadMessageIdComponentSelector,- ),+ () => useAtomStateValue(agentChatFirstUnreadMessageIdSelector),{ wrapper: Wrapper },).result.current;};-describe('agentChatFirstUnreadMessageIdComponentSelector', () => {+describe('agentChatFirstUnreadMessageIdSelector', () => {beforeEach(() => {resetJotaiStore();jotaiStore.set(agentChatDisplayedThreadState.atom, THREAD_ID);diff --git a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.test.tsx b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageFamilySelector.test.tsxsimilarity index 53%rename from packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.test.tsxrename to packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageFamilySelector.test.tsxindex e934dd71c71..8ca3fa7d835 100644--- a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.test.tsx+++ b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageFamilySelector.test.tsx@@ -2,17 +2,15 @@ import { renderHook } from '@testing-library/react';import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';-import { agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector';-import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';+import { agentChatIsMessageBeforeFirstUserMessageFamilySelector } from '@/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageFamilySelector';import {jotaiStore,resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-const INSTANCE_ID = 'agentChatIsMessageBeforeFirstUserMessageTest';const THREAD_ID = 'thread';const MESSAGES = [@@ -23,24 +21,15 @@ const MESSAGES = [];const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);-describe('agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector', () => {+describe('agentChatIsMessageBeforeFirstUserMessageFamilySelector', () => {beforeEach(() => {resetJotaiStore();jotaiStore.set(agentChatDisplayedThreadState.atom, THREAD_ID);jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: THREAD_ID }),MESSAGES,);});@@ -53,8 +42,8 @@ describe('agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector', () =])('returns $expected for $messageId', ({ messageId, expected }) => {const { result } = renderHook(() =>- useAtomComponentFamilySelectorValue(- agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector,+ useAtomFamilySelectorValue(+ agentChatIsMessageBeforeFirstUserMessageFamilySelector,{ messageId },),{ wrapper: Wrapper },diff --git a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatLastMessageIdComponentSelector.test.tsx b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatLastMessageIdSelector.test.tsxsimilarity index 55%rename from packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatLastMessageIdComponentSelector.test.tsxrename to packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatLastMessageIdSelector.test.tsxindex 8dfe9d01ee7..c1a99eb591a 100644--- a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatLastMessageIdComponentSelector.test.tsx+++ b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatLastMessageIdSelector.test.tsx@@ -2,18 +2,16 @@ import { renderHook } from '@testing-library/react';import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';-import { agentChatLastMessageIdComponentSelector } from '@/ai/states/selectors/agentChatLastMessageIdComponentSelector';-import { agentChatNonLastMessageIdsComponentSelector } from '@/ai/states/selectors/agentChatNonLastMessageIdsComponentSelector';-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';+import { agentChatLastMessageIdSelector } from '@/ai/states/selectors/agentChatLastMessageIdSelector';+import { agentChatNonLastMessageIdsSelector } from '@/ai/states/selectors/agentChatNonLastMessageIdsSelector';import {jotaiStore,resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-const INSTANCE_ID = 'agentChatLastMessageIdTest';const THREAD_ID = 'thread';const USER_MESSAGE = { id: 'user-message', role: 'user' as const, parts: [] };@@ -24,16 +22,10 @@ const ASSISTANT_MESSAGE = {};const Wrapper = ({ children }: { children: ReactNode }) => (- <JotaiProvider store={jotaiStore}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: INSTANCE_ID }}- >- {children}- </AgentChatComponentInstanceContext.Provider>- </JotaiProvider>+ <JotaiProvider store={jotaiStore}>{children}</JotaiProvider>);-describe('agentChatLastMessageIdComponentSelector', () => {+describe('agentChatLastMessageIdSelector', () => {beforeEach(() => {resetJotaiStore();jotaiStore.set(agentChatDisplayedThreadState.atom, THREAD_ID);@@ -57,21 +49,16 @@ describe('agentChatLastMessageIdComponentSelector', () => {'$description',({ messages, expectedNonLastMessageIds, expectedLastMessageId }) => {jotaiStore.set(- agentChatMessagesComponentFamilyState.atomFamily({- instanceId: INSTANCE_ID,- familyKey: { threadId: THREAD_ID },- }),+ agentChatMessagesFamilyState.atomFamily({ threadId: THREAD_ID }),messages,);const { result } = renderHook(() => ({- nonLastMessageIds: useAtomComponentSelectorValue(- agentChatNonLastMessageIdsComponentSelector,- ),- lastMessageId: useAtomComponentSelectorValue(- agentChatLastMessageIdComponentSelector,+ nonLastMessageIds: useAtomStateValue(+ agentChatNonLastMessageIdsSelector,),+ lastMessageId: useAtomStateValue(agentChatLastMessageIdSelector),}),{ wrapper: Wrapper },);diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector.tsdeleted file mode 100644index dca622f5561..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector.ts+++ /dev/null@@ -1,18 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';-import { type ExtendedUIMessage } from 'twenty-shared/ai';--export const agentChatDisplayedThreadMessagesComponentSelector =- createAtomComponentSelector<ExtendedUIMessage[]>({- key: 'agentChatDisplayedThreadMessagesComponentSelector',- componentInstanceContext: AgentChatComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) =>- get(agentChatMessagesComponentFamilyState, {- instanceId,- familyKey: { threadId: get(agentChatDisplayedThreadState) },- }),- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatDisplayedThreadMessagesSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatDisplayedThreadMessagesSelector.tsnew file mode 100644index 00000000000..b628d670fd4--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatDisplayedThreadMessagesSelector.ts@@ -0,0 +1,14 @@+import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';+import { agentChatMessagesFamilyState } from '@/ai/states/agentChatMessagesFamilyState';+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';+import { type ExtendedUIMessage } from 'twenty-shared/ai';++export const agentChatDisplayedThreadMessagesSelector = createAtomSelector<+ ExtendedUIMessage[]+>({+ key: 'agentChatDisplayedThreadMessagesSelector',+ get: ({ get }) =>+ get(agentChatMessagesFamilyState, {+ threadId: get(agentChatDisplayedThreadState),+ }),+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatFirstUnreadMessageIdComponentSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatFirstUnreadMessageIdComponentSelector.tsdeleted file mode 100644index 9837bc665b1..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatFirstUnreadMessageIdComponentSelector.ts+++ /dev/null@@ -1,83 +0,0 @@-import { isDefined } from 'twenty-shared/utils';--import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';-import { agentChatThreadVisitState } from '@/ai/states/agentChatThreadVisitState';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { agentChatThreadRecordFamilySelector } from '@/ai/states/selectors/agentChatThreadRecordFamilySelector';-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--// The member's own messages are never new to them; a message without a sender-// predates multiplayer chats, when every user message was the owner's-export const agentChatFirstUnreadMessageIdComponentSelector =- createAtomComponentSelector<string | null>({- key: 'agentChatFirstUnreadMessageIdComponentSelector',- componentInstanceContext: AgentChatComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const threadId = get(agentChatDisplayedThreadState);- const visit = get(agentChatThreadVisitState);-- if (- !isDefined(threadId) ||- visit?.threadId !== threadId ||- !visit.isUnread- ) {- return null;- }-- const currentWorkspaceMember = get(currentWorkspaceMemberState);- const threadOwnerWorkspaceMemberId = get(- agentChatThreadRecordFamilySelector,- threadId,- )?.workspaceMemberId;- const isSenderlessMessageOwn =- !isDefined(threadOwnerWorkspaceMemberId) ||- threadOwnerWorkspaceMemberId === currentWorkspaceMember?.id;- const lastReadAtMs = isDefined(visit.lastReadAt)- ? new Date(visit.lastReadAt).getTime()- : null;-- const messages = get(- agentChatDisplayedThreadMessagesComponentSelector,- {- instanceId,- },- );-- const firstUnreadMessage = messages.find((message) => {- const createdAt = message.metadata?.createdAt;-- if (- message.role === AGENT_MESSAGE_ROLE.SYSTEM ||- !isDefined(createdAt)- ) {- return false;- }-- if (message.role === AGENT_MESSAGE_ROLE.USER) {- const senderUserWorkspaceId =- message.metadata?.senderUserWorkspaceId;-- const isOwnMessage = isDefined(senderUserWorkspaceId)- ? senderUserWorkspaceId ===- currentWorkspaceMember?.userWorkspaceId- : isSenderlessMessageOwn;-- if (isOwnMessage) {- return false;- }- }-- return (- !isDefined(lastReadAtMs) ||- new Date(createdAt).getTime() > lastReadAtMs- );- });-- return firstUnreadMessage?.id ?? null;- },- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatFirstUnreadMessageIdSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatFirstUnreadMessageIdSelector.tsnew file mode 100644index 00000000000..80c3fb022f0--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatFirstUnreadMessageIdSelector.ts@@ -0,0 +1,69 @@+import { isDefined } from 'twenty-shared/utils';++import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';+import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';+import { agentChatThreadVisitState } from '@/ai/states/agentChatThreadVisitState';+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { agentChatThreadRecordFamilySelector } from '@/ai/states/selectors/agentChatThreadRecordFamilySelector';+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';++// The member's own messages are never new to them; a message without a sender+// predates multiplayer chats, when every user message was the owner's+export const agentChatFirstUnreadMessageIdSelector = createAtomSelector<+ string | null+>({+ key: 'agentChatFirstUnreadMessageIdSelector',+ get: ({ get }) => {+ const threadId = get(agentChatDisplayedThreadState);+ const visit = get(agentChatThreadVisitState);++ if (+ !isDefined(threadId) ||+ visit?.threadId !== threadId ||+ !visit.isUnread+ ) {+ return null;+ }++ const currentWorkspaceMember = get(currentWorkspaceMemberState);+ const threadOwnerWorkspaceMemberId = get(+ agentChatThreadRecordFamilySelector,+ threadId,+ )?.workspaceMemberId;+ const isSenderlessMessageOwn =+ !isDefined(threadOwnerWorkspaceMemberId) ||+ threadOwnerWorkspaceMemberId === currentWorkspaceMember?.id;+ const lastReadAtMs = isDefined(visit.lastReadAt)+ ? new Date(visit.lastReadAt).getTime()+ : null;++ const messages = get(agentChatDisplayedThreadMessagesSelector);++ const firstUnreadMessage = messages.find((message) => {+ const createdAt = message.metadata?.createdAt;++ if (message.role === AGENT_MESSAGE_ROLE.SYSTEM || !isDefined(createdAt)) {+ return false;+ }++ if (message.role === AGENT_MESSAGE_ROLE.USER) {+ const senderUserWorkspaceId = message.metadata?.senderUserWorkspaceId;++ const isOwnMessage = isDefined(senderUserWorkspaceId)+ ? senderUserWorkspaceId === currentWorkspaceMember?.userWorkspaceId+ : isSenderlessMessageOwn;++ if (isOwnMessage) {+ return false;+ }+ }++ return (+ !isDefined(lastReadAtMs) || new Date(createdAt).getTime() > lastReadAtMs+ );+ });++ return firstUnreadMessage?.id ?? null;+ },+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatHasMessageComponentSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatHasMessageComponentSelector.tsdeleted file mode 100644index a0ee52b6363..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatHasMessageComponentSelector.ts+++ /dev/null@@ -1,22 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';-import { isNonEmptyArray } from '@sniptt/guards';--export const agentChatHasMessageComponentSelector =- createAtomComponentSelector<boolean>({- key: 'agentChatHasMessageComponentSelector',- componentInstanceContext: AgentChatComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const messages = get(- agentChatDisplayedThreadMessagesComponentSelector,- {- instanceId,- },- );-- return isNonEmptyArray(messages);- },- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatHasMessageSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatHasMessageSelector.tsnew file mode 100644index 00000000000..56f11f73799--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatHasMessageSelector.ts@@ -0,0 +1,9 @@+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';+import { isNonEmptyArray } from '@sniptt/guards';++export const agentChatHasMessageSelector = createAtomSelector<boolean>({+ key: 'agentChatHasMessageSelector',+ get: ({ get }) =>+ isNonEmptyArray(get(agentChatDisplayedThreadMessagesSelector)),+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.tsdeleted file mode 100644index 6c0f01b49c3..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.ts+++ /dev/null@@ -1,32 +0,0 @@-import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';--export const agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector =- createAtomComponentFamilySelector<boolean, { messageId: string }>({- key: 'agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector',- get:- ({ instanceId, familyKey: { messageId } }) =>- ({ get }) => {- const messages = get(- agentChatDisplayedThreadMessagesComponentSelector,- {- instanceId,- },- );-- for (const message of messages) {- if (message.id === messageId) {- return message.role !== AGENT_MESSAGE_ROLE.USER;- }-- if (message.role === AGENT_MESSAGE_ROLE.USER) {- return false;- }- }-- return false;- },- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageFamilySelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageFamilySelector.tsnew file mode 100644index 00000000000..816c95164a7--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageFamilySelector.ts@@ -0,0 +1,25 @@+import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { createAtomFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomFamilySelector';++export const agentChatIsMessageBeforeFirstUserMessageFamilySelector =+ createAtomFamilySelector<boolean, { messageId: string }>({+ key: 'agentChatIsMessageBeforeFirstUserMessageFamilySelector',+ get:+ ({ messageId }) =>+ ({ get }) => {+ const messages = get(agentChatDisplayedThreadMessagesSelector);++ for (const message of messages) {+ if (message.id === messageId) {+ return message.role !== AGENT_MESSAGE_ROLE.USER;+ }++ if (message.role === AGENT_MESSAGE_ROLE.USER) {+ return false;+ }+ }++ return false;+ },+ });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatLastMessageIdComponentSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatLastMessageIdComponentSelector.tsdeleted file mode 100644index d33914d6be1..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatLastMessageIdComponentSelector.ts+++ /dev/null@@ -1,28 +0,0 @@-import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const agentChatLastMessageIdComponentSelector =- createAtomComponentSelector<string | null>({- key: 'agentChatLastMessageIdComponentSelector',- componentInstanceContext: AgentChatComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const messages = get(- agentChatDisplayedThreadMessagesComponentSelector,- {- instanceId,- },- );-- const lastMessage = messages.at(-1);-- if (lastMessage?.role === AGENT_MESSAGE_ROLE.USER) {- return null;- }-- return lastMessage?.id ?? null;- },- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatLastMessageIdSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatLastMessageIdSelector.tsnew file mode 100644index 00000000000..fb7a7a275d5--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatLastMessageIdSelector.ts@@ -0,0 +1,18 @@+import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';++export const agentChatLastMessageIdSelector = createAtomSelector<string | null>(+ {+ key: 'agentChatLastMessageIdSelector',+ get: ({ get }) => {+ const lastMessage = get(agentChatDisplayedThreadMessagesSelector).at(-1);++ if (lastMessage?.role === AGENT_MESSAGE_ROLE.USER) {+ return null;+ }++ return lastMessage?.id ?? null;+ },+ },+);diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageComponentFamilySelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageComponentFamilySelector.tsdeleted file mode 100644index 2b042d9ca6e..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageComponentFamilySelector.ts+++ /dev/null@@ -1,26 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';-import { type ExtendedUIMessage } from 'twenty-shared/ai';-import { type Nullable } from 'twenty-shared/types';--export const agentChatMessageComponentFamilySelector =- createAtomComponentFamilySelector<- Nullable<ExtendedUIMessage>,- { messageId: Nullable<string> }- >({- key: 'agentChatMessageComponentFamilySelector',- get:- ({ instanceId, familyKey: { messageId } }) =>- ({ get }) => {- const messages = get(- agentChatDisplayedThreadMessagesComponentSelector,- {- instanceId,- },- );-- return messages.find((message) => message.id === messageId);- },- componentInstanceContext: AgentChatComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageFamilySelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageFamilySelector.tsnew file mode 100644index 00000000000..121b2f26d5d--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageFamilySelector.ts@@ -0,0 +1,17 @@+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { createAtomFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomFamilySelector';+import { type ExtendedUIMessage } from 'twenty-shared/ai';+import { type Nullable } from 'twenty-shared/types';++export const agentChatMessageFamilySelector = createAtomFamilySelector<+ Nullable<ExtendedUIMessage>,+ { messageId: Nullable<string> }+>({+ key: 'agentChatMessageFamilySelector',+ get:+ ({ messageId }) =>+ ({ get }) =>+ get(agentChatDisplayedThreadMessagesSelector).find(+ (message) => message.id === messageId,+ ),+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageIdsComponentSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageIdsComponentSelector.tsdeleted file mode 100644index 29bf8b1823c..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageIdsComponentSelector.ts+++ /dev/null@@ -1,19 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const agentChatMessageIdsComponentSelector = createAtomComponentSelector<- string[]->({- key: 'agentChatMessageIdsComponentSelector',- componentInstanceContext: AgentChatComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const messages = get(agentChatDisplayedThreadMessagesComponentSelector, {- instanceId,- });-- return messages.map((message) => message.id);- },-});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageIdsSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageIdsSelector.tsnew file mode 100644index 00000000000..dc5870d95a2--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatMessageIdsSelector.ts@@ -0,0 +1,8 @@+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';++export const agentChatMessageIdsSelector = createAtomSelector<string[]>({+ key: 'agentChatMessageIdsSelector',+ get: ({ get }) =>+ get(agentChatDisplayedThreadMessagesSelector).map((message) => message.id),+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatNonLastMessageIdsComponentSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatNonLastMessageIdsComponentSelector.tsdeleted file mode 100644index 5ca41fa87a3..00000000000--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatNonLastMessageIdsComponentSelector.ts+++ /dev/null@@ -1,31 +0,0 @@-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';-import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';-import { agentChatLastMessageIdComponentSelector } from '@/ai/states/selectors/agentChatLastMessageIdComponentSelector';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const agentChatNonLastMessageIdsComponentSelector =- createAtomComponentSelector<string[]>({- key: 'agentChatNonLastMessageIdsComponentSelector',- componentInstanceContext: AgentChatComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const messages = get(- agentChatDisplayedThreadMessagesComponentSelector,- {- instanceId,- },- );-- const lastMessageId = get(agentChatLastMessageIdComponentSelector, {- instanceId,- });-- return messages- .filter((message) => message.id !== lastMessageId)- .map((message) => message.id);- },- areEqual: (previous, next) =>- previous.length === next.length &&- previous.every((id, index) => id === next[index]),- });diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatNonLastMessageIdsSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatNonLastMessageIdsSelector.tsnew file mode 100644index 00000000000..7be2b23c3de--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatNonLastMessageIdsSelector.ts@@ -0,0 +1,17 @@+import { agentChatDisplayedThreadMessagesSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesSelector';+import { agentChatLastMessageIdSelector } from '@/ai/states/selectors/agentChatLastMessageIdSelector';+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';++export const agentChatNonLastMessageIdsSelector = createAtomSelector<string[]>({+ key: 'agentChatNonLastMessageIdsSelector',+ get: ({ get }) => {+ const lastMessageId = get(agentChatLastMessageIdSelector);++ return get(agentChatDisplayedThreadMessagesSelector)+ .filter((message) => message.id !== lastMessageId)+ .map((message) => message.id);+ },+ areEqual: (previous, next) =>+ previous.length === next.length &&+ previous.every((id, index) => id === next[index]),+});diff --git a/packages/twenty-front/src/modules/ai/utils/getAgentChatThreadAtoms.ts b/packages/twenty-front/src/modules/ai/utils/getAgentChatThreadAtoms.tsdeleted file mode 100644index 01d2b70b2c1..00000000000--- a/packages/twenty-front/src/modules/ai/utils/getAgentChatThreadAtoms.ts+++ /dev/null@@ -1,22 +0,0 @@-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';-import { agentChatErrorComponentFamilyState } from '@/ai/states/agentChatErrorComponentFamilyState';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';-import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';--export const getAgentChatThreadAtoms = (threadId: string) => {- const componentFamilyKey = {- instanceId: AGENT_CHAT_INSTANCE_ID,- familyKey: { threadId },- };-- return {- messagesAtom:- agentChatMessagesComponentFamilyState.atomFamily(componentFamilyKey),- errorAtom:- agentChatErrorComponentFamilyState.atomFamily(componentFamilyKey),- isAwaitingFirstChunkAtom:- agentChatIsAwaitingFirstChunkComponentFamilyState.atomFamily(- componentFamilyKey,- ),- };-};diff --git a/packages/twenty-front/src/modules/ai/utils/getAgentChatUsageFromThread.ts b/packages/twenty-front/src/modules/ai/utils/getAgentChatUsageFromThread.tsindex f60bca7e1c2..63224de0c63 100644--- a/packages/twenty-front/src/modules/ai/utils/getAgentChatUsageFromThread.ts+++ b/packages/twenty-front/src/modules/ai/utils/getAgentChatUsageFromThread.ts@@ -1,7 +1,7 @@import { INTERNAL_CREDITS_PER_DISPLAY_CREDIT } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';-import { type AgentChatUsageState } from '@/ai/states/agentChatUsageComponentFamilyState';+import { type AgentChatUsageState } from '@/ai/states/agentChatUsageFamilyState';import { type AgentChatThreadRecord } from '@/ai/types/AgentChatThreadRecord';const toDisplayCredits = (internalCredits: number | string | undefined) =>diff --git a/packages/twenty-front/src/modules/navigation/components/__stories__/MainNavigationDrawerContent.stories.tsx b/packages/twenty-front/src/modules/navigation/components/__stories__/MainNavigationDrawerContent.stories.tsxindex 068fa734a27..6d9f7f96667 100644--- a/packages/twenty-front/src/modules/navigation/components/__stories__/MainNavigationDrawerContent.stories.tsx+++ b/packages/twenty-front/src/modules/navigation/components/__stories__/MainNavigationDrawerContent.stories.tsx@@ -5,8 +5,6 @@ import { MemoryRouter } from 'react-router-dom';import { expect, userEvent, within } from 'storybook/test';import { ComponentDecorator } from 'twenty-ui/testing';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';-import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';import { setAgentChatThreadList } from '@/ai/testing/setAgentChatThreadList';import { setAgentChatThreadPermissions } from '@/ai/testing/setAgentChatThreadPermissions';import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';@@ -70,11 +68,7 @@ const AiNavigationContent = () => {return (<Provider store={store}><MemoryRouter initialEntries={['/chat']}>- <AgentChatComponentInstanceContext.Provider- value={{ instanceId: AGENT_CHAT_INSTANCE_ID }}- >- <ContentWithCollapseControl />- </AgentChatComponentInstanceContext.Provider>+ <ContentWithCollapseControl /></MemoryRouter></Provider>);diff --git a/packages/twenty-front/src/modules/onboarding/effect-components/WorkspaceSetupChatKickoffEffect.tsx b/packages/twenty-front/src/modules/onboarding/effect-components/WorkspaceSetupChatKickoffEffect.tsxindex a741fcd054d..9daa2f83e81 100644--- a/packages/twenty-front/src/modules/onboarding/effect-components/WorkspaceSetupChatKickoffEffect.tsx+++ b/packages/twenty-front/src/modules/onboarding/effect-components/WorkspaceSetupChatKickoffEffect.tsx@@ -5,8 +5,7 @@ import { useStore } from 'jotai';import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';-import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';+import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';import { hasInitializedAgentChatThreadsState } from '@/ai/states/hasInitializedAgentChatThreadsState';import { skipMessagesSkeletonUntilLoadedState } from '@/ai/states/skipMessagesSkeletonUntilLoadedState';@@ -98,9 +97,8 @@ export const WorkspaceSetupChatKickoffEffect = () => {if (result.outcome === WorkspaceSetupChatOutcome.STARTED) {store.set(- agentChatIsAwaitingFirstChunkComponentFamilyState.atomFamily({- instanceId: AGENT_CHAT_INSTANCE_ID,- familyKey: { threadId: thread.id },+ agentChatIsAwaitingFirstChunkFamilyState.atomFamily({+ threadId: thread.id,}),true,);