The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(ai): execute chat turns as their persisted sender (#26369)
Félix Malfait3b68667bea47
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex d31cec441e2..9d69e590f02 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -3414,6 +3414,7 @@ type AgentMessage {threadId: UUID!turnId: UUIDagentId: UUID+ senderUserWorkspaceId: UUIDrole: String!status: String!parts: [AgentMessagePart!]!diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex c269f74835e..4e87e6dff7b 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -3006,6 +3006,7 @@ export interface AgentMessage {threadId: Scalars['UUID']turnId?: Scalars['UUID']agentId?: Scalars['UUID']+ senderUserWorkspaceId?: Scalars['UUID']role: Scalars['String']status: Scalars['String']parts: AgentMessagePart[]@@ -6831,6 +6832,7 @@ export interface AgentMessageGenqlSelection{threadId?: boolean | numberturnId?: boolean | numberagentId?: boolean | number+ senderUserWorkspaceId?: boolean | numberrole?: boolean | numberstatus?: boolean | numberparts?: AgentMessagePartGenqlSelectiondiff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 16a38c9d47f..28ccb19ec64 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -6745,6 +6745,9 @@ export default {"agentId": [3],+ "senderUserWorkspaceId": [+ 3+ ],"role": [1],diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex bc379900c9d..2245ba035f5 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -94,6 +94,7 @@ export type AgentMessage = {parts: Array<AgentMessagePart>;processedAt?: Maybe<Scalars['DateTime']['output']>;role: Scalars['String']['output'];+ senderUserWorkspaceId?: Maybe<Scalars['UUID']['output']>;status: Scalars['String']['output'];threadId: Scalars['UUID']['output'];turnId?: Maybe<Scalars['UUID']['output']>;@@ -7943,7 +7944,7 @@ export type GetChatMessagesQueryVariables = Exact<{}>;-export type GetChatMessagesQuery = { __typename?: 'Query', chatMessages: Array<{ __typename?: 'AgentMessage', id: string, threadId: string, turnId?: string | null, role: string, status: string, createdAt: string, parts: Array<{ __typename?: 'AgentMessagePart', id: string, messageId: string, orderIndex: number, type: string, textContent?: string | null, reasoningContent?: string | null, toolName?: string | null, toolCallId?: string | null, toolInput?: any | null, toolOutput?: any | null, state?: string | null, providerExecuted?: boolean | null, errorMessage?: string | null, errorDetails?: any | null, sourceUrlSourceId?: string | null, sourceUrlUrl?: string | null, sourceUrlTitle?: string | null, sourceDocumentSourceId?: string | null, sourceDocumentMediaType?: string | null, sourceDocumentTitle?: string | null, sourceDocumentFilename?: string | null, fileMediaType?: string | null, fileFilename?: string | null, fileUrl?: string | null, fileId?: string | null, providerMetadata?: any | null, createdAt: string }> }>, chatStreamCatchupChunks: { __typename?: 'ChatStreamCatchupChunks', chunks: Array<any>, maxSeq: number, error?: { __typename?: 'ChatStreamError', code: string, message: string } | null } };+export type GetChatMessagesQuery = { __typename?: 'Query', chatMessages: Array<{ __typename?: 'AgentMessage', id: string, threadId: string, turnId?: string | null, senderUserWorkspaceId?: string | null, role: string, status: string, createdAt: string, parts: Array<{ __typename?: 'AgentMessagePart', id: string, messageId: string, orderIndex: number, type: string, textContent?: string | null, reasoningContent?: string | null, toolName?: string | null, toolCallId?: string | null, toolInput?: any | null, toolOutput?: any | null, state?: string | null, providerExecuted?: boolean | null, errorMessage?: string | null, errorDetails?: any | null, sourceUrlSourceId?: string | null, sourceUrlUrl?: string | null, sourceUrlTitle?: string | null, sourceDocumentSourceId?: string | null, sourceDocumentMediaType?: string | null, sourceDocumentTitle?: string | null, sourceDocumentFilename?: string | null, fileMediaType?: string | null, fileFilename?: string | null, fileUrl?: string | null, fileId?: string | null, providerMetadata?: any | null, createdAt: string }> }>, chatStreamCatchupChunks: { __typename?: 'ChatStreamCatchupChunks', chunks: Array<any>, maxSeq: number, error?: { __typename?: 'ChatStreamError', code: string, message: string } | null } };export type GetChatThreadsQueryVariables = Exact<{ [key: string]: never; }>;@@ -10317,7 +10318,7 @@ export const FindOneSkillDocument = {"kind":"Document","definitions":[{"kind":"Oexport const FindWorkspaceAiStatsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindWorkspaceAiStats"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findWorkspaceAiStats"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"conversationsCount"}},{"kind":"Field","name":{"kind":"Name","value":"skillsCount"}},{"kind":"Field","name":{"kind":"Name","value":"toolsCount"}}]}}]}}]} as unknown as DocumentNode<FindWorkspaceAiStatsQuery, FindWorkspaceAiStatsQueryVariables>;export const GetAgentTurnsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAgentTurns"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"agentTurns"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"agentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"threadId"}},{"kind":"Field","name":{"kind":"Name","value":"agentId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"evaluations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"score"}},{"kind":"Field","name":{"kind":"Name","value":"comment"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"messages"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"parts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"textContent"}},{"kind":"Field","name":{"kind":"Name","value":"reasoningContent"}},{"kind":"Field","name":{"kind":"Name","value":"toolName"}},{"kind":"Field","name":{"kind":"Name","value":"toolCallId"}},{"kind":"Field","name":{"kind":"Name","value":"toolInput"}},{"kind":"Field","name":{"kind":"Name","value":"toolOutput"}},{"kind":"Field","name":{"kind":"Name","value":"errorMessage"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"providerExecuted"}},{"kind":"Field","name":{"kind":"Name","value":"errorDetails"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlUrl"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlTitle"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentMediaType"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentTitle"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentFilename"}},{"kind":"Field","name":{"kind":"Name","value":"fileMediaType"}},{"kind":"Field","name":{"kind":"Name","value":"fileFilename"}},{"kind":"Field","name":{"kind":"Name","value":"fileUrl"}},{"kind":"Field","name":{"kind":"Name","value":"providerMetadata"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetAgentTurnsQuery, GetAgentTurnsQueryVariables>;export const GetAiChatUsageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAiChatUsage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"aiChatUsage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"limitValue"}},{"kind":"Field","name":{"kind":"Name","value":"consumedValue"}},{"kind":"Field","name":{"kind":"Name","value":"periodEnd"}}]}}]}}]} as unknown as DocumentNode<GetAiChatUsageQuery, GetAiChatUsageQueryVariables>;-export const GetChatMessagesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChatMessages"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chatMessages"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"threadId"}},{"kind":"Field","name":{"kind":"Name","value":"turnId"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"parts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"messageId"}},{"kind":"Field","name":{"kind":"Name","value":"orderIndex"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"textContent"}},{"kind":"Field","name":{"kind":"Name","value":"reasoningContent"}},{"kind":"Field","name":{"kind":"Name","value":"toolName"}},{"kind":"Field","name":{"kind":"Name","value":"toolCallId"}},{"kind":"Field","name":{"kind":"Name","value":"toolInput"}},{"kind":"Field","name":{"kind":"Name","value":"toolOutput"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"providerExecuted"}},{"kind":"Field","name":{"kind":"Name","value":"errorMessage"}},{"kind":"Field","name":{"kind":"Name","value":"errorDetails"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlUrl"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlTitle"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentMediaType"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentTitle"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentFilename"}},{"kind":"Field","name":{"kind":"Name","value":"fileMediaType"}},{"kind":"Field","name":{"kind":"Name","value":"fileFilename"}},{"kind":"Field","name":{"kind":"Name","value":"fileUrl"}},{"kind":"Field","name":{"kind":"Name","value":"fileId"}},{"kind":"Field","name":{"kind":"Name","value":"providerMetadata"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"chatStreamCatchupChunks"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chunks"}},{"kind":"Field","name":{"kind":"Name","value":"maxSeq"}},{"kind":"Field","name":{"kind":"Name","value":"error"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]} as unknown as DocumentNode<GetChatMessagesQuery, GetChatMessagesQueryVariables>;+export const GetChatMessagesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChatMessages"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chatMessages"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"threadId"}},{"kind":"Field","name":{"kind":"Name","value":"turnId"}},{"kind":"Field","name":{"kind":"Name","value":"senderUserWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"parts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"messageId"}},{"kind":"Field","name":{"kind":"Name","value":"orderIndex"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"textContent"}},{"kind":"Field","name":{"kind":"Name","value":"reasoningContent"}},{"kind":"Field","name":{"kind":"Name","value":"toolName"}},{"kind":"Field","name":{"kind":"Name","value":"toolCallId"}},{"kind":"Field","name":{"kind":"Name","value":"toolInput"}},{"kind":"Field","name":{"kind":"Name","value":"toolOutput"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"providerExecuted"}},{"kind":"Field","name":{"kind":"Name","value":"errorMessage"}},{"kind":"Field","name":{"kind":"Name","value":"errorDetails"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlUrl"}},{"kind":"Field","name":{"kind":"Name","value":"sourceUrlTitle"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentMediaType"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentTitle"}},{"kind":"Field","name":{"kind":"Name","value":"sourceDocumentFilename"}},{"kind":"Field","name":{"kind":"Name","value":"fileMediaType"}},{"kind":"Field","name":{"kind":"Name","value":"fileFilename"}},{"kind":"Field","name":{"kind":"Name","value":"fileUrl"}},{"kind":"Field","name":{"kind":"Name","value":"fileId"}},{"kind":"Field","name":{"kind":"Name","value":"providerMetadata"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"chatStreamCatchupChunks"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chunks"}},{"kind":"Field","name":{"kind":"Name","value":"maxSeq"}},{"kind":"Field","name":{"kind":"Name","value":"error"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"code"}},{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]} as unknown as DocumentNode<GetChatMessagesQuery, GetChatMessagesQueryVariables>;export const GetChatThreadsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChatThreads"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chatThreads"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"totalCacheReadTokens"}},{"kind":"Field","name":{"kind":"Name","value":"totalInputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"totalOutputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"contextWindowTokens"}},{"kind":"Field","name":{"kind":"Name","value":"conversationSize"}},{"kind":"Field","name":{"kind":"Name","value":"totalInputCredits"}},{"kind":"Field","name":{"kind":"Name","value":"totalOutputCredits"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"lastMessageAt"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<GetChatThreadsQuery, GetChatThreadsQueryVariables>;export const GetToolIndexDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetToolIndex"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getToolIndex"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"category"}},{"kind":"Field","name":{"kind":"Name","value":"objectName"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"widgetName"}},{"kind":"Field","name":{"kind":"Name","value":"frontComponentId"}}]}}]}}]} as unknown as DocumentNode<GetToolIndexQuery, GetToolIndexQueryVariables>;export const GetToolInputSchemaDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetToolInputSchema"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"toolName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getToolInputSchema"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"toolName"},"value":{"kind":"Variable","name":{"kind":"Name","value":"toolName"}}}]}]}}]} as unknown as DocumentNode<GetToolInputSchemaQuery, GetToolInputSchemaQueryVariables>;diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts b/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.tsindex 13e15d20fd3..94aa21ad2ad 100644--- a/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts+++ b/packages/twenty-front/src/modules/ai/graphql/queries/getChatMessages.ts@@ -6,6 +6,7 @@ export const GET_CHAT_MESSAGES = gql`idthreadIdturnId+ senderUserWorkspaceIdrolestatuscreatedAtdiff --git a/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts b/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.tsindex bb1cbe227ab..69ba1d7e1e6 100644--- a/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts+++ b/packages/twenty-front/src/modules/ai/utils/mapDBMessagesToUIMessages.ts@@ -14,6 +14,7 @@ export const mapDBMessagesToUIMessages = (.map(mapDBPartToUIMessagePart),metadata: {createdAt: dbMessage.createdAt,+ senderUserWorkspaceId: dbMessage.senderUserWorkspaceId,},threadId: dbMessage.threadId,}));diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.tsindex 0bd6b80ac60..d7dae1f536a 100644--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts@@ -1,3 +1,4 @@+import { AddChatMessageSenderFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender';import { AgentHistoryMigrationDataService } from 'src/database/commands/agent-history/agent-history-migration-data.service';import { AgentHistoryMigrationValidationService } from 'src/database/commands/agent-history/agent-history-migration-validation.service';import { AdminPanelChatService } from 'src/engine/core-modules/admin-panel/services/admin-panel-chat.service';@@ -152,6 +153,13 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);`CREATE TABLE core."keyValuePair" ("key" text, "workspaceId" uuid, "userId" uuid, "applicationId" uuid, "type" text, "value" jsonb, "updatedAt" timestamptz DEFAULT now()); CREATE UNIQUE INDEX state_key ON core."keyValuePair" ("key", "workspaceId") WHERE "userId" IS NULL AND "applicationId" IS NULL`,);for (const ddl of AGENT_HISTORY_TEST_SCHEMA) await dataSource.query(ddl);+ const senderRunner = dataSource.createQueryRunner();+ try {+ await senderRunner.connect();+ await new AddChatMessageSenderFastInstanceCommand().up(senderRunner);+ } finally {+ await senderRunner.release();+ }await dataSource.query('CREATE TABLE core."userWorkspace" (id uuid PRIMARY KEY, "workspaceId" uuid, "userId" uuid); CREATE TABLE core.file (id uuid PRIMARY KEY, "workspaceId" uuid)',);@@ -263,6 +271,69 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID););});+ it('can migrate and roll back 2.42 history before the sender columns exist', async () => {+ await dataSource.query(+ 'ALTER TABLE core."agentMessage" DROP COLUMN "senderUserWorkspaceId", DROP COLUMN "senderApplicationId"',+ );+ await migration.migrate({+ workspaceId: WORKSPACE_ID,+ target: 'workspace',+ });+ expect(+ await dataSource.query(+ `SELECT "senderUserWorkspaceId", "senderApplicationId" FROM "${SCHEMA}"."agentMessage"`,+ ),+ ).toEqual([{ senderUserWorkspaceId: null, senderApplicationId: null }]);+ await migration.migrate({ workspaceId: WORKSPACE_ID, target: 'core' });+ expect(+ await dataSource.query('SELECT id FROM core."agentMessage"'),+ ).toEqual([{ id: MESSAGE_ID }]);+ });++ it('preserves sender and application identity when moving attributed history in either direction', async () => {+ await dataSource.query(+ 'UPDATE core."agentMessage" SET "senderUserWorkspaceId" = $1, "senderApplicationId" = $2',+ [OWNER_ID, THREAD_ID],+ );+ await migration.migrate({+ workspaceId: WORKSPACE_ID,+ target: 'workspace',+ });+ await migration.migrate({ workspaceId: WORKSPACE_ID, target: 'core' });+ expect(+ await dataSource.query(+ 'SELECT "senderUserWorkspaceId", "senderApplicationId" FROM core."agentMessage"',+ ),+ ).toEqual([+ { senderUserWorkspaceId: OWNER_ID, senderApplicationId: THREAD_ID },+ ]);+ });++ it('refuses rollback before clearing data if the legacy schema would discard sender identity', async () => {+ await migration.migrate({+ workspaceId: WORKSPACE_ID,+ target: 'workspace',+ });+ await dataSource.query(+ `UPDATE "${SCHEMA}"."agentMessage" SET "senderUserWorkspaceId" = $1`,+ [OWNER_ID],+ );+ await dataSource.query(+ 'ALTER TABLE core."agentMessage" DROP COLUMN "senderUserWorkspaceId", DROP COLUMN "senderApplicationId"',+ );+ await expect(+ migration.migrate({ workspaceId: WORKSPACE_ID, target: 'core' }),+ ).rejects.toThrow('Run the 2.43 instance upgrade');+ expect(+ await dataSource.query('SELECT id FROM core."agentMessage"'),+ ).toEqual([{ id: MESSAGE_ID }]);+ expect(+ await dataSource.query(+ `SELECT "senderUserWorkspaceId" FROM "${SCHEMA}"."agentMessage"`,+ ),+ ).toEqual([{ senderUserWorkspaceId: OWNER_ID }]);+ });+it('copies all five tables, exact credits and archive state before changing the route', async () => {await migration.migrate({workspaceId: WORKSPACE_ID,diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-data.service.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-data.service.tsindex 751d09bacb8..490ca8fb297 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-data.service.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-data.service.ts@@ -4,6 +4,7 @@ import { type QueryRunner } from 'typeorm';import { AGENT_HISTORY_TABLES } from 'src/database/commands/agent-history/agent-history-tables.constant';import { getAgentHistoryColumn } from 'src/database/commands/agent-history/utils/get-agent-history-column.util';+import { getAgentHistoryMigrationColumns } from 'src/database/commands/agent-history/utils/get-agent-history-migration-columns.util';import { getAgentHistoryTable } from 'src/database/commands/agent-history/utils/get-agent-history-table.util';import { type AgentHistoryStorageState } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type';import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';@@ -52,7 +53,7 @@ export class AgentHistoryMigrationDataService {lastId: string | null;batchSize: number;}): Promise<string[]> {- const columns: readonly string[] = table.columns;+ const columns = await getAgentHistoryMigrationColumns({ runner, table });const targetColumns = [...columns.map((column) =>getAgentHistoryColumn({diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-validation.service.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-validation.service.tsindex e8b1f92960c..aab187ce3f6 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-validation.service.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-migration-validation.service.ts@@ -4,6 +4,7 @@ import { type QueryRunner } from 'typeorm';import { AGENT_HISTORY_TABLES } from 'src/database/commands/agent-history/agent-history-tables.constant';import { getAgentHistoryColumn } from 'src/database/commands/agent-history/utils/get-agent-history-column.util';+import { getAgentHistoryMigrationColumns } from 'src/database/commands/agent-history/utils/get-agent-history-migration-columns.util';import { getAgentHistoryTable } from 'src/database/commands/agent-history/utils/get-agent-history-table.util';import { type AgentHistoryStorageState } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-storage-state.type';import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';@@ -61,7 +62,17 @@ export class AgentHistoryMigrationValidationService {workspaceId: string;}): Promise<void> {for (const table of AGENT_HISTORY_TABLES) {- const columns = table.columns.map(escapeIdentifier).join(', ');+ const coreColumns = await getAgentHistoryMigrationColumns({+ runner,+ table,+ });+ const columns = table.columns+ .map((column) =>+ coreColumns.includes(column)+ ? escapeIdentifier(column)+ : `NULL::uuid AS ${escapeIdentifier(column)}`,+ )+ .join(', ');const targetColumns = table.columns.map((column) =>@@ -97,7 +108,11 @@ export class AgentHistoryMigrationValidationService {'SELECT column_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2',['core', table.name],);- const expected = new Set<string>([...table.columns, 'workspaceId']);+ const coreColumns = await getAgentHistoryMigrationColumns({+ runner,+ table,+ });+ const expected = new Set<string>([...coreColumns, 'workspaceId']);if (rows.length !== expected.size ||rows.some((row) => !expected.has(row.column_name))@@ -125,6 +140,19 @@ export class AgentHistoryMigrationValidationService {) {throw new Error(`Workspace ${table.name} schema is not prepared`);}+ const missingCoreColumns = table.columns.filter(+ (column) => !coreColumns.includes(column),+ );+ if (isNonEmptyArray(missingCoreColumns)) {+ const attributedMessages = await runner.query(+ `SELECT 1 FROM ${getAgentHistoryTable({ workspaceId, storage: 'workspace', name: table.name })} WHERE ${missingCoreColumns.map((column) => `${escapeIdentifier(column)} IS NOT NULL`).join(' OR ')} LIMIT 1`,+ );+ if (isNonEmptyArray(attributedMessages)) {+ throw new Error(+ 'Run the 2.43 instance upgrade before moving attributed chat history to core',+ );+ }+ }}}diff --git a/packages/twenty-server/src/database/commands/agent-history/agent-history-tables.constant.ts b/packages/twenty-server/src/database/commands/agent-history/agent-history-tables.constant.tsindex 3b565ae032e..5bdd99ced0c 100644--- a/packages/twenty-server/src/database/commands/agent-history/agent-history-tables.constant.ts+++ b/packages/twenty-server/src/database/commands/agent-history/agent-history-tables.constant.ts@@ -34,6 +34,8 @@ const HISTORY_TABLES_BY_NAME = {'threadId','turnId','agentId',+ 'senderUserWorkspaceId',+ 'senderApplicationId','role','status','isHidden',diff --git a/packages/twenty-server/src/database/commands/agent-history/utils/get-agent-history-migration-columns.util.ts b/packages/twenty-server/src/database/commands/agent-history/utils/get-agent-history-migration-columns.util.tsnew file mode 100644index 00000000000..dcff02fecba--- /dev/null+++ b/packages/twenty-server/src/database/commands/agent-history/utils/get-agent-history-migration-columns.util.ts@@ -0,0 +1,28 @@+import { type QueryRunner } from 'typeorm';++import { type AGENT_HISTORY_TABLES } from 'src/database/commands/agent-history/agent-history-tables.constant';++export const getAgentHistoryMigrationColumns = async ({+ runner,+ table,+}: {+ runner: QueryRunner;+ table: (typeof AGENT_HISTORY_TABLES)[number];+}): Promise<readonly string[]> => {+ if (table.name !== 'agentMessage') {+ return table.columns;+ }++ // The 2.42 history move can run before the 2.43 sender-column expansion.+ const columns: { column_name: string }[] = await runner.query(+ 'SELECT column_name FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2',+ ['core', table.name],+ );+ const existing = new Set(columns.map(({ column_name }) => column_name));++ return table.columns.filter(+ (column) =>+ !['senderUserWorkspaceId', 'senderApplicationId'].includes(column) ||+ existing.has(column),+ );+};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender.tsnew file mode 100644index 00000000000..58db79db21a--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender.ts@@ -0,0 +1,21 @@+import { QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.43.0', 1790171503074)+export class AddChatMessageSenderFastInstanceCommand implements FastInstanceCommand {+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."agentMessage" ADD COLUMN IF NOT EXISTS "senderUserWorkspaceId" uuid',+ );+ await queryRunner.query(+ 'ALTER TABLE "core"."agentMessage" ADD COLUMN IF NOT EXISTS "senderApplicationId" uuid',+ );+ }++ public async down(_queryRunner: QueryRunner): Promise<void> {+ // Older servers ignore nullable columns. Keeping them preserves the sender+ // and application identity if core history is rolled back and upgraded again.+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.tsnew file mode 100644index 00000000000..406fb3cde71--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts@@ -0,0 +1,16 @@+import { Module } from '@nestjs/common';++import { AgentHistoryMigrationModule } from 'src/database/commands/agent-history/agent-history-migration.module';+import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';+import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';+import { AttributeChatMessageSendersCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command';++@Module({+ imports: [+ AgentHistoryMigrationModule,+ AgentHistoryModule,+ WorkspaceIteratorModule,+ ],+ providers: [AttributeChatMessageSendersCommand],+})+export class V2_43_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.tsnew file mode 100644index 00000000000..e4edc64a7c9--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command.ts@@ -0,0 +1,55 @@+import { Command } from 'nest-commander';+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { AgentHistorySchemaService } from 'src/database/commands/agent-history/agent-history-schema.service';+import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';++@RegisteredWorkspaceCommand('2.43.0', 1790171503075)+@Command({+ name: 'upgrade:2-43:attribute-chat-message-senders',+ description: 'Persist the original participant on historical chat messages',+})+export class AttributeChatMessageSendersCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly schema: AgentHistorySchemaService,+ private readonly storage: AgentHistoryStorageService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {+ await this.up(args);+ }++ async up(args: RunOnWorkspaceArgs): Promise<void> {+ if (await this.storage.isEmptyUnprovisionedWorkspace(args.workspaceId)) {+ return;+ }+ await this.schema.prepare(args.workspaceId, args.options.dryRun ?? false);+ if (args.options.dryRun) {+ return;+ }+ await this.storage.run(+ args.workspaceId,+ async ({ manager, table, storage }) => {+ await manager.query(+ `UPDATE ${table('agentMessage')} message+ SET "senderUserWorkspaceId" = thread."userWorkspaceId"+ FROM ${table('agentChatThread')} thread+ WHERE message."threadId" = thread.id AND message.role = 'user'+ AND message."senderUserWorkspaceId" IS NULL+ ${storage === 'core' ? 'AND message."workspaceId" = $1 AND thread."workspaceId" = $1' : ''}`,+ storage === 'core' ? [args.workspaceId] : [],+ );+ },+ );+ }++ async down(_args: RunOnWorkspaceArgs): Promise<void> {+ // Older servers ignore these nullable fields. Retain authorship on rollback+ // so a later upgrade cannot reattribute another participant's messages.+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex 21f89508d34..cb48530651b 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -205,6 +205,7 @@ import { AddApplicationGrantedCapabilitiesFastInstanceCommand } from 'src/databaimport { AddViewGroupLoadLimitFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-instance-command-fast-1790088647379-add-view-group-load-limit';import { AddSettingsMenuItemFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-instance-command-fast-1790165860000-add-settings-menu-item';import { BackfillSettingsMenuItemSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-instance-command-slow-1790165870000-backfill-settings-menu-item';+import { AddChatMessageSenderFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -412,4 +413,5 @@ export const INSTANCE_COMMANDS = [AddViewGroupLoadLimitFastInstanceCommand,AddSettingsMenuItemFastInstanceCommand,BackfillSettingsMenuItemSlowInstanceCommand,+ AddChatMessageSenderFastInstanceCommand,];diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/workspace-command-provider.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/workspace-command-provider.module.tsindex b2dc3999742..a373e324dd1 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/workspace-command-provider.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/workspace-command-provider.module.ts@@ -1,3 +1,4 @@+import { V2_43_UpgradeVersionCommandModule } from 'src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module';import { Module } from '@nestjs/common';import { V1_21_UpgradeVersionCommandModule } from 'src/database/commands/upgrade-version-command/1-21/1-21-upgrade-version-command.module';@@ -83,6 +84,7 @@ import { V2_9_UpgradeVersionCommandModule } from 'src/database/commands/upgrade-V2_40_UpgradeVersionCommandModule,V2_41_UpgradeVersionCommandModule,V2_42_UpgradeVersionCommandModule,+ V2_43_UpgradeVersionCommandModule,],})export class WorkspaceCommandProviderModule {}diff --git a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/__tests__/local.driver.spec.ts b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/__tests__/local.driver.spec.tsnew file mode 100644index 00000000000..26c81bf05c9--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/__tests__/local.driver.spec.ts@@ -0,0 +1,57 @@+import { LocalDriver } from 'src/engine/core-modules/code-interpreter/drivers/local.driver';++describe('Local code interpreter participant isolation', () => {+ const driver = new LocalDriver({ timeoutMs: 5000 });+ const sessionId = 'shared-conversation';++ afterEach(async () => {+ await driver.releaseSession(sessionId);+ });++ it('preserves a participant’s state, then discards variables, files and credentials when the sender changes', async () => {+ const first = {+ sessionId,+ actorKey: 'alice:direct',+ env: { PRIVATE_TOKEN: 'alice-token' },+ };+ const created = await driver.execute(+ "secret = 'alice-private'\nopen('private.txt', 'w').write(secret)",+ [],+ first,+ );+ expect(created.exitCode).toBe(0);+ const reused = await driver.execute(+ "print(secret)\nprint(open('private.txt').read())",+ [],+ first,+ );+ expect(reused.stdout).toBe('alice-private\nalice-private\n');++ const switched = await driver.execute(+ "import os\nprint('secret' in globals())\nprint(os.path.exists('private.txt'))\nprint(os.environ.get('PRIVATE_TOKEN', 'absent'))",+ [],+ { sessionId, actorKey: 'bob:direct' },+ );+ expect(switched.exitCode).toBe(0);+ expect(switched.stdout).toBe('False\nFalse\nabsent\n');+ });++ it('also discards state when the same sender changes application context', async () => {+ await driver.execute("secret = 'direct-context'", [], {+ sessionId,+ actorKey: 'alice:direct',+ });+ const restricted = await driver.execute(+ "print('secret' in globals())",+ [],+ { sessionId, actorKey: 'alice:application' },+ );+ expect(restricted.exitCode).toBe(0);+ expect(restricted.stdout).toBe('False\n');+ const next = await driver.execute("print('still-running')", [], {+ sessionId,+ actorKey: 'alice:application',+ });+ expect(next.stdout).toBe('still-running\n');+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/e2b.driver.ts b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/e2b.driver.tsindex 448f93a3462..fe25b6100f4 100644--- a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/e2b.driver.ts+++ b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/e2b.driver.ts@@ -79,6 +79,7 @@ export class E2BDriver implements CodeInterpreterDriver {sandboxApi: Sandbox,apiKey,sessionId,+ actorKey: context?.actorKey,timeoutMs,idleTimeoutMs,}));diff --git a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/interfaces/code-interpreter-driver.interface.ts b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/interfaces/code-interpreter-driver.interface.tsindex 53aa8018865..fade5a5d85e 100644--- a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/interfaces/code-interpreter-driver.interface.ts+++ b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/interfaces/code-interpreter-driver.interface.ts@@ -21,6 +21,7 @@ export type CodeExecutionResult = {export type ExecutionContext = {env?: Record<string, string>;sessionId?: string;+ actorKey?: string;};export type StreamCallbacks = {diff --git a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/local.driver.ts b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/local.driver.tsindex 1e41ef64b3c..3e4cc99f627 100644--- a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/local.driver.ts+++ b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/local.driver.ts@@ -34,6 +34,7 @@ type KernelResponse = {};type LocalSession = {+ actorKey?: string;workDir: string;outputDir: string;scriptsDir: string;@@ -120,7 +121,11 @@ export class LocalDriver implements CodeInterpreterDriver {context: ExecutionContext | undefined,callbacks?: StreamCallbacks,): Promise<CodeExecutionResult> {- const session = await this.getOrCreateSession(sessionId, context?.env);+ const session = await this.getOrCreateSession(+ sessionId,+ context?.env,+ context?.actorKey,+ );// /home/user/output is cleared at the start of every call (matching the E2B// behavior and the tool contract).@@ -153,7 +158,9 @@ export class LocalDriver implements CodeInterpreterDriver {// next call recreates a clean one. The 'exit' handler reclaims the work// dir.session.hasExited = true;- this.sessions.delete(sessionId);+ if (this.sessions.get(sessionId) === session) {+ this.sessions.delete(sessionId);+ }session.child.kill('SIGKILL');return {@@ -308,15 +315,34 @@ export class LocalDriver implements CodeInterpreterDriver {}}+ async releaseSession(sessionId: string): Promise<void> {+ const session = this.sessions.get(sessionId);+ if (!isDefined(session)) {+ return;+ }+ this.sessions.delete(sessionId);+ session.hasExited = true;+ session.child.kill('SIGKILL');+ await fs.rm(session.workDir, { recursive: true, force: true });+ }+private async getOrCreateSession(sessionId: string,env?: Record<string, string>,+ actorKey?: string,): Promise<LocalSession> {const existing = this.sessions.get(sessionId);- if (isDefined(existing) && !existing.hasExited) {+ if (+ isDefined(existing) &&+ !existing.hasExited &&+ existing.actorKey === actorKey+ ) {return existing;}+ if (isDefined(existing) && !existing.hasExited) {+ await this.releaseSession(sessionId);+ }if (isDefined(existing)) {this.sessions.delete(sessionId);@@ -354,6 +380,7 @@ export class LocalDriver implements CodeInterpreterDriver {const controlOut = child.stdio[4] as Readable;const session: LocalSession = {+ actorKey,workDir,outputDir,scriptsDir,@@ -394,7 +421,9 @@ export class LocalDriver implements CodeInterpreterDriver {const markExited = () => {session.hasExited = true;- this.sessions.delete(sessionId);+ if (this.sessions.get(sessionId) === session) {+ this.sessions.delete(sessionId);+ }session.pending?.reject(new Error('Python kernel process exited'));session.pending = undefined;// The kernel self-terminates (idle watchdog) or dies on its own; reclaimdiff --git a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/__tests__/get-or-create-session-sandbox.util.spec.ts b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/__tests__/get-or-create-session-sandbox.util.spec.tsindex 4e6039d385f..1095c685960 100644--- a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/__tests__/get-or-create-session-sandbox.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/__tests__/get-or-create-session-sandbox.util.spec.ts@@ -248,3 +248,59 @@ describe('getOrCreateSessionSandbox', () => {expect(mock.create).toHaveBeenCalledTimes(1);});});++describe('Participant isolation', () => {+ it.each([undefined, 'owner:direct', 'editor:other-app'])(+ 'does not reuse a sandbox authenticated as %s',+ async (previousActor) => {+ const previous = listedSandbox('old-sandbox');+ if (previousActor) {+ previous.metadata.twentySessionActor = previousActor;+ }+ const sandbox = buildFakeSandbox();+ const { api, mock } = buildSandboxApi({+ list: jest.fn(() => paginatorOf([previous])),+ create: jest.fn().mockResolvedValue(sandbox),+ });+ const result = await getOrCreateSessionSandbox({+ sandboxApi: api,+ apiKey,+ sessionId,+ timeoutMs,+ idleTimeoutMs,+ actorKey: 'editor:direct',+ });+ expect(result.isReused).toBe(false);+ expect(mock.connect).not.toHaveBeenCalled();+ expect(mock.kill).toHaveBeenCalledWith('old-sandbox', { apiKey });+ expect(mock.create).toHaveBeenCalledWith(+ expect.objectContaining({+ metadata: {+ [SESSION_SANDBOX_METADATA_KEY]: sessionId,+ twentySessionActor: 'editor:direct',+ },+ }),+ );+ },+ );+ it('retains the sandbox for the same authenticated participant', async () => {+ const previous = listedSandbox('same-sandbox');+ previous.metadata.twentySessionActor = 'editor:direct';+ const sandbox = buildFakeSandbox();+ const { api, mock } = buildSandboxApi({+ list: jest.fn(() => paginatorOf([previous])),+ connect: jest.fn().mockResolvedValue(sandbox),+ });+ await expect(+ getOrCreateSessionSandbox({+ sandboxApi: api,+ apiKey,+ sessionId,+ timeoutMs,+ idleTimeoutMs,+ actorKey: 'editor:direct',+ }),+ ).resolves.toEqual({ sandbox, isReused: true });+ expect(mock.create).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/get-or-create-session-sandbox.util.ts b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/get-or-create-session-sandbox.util.tsindex 30599d1c0dd..265bbbc6994 100644--- a/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/get-or-create-session-sandbox.util.ts+++ b/packages/twenty-server/src/engine/core-modules/code-interpreter/drivers/utils/get-or-create-session-sandbox.util.ts@@ -6,10 +6,13 @@ import { SESSION_SANDBOX_METADATA_KEY } from 'src/engine/core-modules/code-intertype SandboxApi = typeof Sandbox;+const SESSION_ACTOR_METADATA_KEY = 'twentySessionActor';+type GetOrCreateSessionSandboxArgs = {sandboxApi: SandboxApi;apiKey: string;sessionId: string;+ actorKey?: string;timeoutMs: number;idleTimeoutMs: number;};@@ -77,12 +80,18 @@ const createSessionSandbox = (apiKey: string,sessionId: string,timeoutMs: number,+ actorKey?: string,) =>sandboxApi.create({apiKey,timeoutMs,lifecycle: { onTimeout: 'pause', autoResume: true },- metadata: { [SESSION_SANDBOX_METADATA_KEY]: sessionId },+ metadata: {+ [SESSION_SANDBOX_METADATA_KEY]: sessionId,+ ...(isDefined(actorKey)+ ? { [SESSION_ACTOR_METADATA_KEY]: actorKey }+ : {}),+ },});export const getOrCreateSessionSandbox = async ({@@ -91,6 +100,7 @@ export const getOrCreateSessionSandbox = async ({sessionId,timeoutMs,idleTimeoutMs,+ actorKey,}: GetOrCreateSessionSandboxArgs): Promise<{sandbox: Sandbox;isReused: boolean;@@ -108,7 +118,11 @@ export const getOrCreateSessionSandbox = async ({let reusedSandbox: Sandbox | undefined;let reusedSandboxId: string | undefined;- for (const { sandboxId } of sessionSandboxes) {+ for (const { sandboxId, metadata } of sessionSandboxes) {+ if (metadata?.[SESSION_ACTOR_METADATA_KEY] !== actorKey) {+ await killSandboxById(sandboxApi, apiKey, sandboxId);+ continue;+ }const sandbox = await connectAndKeepAlive(sandboxApi,apiKey,@@ -138,6 +152,7 @@ export const getOrCreateSessionSandbox = async ({apiKey,sessionId,aliveTimeoutMs,+ actorKey,);return { sandbox, isReused: false };diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.tsindex 010e5497130..e42a1eb8633 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type.ts@@ -7,6 +7,7 @@ import { type CodeExecutionStreamEmitter } from 'src/engine/core-modules/tool-primport { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';export type ToolProviderContext = {+ resolveExecutionContext?: () => Promise<ToolProviderContext>;workspaceId: string;roleId: string;rolePermissionConfig: RolePermissionConfig;diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.tsnew file mode 100644index 00000000000..c2619796181--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/__tests__/tool-executor.service.sender.spec.ts@@ -0,0 +1,82 @@+import { ToolCategory } from 'twenty-shared/ai';+import { ToolExecutorService } from 'src/engine/core-modules/tool-provider/services/tool-executor.service';+import { type ToolProviderContext } from 'src/engine/core-modules/tool-provider/interfaces/tool-provider-context.type';+import { type ToolIndexEntry } from 'src/engine/core-modules/tool-provider/types/tool-index-entry.type';++const descriptor = {+ name: 'find_people',+ label: 'Find people',+ description: '',+ category: ToolCategory.DATABASE_CRUD,+ executionRef: {+ kind: 'database_crud',+ operation: 'find_many',+ objectNameSingular: 'person',+ },+} as ToolIndexEntry;++const build = () => {+ const findRecords = {+ execute: jest.fn().mockResolvedValue({ success: true }),+ };+ const service = new ToolExecutorService(+ [],+ findRecords as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ );+ const current = {+ workspaceId: 'workspace',+ roleId: 'current-role',+ rolePermissionConfig: { intersectionOf: ['current-role', 'app-role'] },+ authContext: {+ type: 'user',+ workspace: { id: 'workspace' },+ userWorkspaceId: 'sender',+ },+ } as ToolProviderContext;+ const resolveExecutionContext = jest.fn().mockResolvedValue(current);+ const context = {+ ...current,+ roleId: 'old-role',+ rolePermissionConfig: { unionOf: ['old-role'] },+ resolveExecutionContext,+ };+ return { service, findRecords, context, current, resolveExecutionContext };+};++describe('Tool execution sender permissions', () => {+ it('uses the sender’s current role and application intersection for an already loaded tool', async () => {+ const { service, findRecords, context, current } = build();+ await service.dispatch(descriptor, {}, context);+ expect(findRecords.execute).toHaveBeenCalledWith(+ expect.objectContaining({+ authContext: current.authContext,+ rolePermissionConfig: current.rolePermissionConfig,+ }),+ );+ });++ it('does not invoke the tool after the sender loses access during a turn', async () => {+ const { service, findRecords, context, resolveExecutionContext } = build();+ await service.dispatch(descriptor, {}, context);+ resolveExecutionContext.mockRejectedValue(+ new Error('Sender access revoked'),+ );+ await expect(service.dispatch(descriptor, {}, context)).rejects.toThrow(+ 'Sender access revoked',+ );+ expect(findRecords.execute).toHaveBeenCalledTimes(1);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.tsindex b44b77112da..4cbf7ad95e0 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-executor.service.ts@@ -64,10 +64,12 @@ export class ToolExecutorService {context: ToolProviderContext,): Promise<ToolOutput> {const safeArgs = args ?? {};+ const executionContext = await (context.resolveExecutionContext?.() ??+ context);return withResolvedToolAuthContext({- context,+ context: executionContext,userRepository: this.userRepository,userWorkspaceRepository: this.userWorkspaceRepository,workspaceCacheService: this.workspaceCacheService,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.tsindex d00a687932f..b3f149a6896 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts@@ -37,6 +37,8 @@ export class ToolRegistryService {context: ToolProviderContext,options?: { categories?: ToolCategory[]; excludeTools?: Set<string> },): Promise<ToolIndexEntry[]> {+ const executionContext = await (context.resolveExecutionContext?.() ??+ context);const categorySet = options?.categories? new Set(options.categories): undefined;@@ -47,8 +49,8 @@ export class ToolRegistryService {return [];}- if (await provider.isAvailable(context)) {- return provider.generateDescriptors(context, {+ if (await provider.isAvailable(executionContext)) {+ return provider.generateDescriptors(executionContext, {includeSchemas: false,});}@@ -71,7 +73,10 @@ export class ToolRegistryService {context: ToolProviderContext;precomputedCatalog?: ToolIndexEntry[];}): Promise<Map<string, object>> {- const index = precomputedCatalog ?? (await this.getCatalog(context));+ const executionContext = await (context.resolveExecutionContext?.() ??+ context);+ const index =+ precomputedCatalog ?? (await this.getCatalog(executionContext));const nameSet = new Set(toolNames);const matchingEntries = index.filter((entry) => nameSet.has(entry.name));@@ -97,7 +102,7 @@ export class ToolRegistryService {const entryNameSet = new Set(entries.map((entry) => entry.name));- const descriptors = await provider.generateDescriptors(context, {+ const descriptors = await provider.generateDescriptors(executionContext, {includeSchemas: true,toolNames: entryNameSet,});@@ -438,6 +443,12 @@ export class ToolRegistryService {};return {+ resolveExecutionContext: context.resolveExecutionContext+ ? async () =>+ this.buildContextFromToolContext(+ await context.resolveExecutionContext!(),+ )+ : undefined,workspaceId: context.workspaceId,roleId: context.roleId,rolePermissionConfig,diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.tsindex c37409a1a8f..1341220e8b2 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/types/tool-context.type.ts@@ -8,6 +8,7 @@ import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/woimport { type RolePermissionConfig } from 'src/engine/twenty-orm/types/role-permission-config';export type ToolContext = {+ resolveExecutionContext?: () => Promise<ToolContext>;workspaceId: string;roleId: string;rolePermissionConfig?: RolePermissionConfig;diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/__tests__/code-interpreter-tool.sender.spec.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/__tests__/code-interpreter-tool.sender.spec.tsnew file mode 100644index 00000000000..4b7ce89c1d8--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/__tests__/code-interpreter-tool.sender.spec.ts@@ -0,0 +1,74 @@+import { withWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { CodeInterpreterTool } from 'src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool';+import { JwtTokenTypeEnum } from 'src/engine/core-modules/auth/types/jwt-token-type.enum';++describe('Code interpreter sender credentials', () => {+ it.each([undefined, 'application'])(+ 'preserves application scope %s in the sandbox token and session identity',+ async (applicationId) => {+ const interpreter = {+ execute: jest.fn().mockResolvedValue({+ exitCode: 0,+ stdout: '',+ stderr: '',+ files: [],+ }),+ };+ const jwt = {+ signAsyncOrThrow: jest.fn().mockResolvedValue('scoped-token'),+ };+ const tool = new CodeInterpreterTool(+ interpreter as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ {} as never,+ { get: () => 'http://localhost:3000' } as never,+ jwt as never,+ );+ await withWorkspaceAuthContext(+ {+ type: 'user',+ workspace: { id: 'workspace' },+ userWorkspaceId: 'sender',+ application: applicationId ? { id: applicationId } : undefined,+ } as never,+ () =>+ tool.execute(+ { code: "print('hello')" },+ {+ workspaceId: 'workspace',+ userId: 'user',+ userWorkspaceId: 'sender',+ threadId: 'thread',+ },+ ),+ );+ expect(jwt.signAsyncOrThrow).toHaveBeenCalledWith(+ expect.objectContaining({+ type: applicationId+ ? JwtTokenTypeEnum.APPLICATION_ACCESS+ : JwtTokenTypeEnum.ACCESS,+ userWorkspaceId: 'sender',+ userId: 'user',+ workspaceId: 'workspace',+ ...(applicationId+ ? { applicationId, sub: applicationId }+ : { sub: 'user' }),+ }),+ { expiresIn: '5m' },+ );+ expect(interpreter.execute).toHaveBeenCalledWith(+ expect.any(String),+ [],+ expect.objectContaining({+ sessionId: 'workspace:thread',+ actorKey: `sender:${applicationId ?? 'direct'}`,+ env: expect.objectContaining({ TWENTY_API_TOKEN: 'scoped-token' }),+ }),+ expect.any(Object),+ );+ },+ );+});diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.tsindex 3a1e7bb431e..ad2d427b912 100644--- a/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/code-interpreter-tool/code-interpreter-tool.ts@@ -1,3 +1,7 @@+import { isDefined } from 'twenty-shared/utils';+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';+import { workspaceAuthContextStorage } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { type ApplicationAccessTokenJwtPayload } from 'src/engine/core-modules/auth/types/application-access-token-jwt-payload.type';import { Injectable, Logger } from '@nestjs/common';import path from 'path';@@ -113,11 +117,17 @@ export class CodeInterpreterTool implements Tool {);const serverUrl = this.twentyConfigService.get('SERVER_URL');- const sessionToken = await this.generateSessionToken(+ const authContext = workspaceAuthContextStorage.getStore();+ const applicationId =+ isDefined(authContext) && isUserAuthContext(authContext)+ ? authContext.application?.id+ : undefined;+ const sessionToken = await this.generateSessionToken({workspaceId,userId,userWorkspaceId,- );+ applicationId,+ });this.logger.debug(`MCP session: workspaceId=${workspaceId}, userId=${userId}, userWorkspaceId=${userWorkspaceId}, serverUrl=${serverUrl}`,@@ -134,6 +144,7 @@ export class CodeInterpreterTool implements Tool {TWENTY_API_TOKEN: sessionToken,},sessionId: threadId ? `${workspaceId}:${threadId}` : undefined,+ actorKey: `${userWorkspaceId ?? 'anonymous'}:${applicationId ?? 'direct'}`,},{onStdout: (line) => {@@ -304,19 +315,35 @@ export class CodeInterpreterTool implements Tool {return inputFiles;}- private async generateSessionToken(- workspaceId: string,- userId?: string,- userWorkspaceId?: string,- ): Promise<string> {- const payload: AccessTokenJwtPayload = {- sub: userId ?? workspaceId,- type: JwtTokenTypeEnum.ACCESS,- workspaceId,- userId: userId ?? workspaceId,- userWorkspaceId: userWorkspaceId ?? workspaceId,- authProvider: AuthProviderEnum.Password,- };+ private async generateSessionToken({+ workspaceId,+ userId,+ userWorkspaceId,+ applicationId,+ }: {+ workspaceId: string;+ userId?: string;+ userWorkspaceId?: string;+ applicationId?: string;+ }): Promise<string> {+ const payload: AccessTokenJwtPayload | ApplicationAccessTokenJwtPayload =+ isDefined(applicationId)+ ? {+ sub: applicationId,+ type: JwtTokenTypeEnum.APPLICATION_ACCESS,+ workspaceId,+ applicationId,+ userId,+ userWorkspaceId,+ }+ : {+ sub: userId ?? workspaceId,+ type: JwtTokenTypeEnum.ACCESS,+ workspaceId,+ userId: userId ?? workspaceId,+ userWorkspaceId: userWorkspaceId ?? workspaceId,+ authProvider: AuthProviderEnum.Password,+ };return this.jwtWrapperService.signAsyncOrThrow(payload, {expiresIn: '5m',diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/services/__tests__/user-workspace-auth-context.service.spec.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/services/__tests__/user-workspace-auth-context.service.spec.tsnew file mode 100644index 00000000000..283cb07ee51--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/services/__tests__/user-workspace-auth-context.service.spec.ts@@ -0,0 +1,150 @@+import { withWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';+import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';++const args = { workspaceId: 'workspace', userWorkspaceId: 'membership' };+const build = () => {+ const repository = {+ findOne: jest.fn().mockResolvedValue({+ id: 'membership',+ userId: 'user',+ user: { id: 'user', createdAt: new Date(), updatedAt: new Date() },+ }),+ };+ const member = { id: 'member', deletedAt: null as Date | null };+ const cache = {+ getOrRecompute: jest.fn().mockResolvedValue({+ flatWorkspaceMemberMaps: {+ idByUserId: { user: 'member' },+ byId: { member },+ },+ }),+ };+ return {+ service: new UserWorkspaceAuthContextService(+ repository as never,+ cache as never,+ ),+ repository,+ cache,+ member,+ };+};++describe('Fresh workspace user context', () => {+ it('reloads the live membership for each authorization check', async () => {+ const { service, repository } = build();+ await expect(service.resolve(args)).resolves.toMatchObject({+ type: 'user',+ userWorkspaceId: 'membership',+ workspaceMemberId: 'member',+ });+ repository.findOne.mockResolvedValue(null);+ await expect(service.resolve(args)).rejects.toMatchObject({+ code: 'UNAUTHENTICATED',+ });+ expect(repository.findOne).toHaveBeenCalledWith({+ where: { id: 'membership', workspaceId: 'workspace' },+ relations: { user: true },+ });+ });++ it('denies a soft-deleted workspace member', async () => {+ const { service, member } = build();+ member.deletedAt = new Date();+ await expect(service.resolve(args)).rejects.toMatchObject({+ code: 'UNAUTHENTICATED',+ });+ });++ it('denies a disabled user even while their membership remains', async () => {+ const { service, repository } = build();+ repository.findOne.mockResolvedValue({+ id: 'membership',+ userId: 'user',+ user: { id: 'user', disabled: true },+ });+ await expect(service.resolve(args)).rejects.toMatchObject({+ code: 'UNAUTHENTICATED',+ });+ });++ it('rejects missing membership identifiers before querying', async () => {+ const { service, repository } = build();+ await expect(+ service.resolve({ ...args, userWorkspaceId: '' }),+ ).rejects.toMatchObject({ code: 'UNAUTHENTICATED' });+ expect(repository.findOne).not.toHaveBeenCalled();+ });++ it('retains the request application restriction when rebuilding the same user', async () => {+ const { service } = build();+ const context = {+ type: 'user',+ workspace: { id: 'workspace' },+ userWorkspaceId: 'membership',+ application: { id: 'app', defaultRoleId: 'app-role' },+ } as UserWorkspaceAuthContext;+ await withWorkspaceAuthContext(context, async () => {+ await expect(service.resolve(args)).resolves.toMatchObject({+ application: context.application,+ });+ const anotherRecipient = await service.resolve({+ ...args,+ userWorkspaceId: 'another-recipient',+ });+ expect(anotherRecipient.application).toBeUndefined();+ });+ });+});++describe('Persisted application scope', () => {+ it('reloads the application role when executing a queued message', async () => {+ const { service, cache } = build();+ cache.getOrRecompute+ .mockResolvedValueOnce({+ flatWorkspaceMemberMaps: {+ idByUserId: { user: 'member' },+ byId: { member: { id: 'member' } },+ },+ } as never)+ .mockResolvedValueOnce({+ flatApplicationMaps: {+ byId: { app: { id: 'app', defaultRoleId: 'current-role' } },+ },+ } as never);+ await expect(+ service.resolve({ ...args, applicationId: 'app' }),+ ).resolves.toMatchObject({+ application: { id: 'app', defaultRoleId: 'current-role' },+ });+ });+ it('fails closed when the original application was removed', async () => {+ const { service, cache } = build();+ cache.getOrRecompute+ .mockResolvedValueOnce({+ flatWorkspaceMemberMaps: {+ idByUserId: { user: 'member' },+ byId: { member: { id: 'member' } },+ },+ } as never)+ .mockResolvedValueOnce({ flatApplicationMaps: { byId: {} } } as never);+ await expect(+ service.resolve({ ...args, applicationId: 'removed' }),+ ).rejects.toMatchObject({ code: 'UNAUTHENTICATED' });+ });+ it('does not inherit an ambient application when a queued sender has explicit direct access', async () => {+ const { service } = build();+ const request = {+ type: 'user',+ workspace: { id: args.workspaceId },+ userWorkspaceId: args.userWorkspaceId,+ application: { id: 'app' },+ } as UserWorkspaceAuthContext;+ await withWorkspaceAuthContext(request, async () => {+ expect(+ (await service.resolve({ ...args, applicationId: null })).application,+ ).toBeUndefined();+ });+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.tsnew file mode 100644index 00000000000..ff80cd5c629--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service.ts@@ -0,0 +1,112 @@+import { workspaceAuthContextStorage } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';+import { isNonEmptyString } from '@sniptt/guards';+import { Injectable } from '@nestjs/common';+import { InjectRepository } from '@nestjs/typeorm';+import { Repository } from 'typeorm';+import { isDefined } from 'twenty-shared/utils';++import {+ AuthException,+ AuthExceptionCode,+} from 'src/engine/core-modules/auth/auth.exception';+import { buildUserAuthContext } from 'src/engine/core-modules/auth/utils/build-user-auth-context.util';+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { fromUserEntityToFlat } from 'src/engine/core-modules/user/utils/from-user-entity-to-flat.util';+import { type FlatWorkspace } from 'src/engine/core-modules/workspace/types/flat-workspace.type';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++@Injectable()+export class UserWorkspaceAuthContextService {+ constructor(+ @InjectRepository(UserWorkspaceEntity)+ private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {}++ // Queued work and subscriptions must rebuild their subject after membership changes.+ async resolve({+ workspaceId,+ userWorkspaceId,+ applicationId,+ }: {+ workspaceId: string;+ userWorkspaceId: string;+ applicationId?: string | null;+ }) {+ if (!isNonEmptyString(workspaceId) || !isNonEmptyString(userWorkspaceId)) {+ throw new AuthException(+ 'Workspace membership required',+ AuthExceptionCode.UNAUTHENTICATED,+ );+ }+ const userWorkspace = await this.userWorkspaceRepository.findOne({+ where: { id: userWorkspaceId, workspaceId },+ relations: { user: true },+ });+ if (+ !isDefined(userWorkspace) ||+ !isDefined(userWorkspace.user) ||+ userWorkspace.user.disabled ||+ isDefined(userWorkspace.user.deletedAt)+ ) {+ throw new AuthException(+ 'User workspace not found',+ AuthExceptionCode.UNAUTHENTICATED,+ );+ }+ const { flatWorkspaceMemberMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatWorkspaceMemberMaps',+ ]);+ const workspaceMemberId =+ flatWorkspaceMemberMaps.idByUserId[userWorkspace.userId];+ const workspaceMember = isDefined(workspaceMemberId)+ ? flatWorkspaceMemberMaps.byId[workspaceMemberId]+ : undefined;+ if (+ !isDefined(workspaceMemberId) ||+ !isDefined(workspaceMember) ||+ isDefined(workspaceMember.deletedAt)+ ) {+ throw new AuthException(+ 'Workspace member not found',+ AuthExceptionCode.UNAUTHENTICATED,+ );+ }+ const requestContext = workspaceAuthContextStorage.getStore();+ const matchingUserContext =+ isDefined(requestContext) &&+ isUserAuthContext(requestContext) &&+ requestContext.workspace.id === workspaceId &&+ requestContext.userWorkspaceId === userWorkspaceId+ ? requestContext+ : undefined;+ let application =+ applicationId === undefined+ ? matchingUserContext?.application+ : undefined;+ if (isDefined(applicationId)) {+ const { flatApplicationMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatApplicationMaps',+ ]);+ application = flatApplicationMaps.byId[applicationId];+ if (!isDefined(application) || !isDefined(application.defaultRoleId)) {+ throw new AuthException(+ 'Application no longer has access',+ AuthExceptionCode.UNAUTHENTICATED,+ );+ }+ }+ return buildUserAuthContext({+ workspace: { id: workspaceId } as FlatWorkspace,+ application,+ viaApplication: matchingUserContext?.viaApplication,+ userWorkspaceId,+ user: fromUserEntityToFlat(userWorkspace.user),+ workspaceMemberId,+ workspaceMember,+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.tsindex 7da332cf88a..87c023a79bb 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts@@ -1,3 +1,5 @@+import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';@@ -24,6 +26,7 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works@Module({imports: [+ WorkspaceCacheModule,TypeOrmModule.forFeature([UserWorkspaceEntity,UserEntity,@@ -44,8 +47,9 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/worksFeatureFlagModule,CoreEntityCacheModule,],- exports: [UserWorkspaceService],+ exports: [UserWorkspaceService, UserWorkspaceAuthContextService],providers: [+ UserWorkspaceAuthContextService,UserWorkspaceService,UserWorkspaceEntityCacheProviderService,provideWorkspaceScopedRepository(RoleTargetEntity),diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.tsindex 825b0dd4f1d..d8a77c382cd 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/dtos/agent-message.dto.ts@@ -19,6 +19,9 @@ export class AgentMessageDTO {@Field(() => UUIDScalarType, { nullable: true })agentId: string | null;+ @Field(() => UUIDScalarType, { nullable: true })+ senderUserWorkspaceId: string | null;+@Field()role: 'system' | 'user' | 'assistant';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.tsindex e0900999f3a..5e86b4c5859 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity.ts@@ -68,6 +68,12 @@ export class AgentMessageEntity {@Index()agentId: string | null;+ @Column({ type: 'uuid', nullable: true })+ senderUserWorkspaceId: string | null;++ @Column({ type: 'uuid', nullable: true })+ senderApplicationId: string | null;+@Column({ type: 'enum', enum: AgentMessageRole })role: AgentMessageRole;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.tsindex 64f34281805..1127ad8f79b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/ai-chat.module.ts@@ -1,3 +1,4 @@+import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';import { AgentChatStreamStateModule } from 'src/engine/metadata-modules/ai/ai-chat/agent-chat-stream-state.module';import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';import { UsageLimitModule } from 'src/engine/core-modules/usage-limit/usage-limit.module';@@ -71,6 +72,7 @@ import { SystemPromptBuilderService } from './services/system-prompt-builder.serWorkflowToolsModule,],providers: [+ AgentChatActorService,AiChatUsageService,AiChatUsageResolver,AgentChatCancelSubscriberService,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.tsindex 2ef0d4c6de4..a21aa298d4f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/__tests__/stream-agent-chat.job.spec.ts@@ -147,7 +147,6 @@ describe('StreamAgentChatJob', () => {messages: [],browsingContext: null,lastUserMessageText: 'hello',- lastUserMessageParts: [{ type: 'text', text: 'hello' }],hasTitle: true,conversationSizeTokens: 0,existingTurnId: 'turn-id',@@ -157,7 +156,6 @@ describe('StreamAgentChatJob', () => {workspaceFound = true,chatStream = createFakeChatStream(),streamChatRejection,- addMessageRejection,assistantPersistRejection,totalsUpdateAffected = 1,finalPublishRejection,@@ -165,7 +163,6 @@ describe('StreamAgentChatJob', () => {workspaceFound?: boolean;chatStream?: ReturnType<typeof createFakeChatStream>;streamChatRejection?: Error;- addMessageRejection?: Error;assistantPersistRejection?: Error;totalsUpdateAffected?: number;finalPublishRejection?: Error;@@ -196,9 +193,7 @@ describe('StreamAgentChatJob', () => {findOne: jest.fn().mockResolvedValue(workspaceFound ? workspace : null),};const agentChatService = {- addMessage: addMessageRejection- ? jest.fn().mockRejectedValue(addMessageRejection)- : jest.fn().mockResolvedValue({ id: 'assistant-message-id' }),+ addMessage: jest.fn(),upsertAssistantMessage: assistantPersistRejection? jest.fn().mockRejectedValue(assistantPersistRejection): jest.fn().mockResolvedValue(undefined),@@ -260,6 +255,11 @@ describe('StreamAgentChatJob', () => {.fn().mockReturnValue({ modelId: 'openai/gpt-5.6-luna' }),};+ const actorService = {+ authorizeJob: jest.fn().mockResolvedValue({+ message: { id: 'user-message-id', turnId: 'turn-id' },+ }),+ };const job = new StreamAgentChatJob(threadRepository as never,workspaceRepository as never,@@ -271,6 +271,7 @@ describe('StreamAgentChatJob', () => {streamHeartbeatService as never,metricsService as never,aiModelRegistryService as never,+ actorService as never,);const turnCounts = (key: string) =>@@ -280,6 +281,8 @@ describe('StreamAgentChatJob', () => {return {job,+ actorService,+ chatExecutionService,publishedEvents,threadRepository,agentChatService,@@ -292,6 +295,53 @@ describe('StreamAgentChatJob', () => {};};+ it('uses the persisted turn when a job supplies only its message ID', async () => {+ const { job, agentChatService, chatExecutionService } = buildJob();+ await job.handle({+ ...jobData,+ messageId: 'user-message-id',+ existingTurnId: undefined,+ });+ expect(agentChatService.addMessage).not.toHaveBeenCalled();+ expect(chatExecutionService.streamChat).toHaveBeenCalledWith(+ expect.objectContaining({+ messageId: 'user-message-id',+ turnId: 'turn-id',+ }),+ );+ expect(agentChatService.upsertAssistantMessage).toHaveBeenCalledWith(+ expect.objectContaining({ turnId: 'turn-id' }),+ );+ });++ it('rejects a persisted message without a turn instead of creating another message', async () => {+ const { job, actorService, agentChatService, chatExecutionService } =+ buildJob();+ actorService.authorizeJob.mockResolvedValue({+ message: { id: 'user-message-id', turnId: null },+ } as never);+ await expect(job.handle(jobData)).rejects.toMatchObject({+ code: 'MESSAGE_NOT_FOUND',+ });+ expect(agentChatService.addMessage).not.toHaveBeenCalled();+ expect(chatExecutionService.streamChat).not.toHaveBeenCalled();+ });++ it('does not invoke the model when the saved sender lost access before execution', async () => {+ const { job, actorService, chatExecutionService, threadRepository } =+ buildJob();+ actorService.authorizeJob.mockRejectedValue(+ new Error('Sender access revoked'),+ );+ await expect(job.handle(jobData)).rejects.toThrow('Sender access revoked');+ expect(chatExecutionService.streamChat).not.toHaveBeenCalled();+ expect(threadRepository.update).toHaveBeenCalledWith(+ 'workspace-id',+ { id: 'thread-id', activeStreamId: 'stream-id' },+ { activeStreamId: null },+ );+ });+it('publishes all chunks in order with message-persisted last on success', async () => {const {job,@@ -403,7 +453,7 @@ describe('StreamAgentChatJob', () => {);expect(threadRepository.update).toHaveBeenCalledWith('workspace-id',- { id: 'thread-id' },+ { id: 'thread-id', activeStreamId: 'stream-id' },{lastStreamError: expect.objectContaining({code: 'STREAM_EXECUTION_FAILED',@@ -482,7 +532,7 @@ describe('StreamAgentChatJob', () => {});expect(threadRepository.update).toHaveBeenCalledWith('workspace-id',- { id: 'thread-id' },+ { id: 'thread-id', activeStreamId: 'stream-id' },{lastStreamError: expect.objectContaining({code: AiExceptionCode.WORKSPACE_NOT_FOUND,@@ -568,7 +618,7 @@ describe('StreamAgentChatJob', () => {expect(eventTypes).not.toContain('message-persisted');expect(threadRepository.update).toHaveBeenCalledWith('workspace-id',- { id: 'thread-id' },+ { id: 'thread-id', activeStreamId: 'stream-id' },{lastStreamError: expect.objectContaining({code: AiExceptionCode.STREAM_INTERRUPTED,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.tsindex 06e6770b0e5..6c3387c4f76 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat-job.types.ts@@ -1,7 +1,4 @@-import type {- ExtendedUIMessage,- ExtendedUIMessagePart,-} from 'twenty-shared/ai';+import type { ExtendedUIMessage } from 'twenty-shared/ai';import type { BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsingContext.type';@@ -14,9 +11,9 @@ export type StreamAgentChatJobData = {browsingContext: BrowsingContextType | null;modelId?: string;lastUserMessageText: string;- lastUserMessageParts: ExtendedUIMessagePart[];hasTitle: boolean;existingTurnId?: string;+ // Absent only on jobs queued before sender attribution was deployed.+ messageId?: string;conversationSizeTokens: number;- isResume?: boolean;};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.tsindex 8a64d489ad6..7e2acb9105a 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/jobs/stream-agent-chat.job.ts@@ -1,3 +1,4 @@+import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';import { updateAgentChatThreadUsage } from 'src/engine/metadata-modules/ai/ai-chat/utils/update-agent-chat-thread-usage.util';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';@@ -13,7 +14,6 @@ import {import {type CodeExecutionData,type ExtendedUIMessage,- type ExtendedUIMessagePart,} from 'twenty-shared/ai';import { assertUnreachable, isDefined } from 'twenty-shared/utils';import { Repository } from 'typeorm';@@ -28,7 +28,6 @@ import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service'import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';import { toDisplayCredits } from 'src/engine/core-modules/usage/utils/to-display-credits.util';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';import { computeCostBreakdown } from 'src/engine/metadata-modules/ai/ai-billing/utils/compute-cost-breakdown.util';import { convertDollarsToCreditsMicro } from 'src/engine/metadata-modules/ai/ai-billing/utils/convert-dollars-to-credits-micro.util';import { extractCacheCreationTokens } from 'src/engine/metadata-modules/ai/ai-billing/utils/extract-cache-creation-tokens.util';@@ -89,6 +88,7 @@ export class StreamAgentChatJob {private readonly streamHeartbeatService: AgentChatStreamHeartbeatService,private readonly metricsService: MetricsService,private readonly aiModelRegistryService: AiModelRegistryService,+ private readonly actorService: AgentChatActorService,) {}@Process(STREAM_AGENT_CHAT_JOB_NAME)@@ -162,8 +162,21 @@ export class StreamAgentChatJob {);}+ const { message } = await this.actorService.authorizeJob({+ workspaceId: data.workspaceId,+ threadId: data.threadId,+ messageId: data.messageId,+ turnId: data.existingTurnId,+ userWorkspaceId: data.userWorkspaceId,+ });+ if (!isDefined(message.turnId)) {+ throw new AiException(+ 'Message turn not found',+ AiExceptionCode.MESSAGE_NOT_FOUND,+ );+ }await this.executeStream(- data,+ { ...data, messageId: message.id, existingTurnId: message.turnId },workspace,abortController.signal,turnModelId,@@ -186,7 +199,7 @@ export class StreamAgentChatJob {await this.threadRepository.update(data.workspaceId,- { id: data.threadId },+ { id: data.threadId, activeStreamId: data.streamId },{lastStreamError: {...streamError,@@ -234,12 +247,11 @@ export class StreamAgentChatJob {if (!abortController.signal.aborted) {await this.agentChatStreamingService- .flushNextQueuedMessage(- data.threadId,- data.userWorkspaceId,- data.workspaceId,- data.hasTitle,- )+ .flushNextQueuedMessage({+ threadId: data.threadId,+ workspaceId: data.workspaceId,+ hasTitle: data.hasTitle,+ }).catch((error) => {this.logger.error(`Failed to flush queued message for thread ${data.threadId}: ${error instanceof Error ? error.message : String(error)}`,@@ -322,33 +334,16 @@ export class StreamAgentChatJob {}private async executeStream(- data: StreamAgentChatJobData,+ data: StreamAgentChatJobData & { existingTurnId: string },workspace: WorkspaceEntity,abortSignal: AbortSignal,turnModelId: string,): Promise<void> {- // When processing a promoted queued message, the user message already- // exists in the DB with a turn — skip persisting it again.- const userMessagePromise = data.existingTurnId- ? Promise.resolve({ turnId: data.existingTurnId })- : this.agentChatService.addMessage({- threadId: data.threadId,- uiMessage: {- role: AgentMessageRole.USER,- parts: data.lastUserMessageParts.filter(- (part): part is ExtendedUIMessagePart =>- part.type === 'text' || part.type === 'file',- ),- },- workspaceId: data.workspaceId,- });-- userMessagePromise.catch(() => {});-const titlePromise = data.hasTitle? Promise.resolve(null): this.agentChatService.generateTitleIfNeeded({+ userWorkspaceId: data.userWorkspaceId,threadId: data.threadId,messageContent: data.lastUserMessageText,workspaceId: data.workspaceId,@@ -358,7 +353,7 @@ export class StreamAgentChatJob {await this.buildAndPublishStream({workspace,data,- userMessagePromise,+ turnId: data.existingTurnId,titlePromise,abortSignal,turnModelId,@@ -368,14 +363,14 @@ export class StreamAgentChatJob {private async buildAndPublishStream({workspace,data,- userMessagePromise,+ turnId,titlePromise,abortSignal,turnModelId,}: {workspace: WorkspaceEntity;data: StreamAgentChatJobData;- userMessagePromise: Promise<{ turnId: string | null }>;+ turnId: string;titlePromise: Promise<string | null>;abortSignal: AbortSignal;turnModelId: string;@@ -466,6 +461,7 @@ export class StreamAgentChatJob {threadId: data.threadId,streamId: data.streamId,turnId: data.existingTurnId,+ messageId: data.messageId,messages: data.messages,browsingContext: data.browsingContext,modelId: data.modelId,@@ -534,7 +530,7 @@ export class StreamAgentChatJob {totalCacheCreationTokens,modelConfig,turnModelId,- userMessagePromise,+ turnId,});await titleWritePromise;} catch (error) {@@ -582,12 +578,6 @@ export class StreamAgentChatJob {return;}- const { turnId } = await userMessagePromise;-- if (!isDefined(turnId)) {- return;- }-await this.agentChatService.upsertAssistantMessage({id: assistantMessageId,threadId: data.threadId,@@ -761,7 +751,7 @@ export class StreamAgentChatJob {totalCacheCreationTokens: number;modelConfig: AiModelConfig;turnModelId: string;- userMessagePromise: Promise<{ turnId: string | null }>;+ turnId: string;}): Promise<void> {const outcome = await this.persistStreamFinish(args);@@ -787,7 +777,7 @@ export class StreamAgentChatJob {totalCacheCreationTokens,modelConfig,turnModelId,- userMessagePromise,+ turnId,}: {assistantMessageId: string;streamId: string;@@ -809,7 +799,7 @@ export class StreamAgentChatJob {totalCacheCreationTokens: number;modelConfig: AiModelConfig;turnModelId: string;- userMessagePromise: Promise<{ turnId: string | null }>;+ turnId: string;}): Promise<AgentChatTurnOutcome | null> {const hasText = responseMessage.parts.some((part) => part.type === 'text' && isNonEmptyString(part.text),@@ -855,24 +845,13 @@ export class StreamAgentChatJob {return resolveSupersededTurnOutcome(outcome);}- const userMessage = await userMessagePromise;-- if (isDefined(userMessage.turnId)) {- await this.agentChatService.upsertAssistantMessage({- id: assistantMessageId,- threadId,- turnId: userMessage.turnId,- parts: responseMessage.parts,- workspaceId,- });- } else {- await this.agentChatService.addMessage({- threadId,- uiMessage: responseMessage,- id: assistantMessageId,- workspaceId,- });- }+ await this.agentChatService.upsertAssistantMessage({+ id: assistantMessageId,+ threadId,+ turnId,+ parts: responseMessage.parts,+ workspaceId,+ });const totalsUpdate = await updateAgentChatThreadUsage({repository: this.threadRepository,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.tsnew file mode 100644index 00000000000..9e2a8cd7865--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-actor.service.spec.ts@@ -0,0 +1,268 @@+import { withWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';+import { AgentMessageStatus } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';++const workspaceId = 'workspace';+const threadId = 'thread';+const sender = { userWorkspaceId: 'sender', applicationId: null };+const build = () => {+ const message = {+ id: 'message',+ threadId,+ turnId: 'turn',+ senderUserWorkspaceId: 'sender' as string | null,+ senderApplicationId: null as string | null,+ status: AgentMessageStatus.SENT,+ };+ const messages = { findOne: jest.fn().mockResolvedValue(message) };+ const threads = {+ findOneOrFail: jest.fn().mockResolvedValue({ userWorkspaceId: 'owner' }),+ };+ const chat = {+ getThreadById: jest+ .fn()+ .mockResolvedValue({ id: threadId, deletedAt: null }),+ };+ const auth = {+ resolve: jest+ .fn()+ .mockImplementation(async ({ userWorkspaceId, applicationId }) => ({+ type: 'user',+ workspace: { id: workspaceId },+ userWorkspaceId,+ user: { id: 'user' },+ workspaceMember: { id: 'member' },+ ...(applicationId+ ? { application: { id: applicationId, defaultRoleId: 'app-role' } }+ : {}),+ })),+ };+ const permissions = {+ userHasWorkspaceSettingPermission: jest.fn().mockResolvedValue(true),+ };+ const cache = {+ getOrRecompute: jest.fn().mockResolvedValue({+ userWorkspaceRoleMap: { sender: 'sender-role', owner: 'owner-role' },+ }),+ };+ const service = new AgentChatActorService(+ messages as never,+ threads as never,+ chat as never,+ auth as never,+ permissions as never,+ cache as never,+ );+ return {+ service,+ message,+ messages,+ threads,+ chat,+ auth,+ permissions,+ cache,+ };+};+const job = {+ workspaceId,+ threadId,+ messageId: 'message',+ turnId: 'turn',+ userWorkspaceId: 'sender',+};++describe('Chat execution sender', () => {+ it('executes as the saved sender rather than the thread owner', async () => {+ const { service, chat } = build();+ await expect(service.authorizeJob(job)).resolves.toMatchObject({ sender });+ expect(chat.getThreadById).toHaveBeenCalledWith({+ workspaceId,+ threadId,+ userWorkspaceId: 'sender',+ });+ });+ it('rejects a job attempting to execute another participant’s message', async () => {+ const { service, chat } = build();+ await expect(+ service.authorizeJob({ ...job, userWorkspaceId: 'owner' }),+ ).rejects.toMatchObject({ code: 'MESSAGE_NOT_FOUND' });+ expect(chat.getThreadById).not.toHaveBeenCalled();+ });+ it('rejects a mismatched turn', async () => {+ const { service } = build();+ await expect(+ service.authorizeJob({ ...job, turnId: 'other-turn' }),+ ).rejects.toMatchObject({ code: 'MESSAGE_NOT_FOUND' });+ });+ it('does not execute a message still in the queue', async () => {+ const { service, message } = build();+ message.status = AgentMessageStatus.QUEUED;+ await expect(service.authorizeJob(job)).rejects.toMatchObject({+ code: 'MESSAGE_NOT_FOUND',+ });+ });+ it('uses the original participant for historical messages without attribution', async () => {+ const { service, message } = build();+ message.senderUserWorkspaceId = null;+ await expect(+ service.authorizeJob({ ...job, userWorkspaceId: 'owner' }),+ ).resolves.toMatchObject({+ sender: { userWorkspaceId: 'owner', applicationId: null },+ });+ await expect(service.authorizeJob(job)).rejects.toMatchObject({+ code: 'MESSAGE_NOT_FOUND',+ });+ });+ it('resolves old queued job payloads from their persisted turn', async () => {+ const { service, messages } = build();+ await service.authorizeJob({ ...job, messageId: undefined });+ expect(messages.findOne).toHaveBeenCalledWith(+ workspaceId,+ expect.objectContaining({+ where: { threadId, turnId: 'turn', role: 'user' },+ }),+ );+ });+ it('rejects jobs without a durable message or turn identity', async () => {+ const { service, messages } = build();+ await expect(+ service.authorizeJob({ ...job, messageId: undefined, turnId: undefined }),+ ).rejects.toMatchObject({ code: 'MESSAGE_NOT_FOUND' });+ expect(messages.findOne).not.toHaveBeenCalled();+ });+ it('intersects current sender and application roles', async () => {+ const { service } = build();+ await expect(+ service.authorize({+ workspaceId,+ threadId,+ sender: { ...sender, applicationId: 'app' },+ }),+ ).resolves.toMatchObject({+ rolePermissionConfig: { intersectionOf: ['sender-role', 'app-role'] },+ });+ });+ it('does not inherit ambient request application restrictions from another participant', async () => {+ const { service, auth } = build();+ await service.authorize({ workspaceId, threadId, sender });+ expect(auth.resolve).toHaveBeenCalledWith({ workspaceId, ...sender });+ });+ it('checks live membership again after a message has been accepted', async () => {+ const { service, auth } = build();+ await service.authorizeJob(job);+ auth.resolve.mockRejectedValue(new Error('Membership removed'));+ await expect(service.authorizeJob(job)).rejects.toThrow(+ 'Membership removed',+ );+ });+ it('checks the current thread permission before execution', async () => {+ const { service, chat } = build();+ chat.getThreadById.mockRejectedValue(new Error('Access revoked'));+ await expect(service.authorizeJob(job)).rejects.toThrow('Access revoked');+ });+ it('denies revoked AI permission', async () => {+ const { service, permissions } = build();+ permissions.userHasWorkspaceSettingPermission.mockResolvedValue(false);+ await expect(service.authorizeJob(job)).rejects.toMatchObject({+ code: 'THREAD_NOT_FOUND',+ });+ });+ it('denies archived threads', async () => {+ const { service, chat } = build();+ chat.getThreadById.mockResolvedValue({+ id: threadId,+ deletedAt: new Date(),+ } as never);+ await expect(service.authorizeJob(job)).rejects.toMatchObject({+ code: 'THREAD_NOT_FOUND',+ });+ });+ it('denies a sender without a current role', async () => {+ const { service, cache } = build();+ cache.getOrRecompute.mockResolvedValue({ userWorkspaceRoleMap: {} });+ await expect(service.authorizeJob(job)).rejects.toMatchObject({+ code: 'THREAD_NOT_FOUND',+ });+ });+ it.each([null, 'other-app'])(+ 'rejects retrying an application message from a different context (%s)',+ async (applicationId) => {+ const { service, message } = build();+ message.senderApplicationId = 'original-app';+ await expect(+ withWorkspaceAuthContext(+ {+ type: 'user',+ workspace: { id: workspaceId },+ userWorkspaceId: 'sender',+ application: applicationId ? { id: applicationId } : undefined,+ } as never,+ () => service.authorizeRetry(job),+ ),+ ).rejects.toMatchObject({ code: 'MESSAGE_NOT_FOUND' });+ },+ );++ it('allows retrying in the original sender and application context', async () => {+ const { service, message } = build();+ message.senderApplicationId = 'original-app';+ await expect(+ withWorkspaceAuthContext(+ {+ type: 'user',+ workspace: { id: workspaceId },+ userWorkspaceId: 'sender',+ application: { id: 'original-app' },+ } as never,+ () => service.authorizeRetry(job),+ ),+ ).resolves.toMatchObject({+ sender: { userWorkspaceId: 'sender', applicationId: 'original-app' },+ });+ });+ it.each([null, 'other-app'])(+ 'rejects answering an application question from a different context (%s)',+ async (applicationId) => {+ const { service, message } = build();+ message.senderApplicationId = 'original-app';+ await expect(+ withWorkspaceAuthContext(+ {+ type: 'user',+ workspace: { id: workspaceId },+ userWorkspaceId: 'sender',+ application: applicationId ? { id: applicationId } : undefined,+ } as never,+ () => service.authorizeQuestionAnswer(job),+ ),+ ).rejects.toMatchObject({ code: 'INVALID_QUESTION_ANSWER' });+ },+ );++ it.each([null, 'original-app'])(+ 'allows another participant to answer in the same application context (%s)',+ async (applicationId) => {+ const { service, message } = build();+ message.senderApplicationId = applicationId;+ await expect(+ withWorkspaceAuthContext(+ {+ type: 'user',+ workspace: { id: workspaceId },+ userWorkspaceId: 'another-participant',+ application: applicationId ? { id: applicationId } : undefined,+ } as never,+ () => service.authorizeQuestionAnswer(job),+ ),+ ).resolves.toBeUndefined();+ },+ );++ it('rejects an answer without an authenticated request context', async () => {+ const { service } = build();+ await expect(service.authorizeQuestionAnswer(job)).rejects.toMatchObject({+ code: 'INVALID_QUESTION_ANSWER',+ });+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.tsindex b9bd3501230..f495979eeca 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.ts@@ -25,13 +25,17 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>const messageQueueService = { add: jest.fn().mockResolvedValue(undefined) };const fileRepository = { find: jest.fn().mockResolvedValue([]) };const agentChatService = {+ getThreadById: jest.fn().mockResolvedValue(undefined),resolvePendingQuestion: jest.fn().mockResolvedValue({turnId: 'turn-id',+ answerText: 'Which option?\nFirst option',rollback: { partId: 'part-id', previousOutput: {} },}),restorePendingQuestion: jest.fn().mockResolvedValue(undefined),getMessagesForThread: jest.fn().mockResolvedValue([]),- addMessage: jest.fn().mockResolvedValue({ id: 'file-message-id' }),+ addMessage: jest+ .fn()+ .mockResolvedValue({ id: 'file-message-id', turnId: 'answer-turn-id' }),deleteMessage: jest.fn().mockResolvedValue(undefined),};const eventPublisherService = {@@ -50,6 +54,9 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>const metricsService = { incrementCounterBy: jest.fn() };+ const actorService = {+ authorizeQuestionAnswer: jest.fn().mockResolvedValue(undefined),+ };const service = new AgentChatStreamingService(threadRepository as never,fileRepository as never,@@ -65,10 +72,12 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>eventPublisherService as never,metricsService as never,),+ actorService as never,);return {service,+ actorService,threadRepository,fileRepository,messageQueueService,@@ -87,6 +96,55 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>workspace,};+ it.each([+ { answers: [] },+ {+ answers: [+ { questionIndex: 0, selectedOptionIndices: [], freeText: ' ' },+ ],+ },+ ])(+ 'rejects an empty answer without changing the question or queue',+ async ({ answers }) => {+ const {+ service,+ agentChatService,+ messageQueueService,+ streamHeartbeatService,+ } = buildService();+ await expect(+ service.answerPendingQuestionAndResumeStream({+ ...answerArguments,+ answers,+ }),+ ).rejects.toMatchObject({ code: 'INVALID_QUESTION_ANSWER' });+ expect(agentChatService.resolvePendingQuestion).not.toHaveBeenCalled();+ expect(agentChatService.addMessage).not.toHaveBeenCalled();+ expect(messageQueueService.add).not.toHaveBeenCalled();+ expect(streamHeartbeatService.markClaimed).not.toHaveBeenCalled();+ },+ );++ it('leaves the pending question untouched when application authorization fails', async () => {+ const {+ service,+ actorService,+ agentChatService,+ messageQueueService,+ streamHeartbeatService,+ } = buildService();+ actorService.authorizeQuestionAnswer.mockRejectedValue(+ new Error('Application context changed'),+ );+ await expect(+ service.answerPendingQuestionAndResumeStream(answerArguments),+ ).rejects.toThrow('Application context changed');+ expect(agentChatService.resolvePendingQuestion).not.toHaveBeenCalled();+ expect(agentChatService.addMessage).not.toHaveBeenCalled();+ expect(messageQueueService.add).not.toHaveBeenCalled();+ expect(streamHeartbeatService.markClaimed).not.toHaveBeenCalled();+ });+it('marks the heartbeat before the pending question claims the thread', async () => {const { service, agentChatService, streamHeartbeatService } =buildService();@@ -96,7 +154,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>expect(result).toEqual({streamId: expect.any(String),- turnId: 'turn-id',+ turnId: 'answer-turn-id',});expect(streamHeartbeatService.markClaimed).toHaveBeenCalledWith(result.streamId,@@ -125,8 +183,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>expect.any(String),expect.objectContaining({threadId: 'thread-id',- existingTurnId: 'turn-id',- isResume: true,+ existingTurnId: 'answer-turn-id',}),);});@@ -153,7 +210,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>expect(publishedEvents).toHaveLength(0);});- it('persists attached files as a user message on the question turn before enqueueing', async () => {+ it('persists the attributed answer and files in a new turn before enqueueing', async () => {const { service, agentChatService, fileRepository, messageQueueService } =buildService();@@ -171,6 +228,10 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>uiMessage: {role: AgentMessageRole.USER,parts: [+ {+ type: 'text',+ text: 'Which option?\nFirst option',+ },{type: 'file',mediaType: 'text/csv',@@ -180,7 +241,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>},],},- turnId: 'turn-id',+ userWorkspaceId: 'user-workspace-id',workspaceId: 'workspace-id',});expect(@@ -188,12 +249,17 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>).toBeLessThan(messageQueueService.add.mock.invocationCallOrder[0]);});- it('does not persist a user message when there are no attachments', async () => {+ it('persists the answer sender even without attachments', async () => {const { service, agentChatService } = buildService();await service.answerPendingQuestionAndResumeStream(answerArguments);- expect(agentChatService.addMessage).not.toHaveBeenCalled();+ expect(agentChatService.addMessage).toHaveBeenCalledWith(+ expect.objectContaining({+ userWorkspaceId: 'user-workspace-id',+ uiMessage: expect.objectContaining({ role: AgentMessageRole.USER }),+ }),+ );});it('restores the question when persisting attachments fails', async () => {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.claim.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.claim.spec.tsindex 5d296a13230..9e927c809c8 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.claim.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.claim.spec.ts@@ -73,6 +73,17 @@ describe('AgentChatStreamingService claim & reap', () => {eventPublisherService as never,metricsService as never,),+ {+ authorizeJob: jest.fn().mockResolvedValue(undefined),+ authorizeRetry: jest.fn().mockResolvedValue(undefined),+ authorize: jest.fn().mockResolvedValue({}),+ resolveMessage: jest.fn().mockResolvedValue({+ sender: {+ userWorkspaceId: 'user-workspace-id',+ applicationId: null,+ },+ }),+ } as never,);return {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.tsindex 4ba2a1ed76d..f82d25e151f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.kickoff.spec.ts@@ -36,6 +36,9 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {threadMessages = [hiddenKickoffMessageEntity],} = {}) => {const threadRepository = {+ findOneOrFail: jest+ .fn()+ .mockResolvedValue({ userWorkspaceId: 'user-workspace-id' }),findOne: jest.fn().mockResolvedValue(kickoffThread),update: jest.fn().mockResolvedValue({ affected: claimAffected }),};@@ -80,6 +83,17 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {eventPublisherService as never,metricsService as never,),+ {+ authorizeJob: jest.fn().mockResolvedValue(undefined),+ authorizeRetry: jest.fn().mockResolvedValue(undefined),+ authorize: jest.fn().mockResolvedValue({}),+ resolveMessage: jest.fn().mockResolvedValue({+ sender: {+ userWorkspaceId: 'user-workspace-id',+ applicationId: null,+ },+ }),+ } as never,);return {@@ -146,6 +160,7 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {expect(agentChatService.ensureHiddenKickoffMessage).toHaveBeenCalledWith({threadId: 'thread-id',workspaceId: 'workspace-id',+ userWorkspaceId: 'user-workspace-id',text: kickoffText,});expect(agentChatService.getMessagesForThread).toHaveBeenCalledWith(@@ -158,7 +173,6 @@ describe('AgentChatStreamingService.startHiddenKickoffStream', () => {browsingContext: null,modelId: 'default-fast-model',lastUserMessageText: kickoffText,- lastUserMessageParts: [{ type: 'text', text: kickoffText }],hasTitle: true,existingTurnId: 'kickoff-turn-id',}),diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.tsindex e8f13e2985a..f742347c0bc 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.retry.spec.ts@@ -42,6 +42,9 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {threadMessages = [userMessageEntity],} = {}) => {const threadRepository = {+ findOneOrFail: jest+ .fn()+ .mockResolvedValue({ userWorkspaceId: 'user-workspace-id' }),findOne: jest.fn().mockResolvedValue(thread),update: jest.fn().mockResolvedValue({ affected: 1 }),};@@ -80,6 +83,17 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {eventPublisherService as never,metricsService as never,),+ {+ authorizeJob: jest.fn().mockResolvedValue(undefined),+ authorizeRetry: jest.fn().mockResolvedValue(undefined),+ authorize: jest.fn().mockResolvedValue({}),+ resolveMessage: jest.fn().mockResolvedValue({+ sender: {+ userWorkspaceId: 'user-workspace-id',+ applicationId: null,+ },+ }),+ } as never,);return { service, threadRepository, messageQueueService, agentChatService };@@ -217,4 +231,17 @@ describe('AgentChatStreamingService.retryLastFailedTurn', () => {expect(result.messageId).toBe('kickoff-message-id');expect(result.turnId).toBe('kickoff-turn-id');});+ it('does not delete another participant’s output if the latest turn changes while claiming a retry', async () => {+ const { service, agentChatService, messageQueueService } = buildService();+ agentChatService.findLatestSentUserMessage+ .mockResolvedValueOnce({ id: 'user-message-id', turnId: 'turn-id' })+ .mockResolvedValueOnce({ id: 'another-message', turnId: 'another-turn' });+ await expect(+ service.retryLastFailedTurn(retryArguments),+ ).rejects.toMatchObject({ code: AiExceptionCode.NO_FAILED_TURN_TO_RETRY });+ expect(+ agentChatService.deleteAssistantMessagesForTurn,+ ).not.toHaveBeenCalled();+ expect(messageQueueService.add).not.toHaveBeenCalled();+ });});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.sender.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.sender.spec.tsnew file mode 100644index 00000000000..651ffd584b6--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.sender.spec.ts@@ -0,0 +1,167 @@+import {+ AiException,+ AiExceptionCode,+} from 'src/engine/metadata-modules/ai/ai.exception';+import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';+import {+ AuthException,+ AuthExceptionCode,+} from 'src/engine/core-modules/auth/auth.exception';++const queued = {+ id: 'message-b',+ senderUserWorkspaceId: 'participant-b',+ parts: [{ type: 'text', textContent: 'B’s request' }],+};+const build = () => {+ const threads = {+ findOne: jest.fn().mockResolvedValue({ id: 'thread' }),+ findOneOrFail: jest+ .fn()+ .mockResolvedValue({ id: 'thread', conversationSize: 0 }),+ update: jest.fn().mockResolvedValue({ affected: 1 }),+ };+ const queue = { add: jest.fn().mockResolvedValue(undefined) };+ const chat = {+ getQueuedMessages: jest.fn().mockResolvedValue([queued]),+ promoteQueuedMessage: jest.fn().mockResolvedValue('turn-b'),+ getMessagesForThread: jest.fn().mockResolvedValue([]),+ deleteQueuedMessage: jest.fn().mockResolvedValue(true),+ };+ const actors = {+ resolveMessage: jest.fn().mockResolvedValue({+ sender: { userWorkspaceId: 'participant-b', applicationId: null },+ }),+ authorize: jest.fn().mockResolvedValue({}),+ };+ const heartbeat = { markClaimed: jest.fn(), clear: jest.fn() };+ const service = new AgentChatStreamingService(+ threads as never,+ {} as never,+ queue as never,+ chat as never,+ { publish: jest.fn() } as never,+ {} as never,+ heartbeat as never,+ { incrementCounterBy: jest.fn() } as never,+ {} as never,+ actors as never,+ );+ return { service, threads, queue, chat, actors, heartbeat };+};+const args = { workspaceId: 'workspace', threadId: 'thread', hasTitle: true };++describe('Sender-aware queue draining', () => {+ it('starts the next turn as its saved sender', async () => {+ const { service, queue, chat } = build();+ await service.flushNextQueuedMessage(args);+ expect(chat.getMessagesForThread).toHaveBeenCalledWith(+ expect.objectContaining({ userWorkspaceId: 'participant-b' }),+ );+ expect(queue.add).toHaveBeenCalledWith(+ expect.any(String),+ expect.objectContaining({+ userWorkspaceId: 'participant-b',+ messageId: 'message-b',+ existingTurnId: 'turn-b',+ }),+ );+ });+ it('preserves a non-owner request when a worker cannot yet authorize thread access', async () => {+ const { service, actors, chat, queue } = build();+ actors.authorize.mockRejectedValue(+ new AiException('Thread not found', AiExceptionCode.THREAD_NOT_FOUND),+ );+ await service.flushNextQueuedMessage(args);+ expect(chat.deleteQueuedMessage).not.toHaveBeenCalled();+ expect(chat.promoteQueuedMessage).not.toHaveBeenCalled();+ expect(queue.add).not.toHaveBeenCalled();+ });++ it('removes revoked queued work before promoting or invoking it', async () => {+ const { service, actors, chat, queue } = build();+ actors.authorize.mockRejectedValue(+ new AuthException(+ 'Membership removed',+ AuthExceptionCode.UNAUTHENTICATED,+ ),+ );+ await service.flushNextQueuedMessage(args);+ expect(chat.deleteQueuedMessage).toHaveBeenCalledWith({+ workspaceId: 'workspace',+ messageId: 'message-b',+ });+ expect(chat.promoteQueuedMessage).not.toHaveBeenCalled();+ expect(queue.add).not.toHaveBeenCalled();+ });+ it('continues with an authorized participant after a revoked queue entry', async () => {+ const { service, actors, chat, queue } = build();+ chat.getQueuedMessages.mockResolvedValue([+ { ...queued, id: 'revoked' },+ queued,+ ]);+ actors.authorize.mockRejectedValueOnce(+ new AuthException(+ 'Membership removed',+ AuthExceptionCode.UNAUTHENTICATED,+ ),+ );+ await service.flushNextQueuedMessage(args);+ expect(chat.deleteQueuedMessage).toHaveBeenCalledWith({+ workspaceId: 'workspace',+ messageId: 'revoked',+ });+ expect(queue.add).toHaveBeenCalledWith(+ expect.any(String),+ expect.objectContaining({+ messageId: 'message-b',+ userWorkspaceId: 'participant-b',+ }),+ );+ });+ it('preserves the queue when authorization fails because of infrastructure', async () => {+ const { service, actors, chat, queue } = build();+ actors.authorize.mockRejectedValue(new Error('Database unavailable'));+ await expect(service.flushNextQueuedMessage(args)).rejects.toThrow(+ 'Database unavailable',+ );+ expect(chat.deleteQueuedMessage).not.toHaveBeenCalled();+ expect(queue.add).not.toHaveBeenCalled();+ });+ it('does not enqueue when another worker wins message promotion', async () => {+ const { service, chat, queue, heartbeat } = build();+ chat.promoteQueuedMessage.mockResolvedValue(null);+ await service.flushNextQueuedMessage(args);+ expect(queue.add).not.toHaveBeenCalled();+ expect(heartbeat.clear).toHaveBeenCalled();+ });+ it('excludes the owner’s hidden setup context from another participant’s execution', async () => {+ const { service, chat, threads, queue } = build();+ threads.findOneOrFail.mockResolvedValue({+ id: 'thread',+ conversationSize: 0,+ userWorkspaceId: 'owner',+ });+ chat.getMessagesForThread.mockResolvedValue([+ {+ id: 'hidden-owner',+ isHidden: true,+ senderUserWorkspaceId: 'owner',+ parts: [{ type: 'text', textContent: 'Owner private context' }],+ },+ {+ id: 'visible',+ role: 'user',+ createdAt: new Date(),+ parts: [{ type: 'text', textContent: 'Shared content' }],+ },+ ]);+ await service.flushNextQueuedMessage(args);+ expect(queue.add).toHaveBeenCalledWith(+ expect.any(String),+ expect.objectContaining({+ messages: [expect.objectContaining({ id: 'visible' })],+ }),+ );+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.tsindex 7037f61b425..fb85ea3f84c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts@@ -43,6 +43,7 @@ const buildService = ({ existingHiddenMessage = null as unknown } = {}) => {const ensureKickoff = (service: AgentChatService) =>service.ensureHiddenKickoffMessage({+ userWorkspaceId: 'user-workspace-id',threadId: THREAD_ID,workspaceId: WORKSPACE_ID,text: KICKOFF_TEXT,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.tsnew file mode 100644index 00000000000..3a368b68cb9--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service.ts@@ -0,0 +1,245 @@+import {+ workspaceAuthContextStorage,+ withWorkspaceAuthContext,+} from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';+import { Injectable } from '@nestjs/common';+import { PermissionFlagType } from 'twenty-shared/constants';+import { isDefined } from 'twenty-shared/utils';+import {+ AgentMessageEntity,+ AgentMessageRole,+ AgentMessageStatus,+} from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';+import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';+import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';+import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';+import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';+import { UserWorkspaceAuthContextService } from 'src/engine/core-modules/user-workspace/services/user-workspace-auth-context.service';+import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { resolveRolePermissionConfig } from 'src/engine/twenty-orm/utils/resolve-role-permission-config.util';+import { type AgentChatSender } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type';+import {+ AiException,+ AiExceptionCode,+} from 'src/engine/metadata-modules/ai/ai.exception';++@Injectable()+export class AgentChatActorService {+ constructor(+ @InjectAgentHistoryRepository('agentMessage')+ private readonly messages: AgentHistoryRepository<AgentMessageEntity>,+ @InjectAgentHistoryRepository('agentChatThread')+ private readonly threads: AgentHistoryRepository<AgentChatThreadEntity>,+ private readonly chatService: AgentChatService,+ private readonly userAuthContextService: UserWorkspaceAuthContextService,+ private readonly permissionsService: PermissionsService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {}++ async resolveMessage({+ workspaceId,+ threadId,+ messageId,+ turnId,+ }: {+ workspaceId: string;+ threadId: string;+ messageId?: string;+ turnId?: string;+ }) {+ if (!isDefined(messageId) && !isDefined(turnId)) {+ throw new AiException(+ 'Message identity required for execution',+ AiExceptionCode.MESSAGE_NOT_FOUND,+ );+ }+ const message = await this.messages.findOne(workspaceId, {+ where: {+ threadId,+ role: AgentMessageRole.USER,+ ...(isDefined(messageId) ? { id: messageId } : { turnId }),+ },+ order: { createdAt: 'ASC', id: 'ASC' },+ });+ if (+ !isDefined(message) ||+ (isDefined(turnId) && message.turnId !== turnId)+ ) {+ throw new AiException(+ 'Message not found',+ AiExceptionCode.MESSAGE_NOT_FOUND,+ );+ }+ // Only pre-attribution messages inherit the original participant. Never use+ // a worker's caller or the participant whose preceding turn drained the queue.+ const userWorkspaceId =+ message.senderUserWorkspaceId ??+ (+ await this.threads.findOneOrFail(workspaceId, {+ where: { id: threadId },+ })+ ).userWorkspaceId;+ const sender: AgentChatSender = {+ userWorkspaceId,+ applicationId: message.senderApplicationId ?? null,+ };+ return { message, sender };+ }++ async authorize({+ workspaceId,+ threadId,+ sender,+ }: {+ workspaceId: string;+ threadId: string;+ sender: AgentChatSender;+ }) {+ const authContext = await this.userAuthContextService.resolve({+ workspaceId,+ ...sender,+ });+ const thread = await withWorkspaceAuthContext(authContext, () =>+ this.chatService.getThreadById({+ workspaceId,+ threadId,+ userWorkspaceId: sender.userWorkspaceId,+ }),+ );+ if (isDefined(thread.deletedAt)) {+ throw new AiException(+ 'Thread is archived',+ AiExceptionCode.THREAD_NOT_FOUND,+ );+ }+ if (+ !(await this.permissionsService.userHasWorkspaceSettingPermission({+ workspaceId,+ userWorkspaceId: sender.userWorkspaceId,+ applicationId: sender.applicationId ?? undefined,+ setting: PermissionFlagType.AI,+ }))+ ) {+ throw new AiException(+ 'Chat execution is not permitted',+ AiExceptionCode.THREAD_NOT_FOUND,+ );+ }+ const { userWorkspaceRoleMap } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'userWorkspaceRoleMap',+ ]);+ const rolePermissionConfig = resolveRolePermissionConfig({+ authContext,+ userWorkspaceRoleMap,+ apiKeyRoleMap: {},+ });+ const roleId = userWorkspaceRoleMap[sender.userWorkspaceId];+ if (!isDefined(rolePermissionConfig) || !isDefined(roleId)) {+ throw new AiException(+ 'Chat execution is not permitted',+ AiExceptionCode.THREAD_NOT_FOUND,+ );+ }+ return { authContext, rolePermissionConfig, roleId };+ }++ async authorizeQuestionAnswer({+ workspaceId,+ threadId,+ messageId,+ }: {+ workspaceId: string;+ threadId: string;+ messageId: string;+ }): Promise<void> {+ const question = await this.messages.findOne(workspaceId, {+ where: { id: messageId, threadId, role: AgentMessageRole.ASSISTANT },+ select: ['turnId'],+ });+ if (!isDefined(question?.turnId)) {+ throw new AiException(+ 'Question turn not found',+ AiExceptionCode.MESSAGE_NOT_FOUND,+ );+ }+ const { sender } = await this.resolveMessage({+ workspaceId,+ threadId,+ turnId: question.turnId,+ });+ const request = workspaceAuthContextStorage.getStore();+ if (+ !isDefined(request) ||+ !isUserAuthContext(request) ||+ request.workspace.id !== workspaceId ||+ (request.application?.id ?? null) !== sender.applicationId+ ) {+ throw new AiException(+ 'Answer requires the original application context',+ AiExceptionCode.INVALID_QUESTION_ANSWER,+ );+ }+ }++ async authorizeRetry(args: {+ workspaceId: string;+ threadId: string;+ messageId: string;+ userWorkspaceId: string;+ }) {+ const execution = await this.authorizeJob(args);+ const request = workspaceAuthContextStorage.getStore();+ if (+ isDefined(request) &&+ isUserAuthContext(request) &&+ (request.workspace.id !== args.workspaceId ||+ request.userWorkspaceId !== execution.sender.userWorkspaceId ||+ (request.application?.id ?? null) !== execution.sender.applicationId)+ ) {+ throw new AiException(+ 'Retry requires the original sender context',+ AiExceptionCode.MESSAGE_NOT_FOUND,+ );+ }+ return execution;+ }++ async authorizeJob({+ workspaceId,+ threadId,+ messageId,+ turnId,+ userWorkspaceId,+ }: {+ workspaceId: string;+ threadId: string;+ messageId?: string;+ turnId?: string;+ userWorkspaceId: string;+ }) {+ const { message, sender } = await this.resolveMessage({+ workspaceId,+ threadId,+ messageId,+ turnId,+ });+ if (+ sender.userWorkspaceId !== userWorkspaceId ||+ message.status !== AgentMessageStatus.SENT+ ) {+ throw new AiException(+ 'Message sender does not match execution',+ AiExceptionCode.MESSAGE_NOT_FOUND,+ );+ }+ const authorization = await this.authorize({+ workspaceId,+ threadId,+ sender,+ });+ return { message, sender, authorization };+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.tsindex 4f3059feade..48fa4f0f3cc 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts@@ -1,3 +1,7 @@+import { isNonEmptyString } from '@sniptt/guards';+import { AuthException } from 'src/engine/core-modules/auth/auth.exception';+import { PermissionsException } from 'src/engine/metadata-modules/permissions/permissions.exception';+import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';import { AgentChatStreamRecoveryService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';@@ -71,6 +75,7 @@ export class AgentChatStreamingService {private readonly streamHeartbeatService: AgentChatStreamHeartbeatService,private readonly metricsService: MetricsService,private readonly streamRecoveryService: AgentChatStreamRecoveryService,+ private readonly actorService: AgentChatActorService,) {}async reapDeadStream({@@ -173,12 +178,11 @@ export class AgentChatStreamingService {});if (hasQueuedBacklog) {- await this.flushNextQueuedMessage(+ await this.flushNextQueuedMessage({threadId,- userWorkspaceId,- workspace.id,- !!thread.title,- );+ workspaceId: workspace.id,+ hasTitle: !!thread.title,+ });}return { queued: true, messageId: queuedMessage.id };@@ -197,6 +201,7 @@ export class AgentChatStreamingService {const savedUserMessage = await this.agentChatService.addMessage({threadId,+ userWorkspaceId,id: messageId,uiMessage: {role: AgentMessageRole.USER,@@ -228,10 +233,10 @@ export class AgentChatStreamingService {browsingContext,modelId,lastUserMessageText: text,- lastUserMessageParts: userMessageParts,hasTitle: !!thread.title,conversationSizeTokens: thread.conversationSize,existingTurnId: savedUserMessage.turnId ?? undefined,+ messageId: savedUserMessage.id,},);@@ -294,12 +299,11 @@ export class AgentChatStreamingService {if (hasConversationMessages) {await this.releaseStreamClaim(threadId, workspace.id, streamId);- await this.flushNextQueuedMessage(+ await this.flushNextQueuedMessage({threadId,- userWorkspaceId,- workspace.id,- !!thread.title,- );+ workspaceId: workspace.id,+ hasTitle: !!thread.title,+ });return null;}@@ -309,6 +313,7 @@ export class AgentChatStreamingService {threadId,workspaceId: workspace.id,text,+ userWorkspaceId,});const messages = await this.loadMessagesFromDB(@@ -337,10 +342,10 @@ export class AgentChatStreamingService {browsingContext: null,modelId,lastUserMessageText: text,- lastUserMessageParts: [{ type: 'text' as const, text }],hasTitle: !!thread.title,conversationSizeTokens: thread.conversationSize,existingTurnId: turnId,+ messageId,},);@@ -394,6 +399,22 @@ export class AgentChatStreamingService {);}+ const latestMessage = await this.agentChatService.findLatestSentUserMessage(+ { threadId, workspaceId: workspace.id },+ );+ if (!isDefined(latestMessage)) {+ throw new AiException(+ 'There is no failed turn to retry',+ AiExceptionCode.NO_FAILED_TURN_TO_RETRY,+ );+ }+ await this.actorService.authorizeRetry({+ workspaceId: workspace.id,+ threadId,+ messageId: latestMessage.id,+ userWorkspaceId,+ });+const streamId = generateId();const claimed = await this.tryClaimStream({@@ -417,13 +438,24 @@ export class AgentChatStreamingService {workspaceId: workspace.id,});- if (!isDefined(lastUserMessage) || !isDefined(lastUserMessage.turnId)) {+ if (+ !isDefined(lastUserMessage) ||+ !isDefined(lastUserMessage.turnId) ||+ lastUserMessage.id !== latestMessage.id+ ) {throw new AiException('There is no failed turn to retry on this thread',AiExceptionCode.NO_FAILED_TURN_TO_RETRY,);}+ await this.actorService.authorizeRetry({+ workspaceId: workspace.id,+ threadId,+ messageId: lastUserMessage.id,+ userWorkspaceId,+ });+await this.agentChatService.deleteAssistantMessagesForTurn({turnId: lastUserMessage.turnId,workspaceId: workspace.id,@@ -459,10 +491,10 @@ export class AgentChatStreamingService {browsingContext: null,modelId,lastUserMessageText: textPart?.text ?? '',- lastUserMessageParts: retriedMessage.parts,hasTitle: !!thread.title,conversationSizeTokens: thread.conversationSize,existingTurnId: lastUserMessage.turnId,+ messageId: lastUserMessage.id,},);@@ -507,6 +539,24 @@ export class AgentChatStreamingService {modelId?: string;fileAttachments?: AiChatFileAttachment[];}): Promise<{ streamId: string; turnId: string | null }> {+ if (+ !answers.some(+ (answer) =>+ isNonEmptyString(answer.freeText?.trim()) ||+ isNonEmptyArray(answer.selectedOptionIndices),+ ) &&+ !isNonEmptyArray(fileAttachments)+ ) {+ throw new AiException(+ 'Provide an answer or attachment',+ AiExceptionCode.INVALID_QUESTION_ANSWER,+ );+ }+ await this.actorService.authorizeQuestionAnswer({+ workspaceId: workspace.id,+ threadId,+ messageId,+ });const thread = await this.threadRepository.findOne(workspace.id, {where: { id: threadId },select: ['id', 'activeStreamId'],@@ -521,6 +571,7 @@ export class AgentChatStreamingService {await this.streamHeartbeatService.markClaimed(streamId);let resolved: {+ answerText: string;turnId: string | null;rollback: { partId: string; previousOutput: Record<string, unknown> };};@@ -538,7 +589,7 @@ export class AgentChatStreamingService {throw error;}- let attachmentMessageId: string | null = null;+ let answerMessageId: string | null = null;try {const fileParts = await this.buildFilePartsFromAttachments(@@ -546,19 +597,23 @@ export class AgentChatStreamingService {workspace.id,);- if (isNonEmptyArray(fileParts)) {- const attachmentMessage = await this.agentChatService.addMessage({- threadId,- uiMessage: {- role: AgentMessageRole.USER,- parts: fileParts,- },- turnId: resolved.turnId ?? undefined,- workspaceId: workspace.id,- });-- attachmentMessageId = attachmentMessage.id;- }+ const answerMessage = await this.agentChatService.addMessage({+ threadId,+ userWorkspaceId,+ uiMessage: {+ role: AgentMessageRole.USER,+ parts: [+ {+ type: 'text',+ text: resolved.answerText,+ },+ ...fileParts,+ ],+ },+ workspaceId: workspace.id,+ });+ answerMessageId = answerMessage.id;+ resolved.turnId = answerMessage.turnId;await this.enqueueResumeStream({threadId,@@ -567,12 +622,13 @@ export class AgentChatStreamingService {turnId: resolved.turnId,streamId,modelId,+ messageId: answerMessage.id,});} catch (error) {- if (isDefined(attachmentMessageId)) {+ if (isDefined(answerMessageId)) {await this.agentChatService.deleteMessage({- messageId: attachmentMessageId,+ messageId: answerMessageId,workspaceId: workspace.id,}).catch(() => {});@@ -606,7 +662,9 @@ export class AgentChatStreamingService {turnId,streamId,modelId,+ messageId,}: {+ messageId: string;threadId: string;userWorkspaceId: string;workspace: WorkspaceEntity;@@ -635,21 +693,23 @@ export class AgentChatStreamingService {browsingContext: null,modelId,lastUserMessageText: '',- lastUserMessageParts: [],hasTitle: !!thread.title,conversationSizeTokens: thread.conversationSize,existingTurnId: turnId ?? undefined,- isResume: true,+ messageId,},);}- async flushNextQueuedMessage(- threadId: string,- userWorkspaceId: string,- workspaceId: string,- hasTitle: boolean,- ): Promise<void> {+ async flushNextQueuedMessage({+ threadId,+ workspaceId,+ hasTitle,+ }: {+ threadId: string;+ workspaceId: string;+ hasTitle: boolean;+ }): Promise<void> {const threadStatus = await this.threadRepository.findOne(workspaceId, {where: { id: threadId },select: ['id', 'deletedAt', 'pendingQuestionMessageId'],@@ -668,27 +728,61 @@ export class AgentChatStreamingService {workspaceId,});- const nextQueued = queuedMessages[0];-- if (!nextQueued) {+ let nextQueued: (typeof queuedMessages)[number] | undefined;+ let userWorkspaceId: string | undefined;+ for (const candidate of queuedMessages) {+ try {+ const { sender } = await this.actorService.resolveMessage({+ workspaceId,+ threadId,+ messageId: candidate.id,+ });+ await this.actorService.authorize({ workspaceId, threadId, sender });+ nextQueued = candidate;+ userWorkspaceId = sender.userWorkspaceId;+ break;+ } catch (error) {+ // A rolling upgrade can temporarily leave a worker with an older access+ // policy. Preserve the request until a worker can authorize it.+ if (+ error instanceof AiException &&+ error.code === AiExceptionCode.THREAD_NOT_FOUND+ ) {+ continue;+ }++ if (+ !(error instanceof AuthException) &&+ !(error instanceof PermissionsException) &&+ !(+ error instanceof AiException &&+ error.code === AiExceptionCode.MESSAGE_NOT_FOUND+ )+ ) {+ throw error;+ }+ await this.agentChatService.deleteQueuedMessage({+ messageId: candidate.id,+ workspaceId,+ });+ await this.eventPublisherService.publish({+ threadId,+ workspaceId,+ event: { type: 'queue-updated' },+ });+ }+ }+ if (!isDefined(nextQueued) || !isDefined(userWorkspaceId)) {return;}const textPart = nextQueued.parts?.find((part) => part.type === 'text');const messageText = textPart?.textContent ?? '';- const fileParts = (nextQueued.parts ?? [])- .filter((part) => part.type === 'file')- .map(- (part): ExtendedFileUIPart => ({- type: 'file',- mediaType: part.file?.mimeType ?? 'application/octet-stream',- filename: part.fileFilename ?? '',- url: '',- fileId: part.fileId ?? '',- }),- );+ const hasFileAttachment = (nextQueued.parts ?? []).some(+ (part) => part.type === 'file',+ );- if (messageText === '' && fileParts.length === 0) {+ if (messageText === '' && !hasFileAttachment) {await this.agentChatService.deleteQueuedMessage({messageId: nextQueued.id,workspaceId,@@ -742,13 +836,6 @@ export class AgentChatStreamingService {}),]);- const lastUserMessageParts: ExtendedUIMessagePart[] = [- ...(messageText !== ''- ? [{ type: 'text' as const, text: messageText }]- : []),- ...fileParts,- ];-await this.messageQueueService.add<StreamAgentChatJobData>(STREAM_AGENT_CHAT_JOB_NAME,{@@ -759,10 +846,10 @@ export class AgentChatStreamingService {messages: uiMessages,browsingContext: null,lastUserMessageText: messageText,- lastUserMessageParts,hasTitle,conversationSizeTokens: thread.conversationSize,existingTurnId: turnId,+ messageId: nextQueued.id,},);} catch (error) {@@ -814,12 +901,20 @@ export class AgentChatStreamingService {includeHidden: true,});+ const thread = allMessages.some((message) => message.isHidden)+ ? await this.threadRepository.findOneOrFail(workspaceId, {+ where: { id: threadId },+ })+ : undefined;// A hidden row without parts is an interrupted seed attempt: it carries no context and// would otherwise reach the model as an empty user message.const filteredMessages = allMessages.filter((message) =>message.status !== AgentMessageStatus.QUEUED &&- (!message.isHidden || isNonEmptyArray(message.parts)),+ (!message.isHidden ||+ (isNonEmptyArray(message.parts) &&+ (message.senderUserWorkspaceId ?? thread?.userWorkspaceId) ===+ userWorkspaceId)),);return Promise.all(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.tsindex a9f916581f7..9e523657c58 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts@@ -1,3 +1,6 @@+import { isNonEmptyString } from '@sniptt/guards';+import { workspaceAuthContextStorage } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';+import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-auth-context.guard';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { Injectable, Logger } from '@nestjs/common';@@ -224,6 +227,27 @@ export class AgentChatService {return result?.last_message_at ?? null;}+ private getMessageSenderValues({+ workspaceId,+ userWorkspaceId,+ }: {+ workspaceId: string;+ userWorkspaceId?: string;+ }) {+ const context = workspaceAuthContextStorage.getStore();+ const applicationId =+ isDefined(context) &&+ isUserAuthContext(context) &&+ context.workspace.id === workspaceId &&+ context.userWorkspaceId === userWorkspaceId+ ? context.application?.id+ : undefined;+ return {+ senderUserWorkspaceId: userWorkspaceId ?? null,+ senderApplicationId: applicationId ?? null,+ };+ }+async addMessage({threadId,uiMessage,@@ -233,6 +257,7 @@ export class AgentChatService {workspaceId,isHidden,processedAt,+ userWorkspaceId,}: {threadId: string;uiMessage: Omit<ExtendedUIMessage, 'id'>;@@ -243,6 +268,7 @@ export class AgentChatService {workspaceId: string;isHidden?: boolean;processedAt?: Date;+ userWorkspaceId?: string;}) {let actualTurnId = turnId;@@ -262,6 +288,7 @@ export class AgentChatService {role: uiMessage.role as AgentMessageRole,agentId: agentId ?? null,processedAt: processedAt ?? new Date(),+ ...this.getMessageSenderValues({ workspaceId, userWorkspaceId }),...(isDefined(isHidden) ? { isHidden } : {}),};@@ -294,6 +321,8 @@ export class AgentChatService {role: uiMessage.role as AgentMessageRole,agentId: agentId ?? null,processedAt: messageValues.processedAt,+ senderUserWorkspaceId: messageValues.senderUserWorkspaceId,+ senderApplicationId: messageValues.senderApplicationId,workspaceId,} as AgentMessageEntity;}@@ -430,10 +459,12 @@ export class AgentChatService {threadId,workspaceId,text,+ userWorkspaceId,}: {threadId: string;workspaceId: string;text: string;+ userWorkspaceId: string;}): Promise<{ id: string; turnId: string }> {const existingKickoffMessage = await this.messageRepository.findOne(workspaceId,@@ -468,6 +499,7 @@ export class AgentChatService {const savedMessage = await this.addMessage({threadId,workspaceId,+ userWorkspaceId,uiMessage: {role: AgentMessageRole.USER,parts: [{ type: 'text' as const, text }],@@ -507,6 +539,7 @@ export class AgentChatService {role: AgentMessageRole.USER,agentId: null,status: AgentMessageStatus.QUEUED,+ ...this.getMessageSenderValues({ workspaceId, userWorkspaceId }),};const insertResult = await this.messageRepository.insert(@@ -676,6 +709,7 @@ export class AgentChatService {streamId: string;workspaceId: string;}): Promise<{+ answerText: string;turnId: string | null;rollback: { partId: string; previousOutput: Record<string, unknown> };}> {@@ -716,7 +750,11 @@ export class AgentChatService {const claim = await this.threadRepository.update(workspaceId,- { id: threadId, pendingQuestionMessageId: messageId },+ {+ id: threadId,+ pendingQuestionMessageId: messageId,+ activeStreamId: IsNull(),+ },{pendingQuestionMessageId: null,activeStreamId: streamId,@@ -768,7 +806,20 @@ export class AgentChatService {throw error;}+ const answerText = answers+ .map((answer) => {+ const question = questions[answer.questionIndex];+ const value = isNonEmptyString(answer.freeText)+ ? answer.freeText+ : answer.selectedOptionIndices+ .map((optionIndex) => question.options[optionIndex].label)+ .join(', ');+ return `${question.question}\n${value}`;+ })+ .join('\n\n');+return {+ answerText,turnId: message.turnId,rollback: { partId: pendingPart.id, previousOutput },};@@ -1152,10 +1203,12 @@ export class AgentChatService {threadId,messageContent,workspaceId,+ userWorkspaceId,}: {threadId: string;messageContent: string;workspaceId: string;+ userWorkspaceId: string;}): Promise<string | null> {const thread = await this.threadRepository.findOne(workspaceId, {where: { id: threadId },@@ -1168,7 +1221,7 @@ export class AgentChatService {const title = await this.titleGenerationService.generateThreadTitle(messageContent,workspaceId,- thread.userWorkspaceId,+ userWorkspaceId,);await this.threadRepository.update(diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.tsindex 3a0d2bcfc27..b1a81971547 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/chat-execution.service.ts@@ -1,3 +1,5 @@+import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';+import { type ToolContext } from 'src/engine/core-modules/tool-provider/types/tool-context.type';import { Injectable, Logger } from '@nestjs/common';import {@@ -103,6 +105,7 @@ export type ChatExecutionOptions = {threadId?: string;streamId?: string;turnId?: string;+ messageId?: string;messages: ExtendedUIMessage[];browsingContext: BrowsingContextType | null;onCodeExecutionUpdate?: CodeExecutionStreamEmitter;@@ -135,6 +138,7 @@ export class ChatExecutionService {private readonly nativeToolBinder: NativeToolBinderService,private readonly messagePruningService: MessagePruningService,private readonly metricsService: MetricsService,+ private readonly chatActorService: AgentChatActorService,) {}async streamChat({@@ -143,6 +147,7 @@ export class ChatExecutionService {threadId,streamId,turnId,+ messageId,messages,browsingContext,onCodeExecutionUpdate,@@ -151,6 +156,31 @@ export class ChatExecutionService {abortSignal,conversationSizeTokens,}: ChatExecutionOptions): Promise<ChatExecutionResult> {+ if (!isDefined(threadId)) {+ throw new AiException(+ 'Chat thread identity required',+ AiExceptionCode.THREAD_NOT_FOUND,+ );+ }+ const { sender, authorization } = await this.chatActorService.authorizeJob({+ workspaceId: workspace.id,+ threadId,+ messageId,+ turnId,+ userWorkspaceId,+ });+ const resolveExecutionContext = async (): Promise<ToolContext> => {+ const authorization = await this.chatActorService.authorize({+ workspaceId: workspace.id,+ threadId,+ sender,+ });+ return {+ ...toolContext,+ ...authorization,+ resolveExecutionContext: undefined,+ };+ };const { actorContext, roleId, userId, userContext } =await this.agentActorContextService.buildUserAndAgentActorContext(userWorkspaceId,@@ -159,15 +189,16 @@ export class ChatExecutionService {const locale = userContext.locale as keyof typeof APP_LOCALES;- const toolContext = {+ const toolContext: ToolContext = {workspaceId: workspace.id,- roleId,actorContext,userId,userWorkspaceId,threadId,locale,onCodeExecutionUpdate,+ ...authorization,+ resolveExecutionContext,};const toolCatalog = await this.toolRegistry.buildToolIndex(@@ -178,6 +209,7 @@ export class ChatExecutionService {userWorkspaceId,locale,excludeTools: AI_CHAT_EXCLUDED_TOOL_NAMES,+ rolePermissionConfig: toolContext.rolePermissionConfig,},);@@ -535,7 +567,12 @@ export class ChatExecutionService {),promptCacheKey: threadId,}),- prepareStep: ({ messages }) => {+ prepareStep: async ({ messages }) => {+ await this.chatActorService.authorize({+ workspaceId: workspace.id,+ threadId,+ sender,+ });stepStartedAt = performance.now();return {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type.tsnew file mode 100644index 00000000000..83b96003c9f--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type.ts@@ -0,0 +1,4 @@+export type AgentChatSender = {+ userWorkspaceId: string;+ applicationId: string | null;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.tsindex 2f68e14b658..7afbabafbe0 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/__tests__/agent-history-storage.service.spec.ts@@ -6,6 +6,7 @@ import { AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-hidescribe('AgentHistoryStorageService', () => {const workspaceId = '20202020-1111-4111-8111-111111111111';const runner = {+ hasSchema: jest.fn(),connect: jest.fn(),startTransaction: jest.fn(),commitTransaction: jest.fn(),@@ -73,4 +74,61 @@ describe('AgentHistoryStorageService', () => {service.readState(runner as unknown as QueryRunner, workspaceId),).rejects.toThrow('Invalid agent history storage state');});+ it.each([+ {+ hasSchema: false,+ storage: 'core',+ migration: undefined,+ history: [],+ empty: true,+ },+ {+ hasSchema: true,+ storage: 'core',+ migration: undefined,+ history: [],+ empty: false,+ },+ {+ hasSchema: false,+ storage: 'workspace',+ migration: undefined,+ history: [],+ empty: false,+ },+ {+ hasSchema: false,+ storage: 'core',+ migration: {+ phase: 'copying',+ target: 'workspace',+ tableIndex: 0,+ lastId: null,+ },+ history: [],+ empty: false,+ },+ {+ hasSchema: false,+ storage: 'core',+ migration: undefined,+ history: [{ exists: 1 }],+ empty: false,+ },+ ])('recognizes only empty unprovisioned workspaces: %j', async (scenario) => {+ runner.hasSchema.mockResolvedValue(scenario.hasSchema);+ runner.query+ .mockResolvedValueOnce([+ {+ workspaceId,+ type: 'CONFIG_VARIABLE',+ value: { storage: scenario.storage, migration: scenario.migration },+ },+ ])+ .mockResolvedValueOnce(scenario.history);+ await expect(+ service.isEmptyUnprovisionedWorkspace(workspaceId),+ ).resolves.toBe(scenario.empty);+ expect(runner.release).toHaveBeenCalledTimes(1);+ });});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.tsindex ccdf492bd2e..476ca51a2de 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service.ts@@ -1,3 +1,5 @@+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { AGENT_HISTORY_OBJECT_NAMES } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-history-object-names.constant';import { AgentHistoryStorageException } from 'src/engine/metadata-modules/ai/ai-history/exceptions/agent-history-storage.exception';import { type AgentHistoryObjectName } from 'src/engine/metadata-modules/ai/ai-history/types/agent-history-object-name.type';import { Injectable, ServiceUnavailableException } from '@nestjs/common';@@ -23,6 +25,30 @@ export type AgentHistoryStorageContext = {export class AgentHistoryStorageService {constructor(@InjectDataSource() private readonly dataSource: DataSource) {}+ async isEmptyUnprovisionedWorkspace(workspaceId: string): Promise<boolean> {+ const runner = this.dataSource.createQueryRunner('master');+ try {+ await runner.connect();+ if (await runner.hasSchema(getWorkspaceSchemaName(workspaceId))) {+ return false;+ }+ const state = await this.readState(runner, workspaceId);+ if (state.storage === 'workspace' || isDefined(state.migration)) {+ return false;+ }+ const history = await runner.query(+ `SELECT 1 WHERE ${AGENT_HISTORY_OBJECT_NAMES.map(+ (name) =>+ `EXISTS (SELECT 1 FROM core."${name}" WHERE "workspaceId" = $1)`,+ ).join(' OR ')}`,+ [workspaceId],+ );+ return !isNonEmptyArray(history);+ } finally {+ await runner.release();+ }+ }+async run<TResult>(workspaceId: string,work: (context: AgentHistoryStorageContext) => Promise<TResult>,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.tsindex 247dd009331..99256d39e74 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity.ts@@ -16,6 +16,8 @@ export class AgentMessageWorkspaceEntity extends BaseWorkspaceEntity {threadId: string;turnId: string | null;agentId: string | null;+ senderUserWorkspaceId: string | null;+ senderApplicationId: string | null;role: AgentMessageRole;status: AgentMessageStatus;isHidden: boolean;diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snapindex 18537ab88ec..34f70766441 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap@@ -83,118 +83,124 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"id": "00000000-0000-0000-0000-000000001022",},"isHidden": {- "id": "00000000-0000-0000-0000-000000001029",+ "id": "00000000-0000-0000-0000-000000001031",},"parts": {- "id": "00000000-0000-0000-0000-000000001033",+ "id": "00000000-0000-0000-0000-000000001035",},"processedAt": {- "id": "00000000-0000-0000-0000-000000001030",+ "id": "00000000-0000-0000-0000-000000001032",},"role": {+ "id": "00000000-0000-0000-0000-000000001029",+ },+ "senderApplicationId": {+ "id": "00000000-0000-0000-0000-000000001028",+ },+ "senderUserWorkspaceId": {"id": "00000000-0000-0000-0000-000000001027",},"status": {- "id": "00000000-0000-0000-0000-000000001028",+ "id": "00000000-0000-0000-0000-000000001030",},"thread": {- "id": "00000000-0000-0000-0000-000000001031",+ "id": "00000000-0000-0000-0000-000000001033",},"turn": {- "id": "00000000-0000-0000-0000-000000001032",+ "id": "00000000-0000-0000-0000-000000001034",},"updatedAt": {"id": "00000000-0000-0000-0000-000000001024",},},- "id": "00000000-0000-0000-0000-000000001034",+ "id": "00000000-0000-0000-0000-000000001036","views": undefined,},"agentMessagePart": {"fields": {"createdAt": {- "id": "00000000-0000-0000-0000-000000001036",+ "id": "00000000-0000-0000-0000-000000001038",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001038",+ "id": "00000000-0000-0000-0000-000000001040",},"errorDetails": {- "id": "00000000-0000-0000-0000-000000001050",+ "id": "00000000-0000-0000-0000-000000001052",},"errorMessage": {- "id": "00000000-0000-0000-0000-000000001049",+ "id": "00000000-0000-0000-0000-000000001051",},"fileFilename": {- "id": "00000000-0000-0000-0000-000000001058",+ "id": "00000000-0000-0000-0000-000000001060",},"fileId": {- "id": "00000000-0000-0000-0000-000000001059",+ "id": "00000000-0000-0000-0000-000000001061",},"id": {- "id": "00000000-0000-0000-0000-000000001035",+ "id": "00000000-0000-0000-0000-000000001037",},"message": {- "id": "00000000-0000-0000-0000-000000001061",+ "id": "00000000-0000-0000-0000-000000001063",},"orderIndex": {- "id": "00000000-0000-0000-0000-000000001039",+ "id": "00000000-0000-0000-0000-000000001041",},"providerExecuted": {- "id": "00000000-0000-0000-0000-000000001048",+ "id": "00000000-0000-0000-0000-000000001050",},"providerMetadata": {- "id": "00000000-0000-0000-0000-000000001060",+ "id": "00000000-0000-0000-0000-000000001062",},"reasoningContent": {- "id": "00000000-0000-0000-0000-000000001042",+ "id": "00000000-0000-0000-0000-000000001044",},"sourceDocumentFilename": {- "id": "00000000-0000-0000-0000-000000001057",+ "id": "00000000-0000-0000-0000-000000001059",},"sourceDocumentMediaType": {- "id": "00000000-0000-0000-0000-000000001055",+ "id": "00000000-0000-0000-0000-000000001057",},"sourceDocumentSourceId": {- "id": "00000000-0000-0000-0000-000000001054",+ "id": "00000000-0000-0000-0000-000000001056",},"sourceDocumentTitle": {- "id": "00000000-0000-0000-0000-000000001056",+ "id": "00000000-0000-0000-0000-000000001058",},"sourceUrlSourceId": {- "id": "00000000-0000-0000-0000-000000001051",+ "id": "00000000-0000-0000-0000-000000001053",},"sourceUrlTitle": {- "id": "00000000-0000-0000-0000-000000001053",+ "id": "00000000-0000-0000-0000-000000001055",},"sourceUrlUrl": {- "id": "00000000-0000-0000-0000-000000001052",+ "id": "00000000-0000-0000-0000-000000001054",},"state": {- "id": "00000000-0000-0000-0000-000000001047",+ "id": "00000000-0000-0000-0000-000000001049",},"textContent": {- "id": "00000000-0000-0000-0000-000000001041",+ "id": "00000000-0000-0000-0000-000000001043",},"toolCallId": {- "id": "00000000-0000-0000-0000-000000001044",+ "id": "00000000-0000-0000-0000-000000001046",},"toolInput": {- "id": "00000000-0000-0000-0000-000000001045",+ "id": "00000000-0000-0000-0000-000000001047",},"toolName": {- "id": "00000000-0000-0000-0000-000000001043",+ "id": "00000000-0000-0000-0000-000000001045",},"toolOutput": {- "id": "00000000-0000-0000-0000-000000001046",+ "id": "00000000-0000-0000-0000-000000001048",},"type": {- "id": "00000000-0000-0000-0000-000000001040",+ "id": "00000000-0000-0000-0000-000000001042",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001037",+ "id": "00000000-0000-0000-0000-000000001039",},},- "id": "00000000-0000-0000-0000-000000001062",+ "id": "00000000-0000-0000-0000-000000001064","views": undefined,},"agentTurn": {@@ -230,28 +236,28 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object"agentTurnEvaluation": {"fields": {"comment": {- "id": "00000000-0000-0000-0000-000000001068",+ "id": "00000000-0000-0000-0000-000000001070",},"createdAt": {- "id": "00000000-0000-0000-0000-000000001064",+ "id": "00000000-0000-0000-0000-000000001066",},"deletedAt": {- "id": "00000000-0000-0000-0000-000000001066",+ "id": "00000000-0000-0000-0000-000000001068",},"id": {- "id": "00000000-0000-0000-0000-000000001063",+ "id": "00000000-0000-0000-0000-000000001065",},"score": {- "id": "00000000-0000-0000-0000-000000001067",+ "id": "00000000-0000-0000-0000-000000001069",},"turn": {- "id": "00000000-0000-0000-0000-000000001069",+ "id": "00000000-0000-0000-0000-000000001071",},"updatedAt": {- "id": "00000000-0000-0000-0000-000000001065",+ "id": "00000000-0000-0000-0000-000000001067",},},- "id": "00000000-0000-0000-0000-000000001070",+ "id": "00000000-0000-0000-0000-000000001072","views": undefined,},"attachment": {diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.tsindex b4056b4e0d0..2c669b611cf 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util.ts@@ -63,6 +63,60 @@ export const buildAgentMessageStandardFlatFieldMetadatas = (writability: MetadataWritability.SYSTEM,isAuditLogged: false,},+ senderUserWorkspaceId: {+ ...createStandardFieldFlatMetadata({+ ...args,+ context: {+ fieldName: 'senderUserWorkspaceId',+ type: FieldMetadataType.UUID,+ label: i18nLabel(+ msg({+ message: 'Sender workspace membership ID',+ context: 'fieldMetadata.label',+ }),+ ),+ description: i18nLabel(+ msg({+ message: 'Sender workspace membership ID',+ context: 'fieldMetadata.description',+ }),+ ),+ icon: 'IconUser',+ isSystem: true,+ isUIEditable: false,+ isNullable: true,+ },+ }),+ writability: MetadataWritability.SYSTEM,+ isAuditLogged: false,+ },+ senderApplicationId: {+ ...createStandardFieldFlatMetadata({+ ...args,+ context: {+ fieldName: 'senderApplicationId',+ type: FieldMetadataType.UUID,+ label: i18nLabel(+ msg({+ message: 'Sender application ID',+ context: 'fieldMetadata.label',+ }),+ ),+ description: i18nLabel(+ msg({+ message: 'Sender application ID',+ context: 'fieldMetadata.description',+ }),+ ),+ icon: 'IconUser',+ isSystem: true,+ isUIEditable: false,+ isNullable: true,+ },+ }),+ writability: MetadataWritability.SYSTEM,+ isAuditLogged: false,+ },role: {...createStandardFieldFlatMetadata({...args,diff --git a/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.tsnew file mode 100644index 00000000000..a6d6f0d6572--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/chat-sender-execution.integration-spec.ts@@ -0,0 +1,226 @@+import { AddChatMessageSenderFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender';+import { randomUUID } from 'node:crypto';+import { parse } from 'graphql';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { type AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';+import { type AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';+import { type AgentHistoryStorageService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-storage.service';+import { type AttributeChatMessageSendersCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command';+import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';+import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { USER_WORKSPACE_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-user-workspaces.util';++const workspaceId = SEED_APPLE_WORKSPACE_ID;+const userWorkspaceId = USER_WORKSPACE_DATA_SEED_IDS.JANE;+const otherUserWorkspaceId = USER_WORKSPACE_DATA_SEED_IDS.JONY;++describe('Persisted chat senders', () => {+ let chat: AgentChatService;+ let actors: AgentChatActorService;+ const threadId = randomUUID();+ beforeAll(async () => {+ chat = getAppProviderByClassName<AgentChatService>('AgentChatService');+ actors = getAppProviderByClassName<AgentChatActorService>(+ 'AgentChatActorService',+ );+ await chat.createThread({+ workspaceId,+ userWorkspaceId,+ id: threadId,+ title: 'Sender regression',+ });+ });+ afterAll(async () => {+ await chat.hardDeleteThread({ workspaceId, userWorkspaceId, threadId });+ });++ it('persists the authenticated user on ordinary and queued messages', async () => {+ const message = await chat.addMessage({+ workspaceId,+ threadId,+ userWorkspaceId,+ uiMessage: {+ role: AgentMessageRole.USER,+ parts: [{ type: 'text', text: 'Hello' }],+ },+ });+ const queued = await chat.queueMessage({+ workspaceId,+ threadId,+ userWorkspaceId,+ text: 'Next',+ });+ for (const messageId of [message.id, queued.id]) {+ await expect(+ actors.resolveMessage({ workspaceId, threadId, messageId }),+ ).resolves.toMatchObject({+ sender: { userWorkspaceId, applicationId: null },+ });+ }+ const response = await makeMetadataAPIRequest({+ query: parse(+ `query($threadId: UUID!) { chatMessages(threadId: $threadId) { id senderUserWorkspaceId } }`,+ ),+ variables: { threadId },+ });+ expect(response.body.errors).toBeUndefined();+ expect(response.body.data.chatMessages).toEqual(+ expect.arrayContaining([+ { id: message.id, senderUserWorkspaceId: userWorkspaceId },+ { id: queued.id, senderUserWorkspaceId: userWorkspaceId },+ ]),+ );+ await expect(+ actors.authorizeJob({+ workspaceId,+ threadId,+ messageId: message.id,+ turnId: message.turnId!,+ userWorkspaceId,+ }),+ ).resolves.toMatchObject({ sender: { userWorkspaceId } });+ await expect(+ actors.authorizeJob({+ workspaceId,+ threadId,+ messageId: message.id,+ userWorkspaceId: otherUserWorkspaceId,+ }),+ ).rejects.toBeDefined();+ await chat.deleteQueuedMessage({ workspaceId, messageId: queued.id });+ });++ it('retains the queued sender through promotion and rejects a different executor', async () => {+ const queued = await chat.queueMessage({+ workspaceId,+ threadId,+ userWorkspaceId,+ text: 'Next attributed message',+ });+ const turnId = await chat.promoteQueuedMessage({+ workspaceId,+ threadId,+ messageId: queued.id,+ });+ await expect(+ actors.authorizeJob({+ workspaceId,+ threadId,+ messageId: queued.id,+ turnId: turnId!,+ userWorkspaceId,+ }),+ ).resolves.toMatchObject({ sender: { userWorkspaceId } });+ await expect(+ actors.authorizeJob({+ workspaceId,+ threadId,+ messageId: queued.id,+ userWorkspaceId: otherUserWorkspaceId,+ }),+ ).rejects.toBeDefined();+ });++ it('backfills legacy authors without replacing explicit senders on retries or rollback', async () => {+ const legacy = await chat.addMessage({+ workspaceId,+ threadId,+ uiMessage: {+ role: AgentMessageRole.USER,+ parts: [{ type: 'text', text: 'Legacy' }],+ },+ });+ const explicit = await chat.addMessage({+ workspaceId,+ threadId,+ userWorkspaceId: otherUserWorkspaceId,+ uiMessage: {+ role: AgentMessageRole.USER,+ parts: [{ type: 'text', text: 'Attributed' }],+ },+ });+ const command =+ getAppProviderByClassName<AttributeChatMessageSendersCommand>(+ 'AttributeChatMessageSendersCommand',+ );+ const dataSource =+ getCoreRepository<UserWorkspaceEntity>(UserWorkspaceEntity).manager+ .connection;+ const args = { workspaceId, dataSource, index: 0, total: 1, options: {} };+ await expect(+ actors.authorizeJob({+ workspaceId,+ threadId,+ turnId: legacy.turnId!,+ userWorkspaceId,+ }),+ ).resolves.toMatchObject({+ sender: { userWorkspaceId, applicationId: null },+ });+ await command.up(args);+ await command.up(args);+ await command.down(args);+ const storage = getAppProviderByClassName<AgentHistoryStorageService>(+ 'AgentHistoryStorageService',+ );+ const records = await storage.run(workspaceId, ({ manager, table }) =>+ manager.query(+ `SELECT id, "senderUserWorkspaceId" FROM ${table('agentMessage')} WHERE id = ANY($1::uuid[])`,+ [[legacy.id, explicit.id]],+ ),+ );+ expect(records).toEqual(+ expect.arrayContaining([+ { id: legacy.id, senderUserWorkspaceId: userWorkspaceId },+ { id: explicit.id, senderUserWorkspaceId: otherUserWorkspaceId },+ ]),+ );+ });+ it('retains explicit core sender and application identities through rollback and re-upgrade', async () => {+ const dataSource =+ getCoreRepository<UserWorkspaceEntity>(UserWorkspaceEntity).manager+ .connection;+ const runner = dataSource.createQueryRunner();+ await runner.connect();+ await runner.startTransaction();+ try {+ const legacyThreadId = randomUUID();+ const legacyMessageId = randomUUID();+ const applicationId = randomUUID();+ await runner.query(+ 'INSERT INTO core."agentChatThread" (id, "workspaceId", "userWorkspaceId") VALUES ($1, $2, $3)',+ [legacyThreadId, workspaceId, userWorkspaceId],+ );+ await runner.query(+ 'INSERT INTO core."agentMessage" (id, "workspaceId", "threadId", role, "senderUserWorkspaceId", "senderApplicationId") VALUES ($1, $2, $3, $4, $5, $6)',+ [+ legacyMessageId,+ workspaceId,+ legacyThreadId,+ 'user',+ otherUserWorkspaceId,+ applicationId,+ ],+ );+ const command = new AddChatMessageSenderFastInstanceCommand();+ await command.down(runner);+ await command.up(runner);+ const rows = await runner.query(+ 'SELECT "senderUserWorkspaceId", "senderApplicationId" FROM core."agentMessage" WHERE id = $1',+ [legacyMessageId],+ );+ expect(rows).toEqual([+ {+ senderUserWorkspaceId: otherUserWorkspaceId,+ senderApplicationId: applicationId,+ },+ ]);+ } finally {+ await runner.rollbackTransaction();+ await runner.release();+ }+ });+});diff --git a/packages/twenty-shared/src/ai/types/ExtendedUIMessage.ts b/packages/twenty-shared/src/ai/types/ExtendedUIMessage.tsindex daca44ec228..bfb0f1a6c35 100644--- a/packages/twenty-shared/src/ai/types/ExtendedUIMessage.ts+++ b/packages/twenty-shared/src/ai/types/ExtendedUIMessage.ts@@ -17,6 +17,7 @@ export type AiChatModelMetadata = {type Metadata = {createdAt: string;+ senderUserWorkspaceId?: string | null;usage?: AiChatUsageMetadata;model?: AiChatModelMetadata;};diff --git a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snapindex 80f08031bfb..1248cf12c9f 100644--- a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap+++ b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap@@ -98,6 +98,12 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e"role": {"universalIdentifier": "5dc985f3-edad-4ebf-9844-b34ca686855b",},+ "senderApplicationId": {+ "universalIdentifier": "d204d45a-6ccc-40cb-8281-b6ed635c247b",+ },+ "senderUserWorkspaceId": {+ "universalIdentifier": "f4184c3a-b85c-4cef-8181-b2fefdf98fda",+ },"status": {"universalIdentifier": "3845ccfa-9394-4cb9-a75c-4ca704414b83",},diff --git a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.tsindex b57ea376557..d5048ce801a 100644--- a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts+++ b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts@@ -82,6 +82,12 @@ export const STANDARD_OBJECT_FIELDS = {STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.agentMessage,),agentId: { universalIdentifier: '880a91ad-4ab1-4067-87f6-970a53aa2234' },+ senderUserWorkspaceId: {+ universalIdentifier: 'f4184c3a-b85c-4cef-8181-b2fefdf98fda',+ },+ senderApplicationId: {+ universalIdentifier: 'd204d45a-6ccc-40cb-8281-b6ed635c247b',+ },role: { universalIdentifier: '5dc985f3-edad-4ebf-9844-b34ca686855b' },status: { universalIdentifier: '3845ccfa-9394-4cb9-a75c-4ca704414b83' },isHidden: { universalIdentifier: 'be06f3d5-edb4-4243-89ad-71810b79b319' },