The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Bill tool-call repairs in workflows, check queued attachments, report closed questions (#27340)
Félix Malfaitbb719111bb0f
diff --git a/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts b/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.tsindex 233c11a1c08..229e0721a11 100644--- a/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts+++ b/packages/twenty-front/src/modules/ai/utils/mapDBPartToUIMessagePart.ts@@ -5,7 +5,7 @@ import {} from 'twenty-shared/ai';import { type AgentMessagePart } from '~/generated-metadata/graphql';-// keep in sync with packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util.ts+// keep in sync with packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util.tsexport const mapDBPartToUIMessagePart = (part: AgentMessagePart,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/code-interpreter-mime-types.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/constants/code-interpreter-mime-types.constant.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/code-interpreter-mime-types.constant.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/constants/code-interpreter-mime-types.constant.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/close-open-tool-parts.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/close-open-tool-parts.util.tsindex ed2cb27a37b..57411d1549c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/close-open-tool-parts.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/close-open-tool-parts.util.ts@@ -1,7 +1,7 @@import { isDefined } from 'twenty-shared/utils';import { PAUSING_TOOLS } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/constants/pausing-tools.constant';-import { readToolCallStatus } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/read-tool-call-status.util';+import { readToolCallStatus } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-status.util';import { type AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { type AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/ends-on-pausing-tool-call.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/ends-on-pausing-tool-call.util.tsindex f08e1a3caa4..9cfd839cef9 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/ends-on-pausing-tool-call.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/ends-on-pausing-tool-call.util.ts@@ -1,7 +1,7 @@import { isDefined } from 'twenty-shared/utils';import { findAwaitingPausingTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool.util';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';// not the SDK's hasToolCall, whose stop condition may be async: this is also read synchronously after the run// a pausing call refused or failing when made has no awaiting result, so the model reads its error and goes ondiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool.util.tsindex 10ad37f9060..8a4a45935f5 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool.util.ts@@ -2,7 +2,7 @@ import { isDefined } from 'twenty-shared/utils';import { PAUSING_TOOLS } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/constants/pausing-tools.constant';import { type PausingTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/types/pausing-tool.type';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';export const findAwaitingPausingTool = ({toolName,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.tsindex 4e90dd34c15..3c9665a6485 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-async-executor.service.ts@@ -74,9 +74,9 @@ import {extractCacheCreationTokensFromSteps,} from 'src/engine/metadata-modules/ai/ai-billing/utils/extract-cache-creation-tokens.util';import { mergeLanguageModelUsage } from 'src/engine/metadata-modules/ai/ai-billing/utils/merge-language-model-usage.util';-import { getCallLevelProviderOptions } from 'src/engine/metadata-modules/ai/ai-chat/utils/provider-options.util';-import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-chat/utils/replace-unsupported-file-parts.util';-import { createProposeToolCallTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/propose-tool-call.tool';+import { getCallLevelProviderOptions } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/provider-options.util';+import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util';+import { createProposeToolCallTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/tools/propose-tool-call.tool';import { buildAiTelemetry } from 'src/engine/metadata-modules/ai/ai-models/utils/build-ai-telemetry.util';import { AiModelConfigService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-config.service';import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';@@ -599,6 +599,14 @@ export class AgentAsyncExecutorService {inputSchema,error,model: registeredModel.model,+ billingContext: {+ aiBillingService: this.aiBillingService,+ modelId: registeredModel.modelId,+ workspaceId,+ userWorkspaceId: userWorkspaceId ?? null,+ agentId: agent?.id ?? null,+ operationType: UsageOperationType.AI_WORKFLOW_TOKEN,+ },});},});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.tsindex 085bbbe081f..58e2770087b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-run-conversation.service.ts@@ -11,7 +11,7 @@ import { isDefined } from 'twenty-shared/utils';import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';import { type AgentExecutionResult } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type';-import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service';import {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/tools/propose-tool-call.tool.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/tools/propose-tool-call.tool.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/tools/propose-tool-call.tool.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/tools/propose-tool-call.tool.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type.tsindex faf0c80cf9a..42b6bae80a5 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type.ts@@ -1,6 +1,6 @@import { type LanguageModelUsage, type StepResult, type ToolSet } from 'ai';-import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-history/types/agent-turn-usage.type';+import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type';export type AgentExecutionResult = {result: object;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/provider-options.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/provider-options.util.spec.tssimilarity index 98%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/provider-options.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/provider-options.util.spec.tsindex 18532c99a68..f7f0eb83528 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/provider-options.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/provider-options.util.spec.ts@@ -4,7 +4,7 @@ import {getCallLevelProviderOptions,getCacheProviderOptions,injectCacheBreakpoint,-} from 'src/engine/metadata-modules/ai/ai-chat/utils/provider-options.util';+} from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/provider-options.util';import {AI_SDK_ANTHROPIC,AI_SDK_AZURE,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/replace-unsupported-file-parts.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/replace-unsupported-file-parts.util.spec.tssimilarity index 97%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/replace-unsupported-file-parts.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/replace-unsupported-file-parts.util.spec.tsindex 28e7cc0abe0..5e1f3da6ff8 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/replace-unsupported-file-parts.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/replace-unsupported-file-parts.util.spec.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessage } from 'twenty-shared/ai';-import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-chat/utils/replace-unsupported-file-parts.util';+import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util';const buildFilePart = (mediaType: string, filename = 'file.bin') => ({type: 'file' as const,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/provider-options.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/provider-options.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/provider-options.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/provider-options.util.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/replace-unsupported-file-parts.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util.tssimilarity index 95%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/replace-unsupported-file-parts.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util.tsindex eac75df4eb1..7c85b33acb3 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/replace-unsupported-file-parts.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessage, isExtendedFileUIPart } from 'twenty-shared/ai';-import { CODE_INTERPRETER_MIME_TYPES } from 'src/engine/metadata-modules/ai/ai-chat/constants/code-interpreter-mime-types.constant';+import { CODE_INTERPRETER_MIME_TYPES } from 'src/engine/metadata-modules/ai/ai-agent-execution/constants/code-interpreter-mime-types.constant';import { formatUnsupportedFilePlaceholder } from 'src/engine/metadata-modules/ai/ai-models/utils/format-unsupported-file-placeholder.util';import { getNativeMimeTypesForModalities } from 'src/engine/metadata-modules/ai/ai-models/utils/get-native-mime-types-for-modalities.util';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.tsindex 2ee80f829d4..b31172ca51e 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/ai-agent-runs.module.ts@@ -2,20 +2,27 @@ import { Module } from '@nestjs/common';import { ApplicationLookupModule } from 'src/engine/core-modules/application/application-lookup/application-lookup.module';import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.module';+import { AiAgentModule } from 'src/engine/metadata-modules/ai/ai-agent/ai-agent.module';import { AgentRunsResolver } from 'src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver';import { AgentRunsService } from 'src/engine/metadata-modules/ai/ai-agent-runs/services/agent-runs.service';import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';+import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';@Module({imports: [AgentHistoryModule,+ AiAgentModule,ApplicationLookupModule,ApplicationRegistrationLookupModule,PermissionsModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,],- providers: [AgentRunsResolver, AgentRunsService],+ providers: [+ AgentRunsResolver,+ AgentRunsService,+ AiGraphqlApiExceptionInterceptor,+ ],})export class AiAgentRunsModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.tsindex 40bd98fb12a..4436ac8b631 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-runs/resolvers/agent-runs.resolver.ts@@ -1,10 +1,11 @@-import { UseFilters, UseGuards } from '@nestjs/common';+import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';import { Args, Int, Query } from '@nestjs/graphql';import { PermissionFlagType } from 'twenty-shared/constants';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { ApplicationTargetArg } from 'src/engine/decorators/auth/application-target-arg.decorator';@@ -12,8 +13,10 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decoratimport { ApplicationTargetGuard } from 'src/engine/guards/application-target.guard';import { AuthPrincipalGuard } from 'src/engine/guards/auth-principal.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';+import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';import { AgentRunDTO } from 'src/engine/metadata-modules/ai/ai-agent-runs/dtos/agent-run.dto';import { AgentRunsService } from 'src/engine/metadata-modules/ai/ai-agent-runs/services/agent-runs.service';+import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';@UseGuards(AuthPrincipalGuard({@@ -29,10 +32,14 @@ import { AgentRunsService } from 'src/engine/metadata-modules/ai/ai-agent-runs/s}),SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),)+@UseInterceptors(AiGraphqlApiExceptionInterceptor)@MetadataResolver(() => AgentRunDTO)-@UseFilters(AuthGraphqlApiExceptionFilter)+@UseFilters(ApplicationExceptionFilter, AuthGraphqlApiExceptionFilter)export class AgentRunsResolver {- constructor(private readonly agentRunsService: AgentRunsService) {}+ constructor(+ private readonly agentService: AgentService,+ private readonly agentRunsService: AgentRunsService,+ ) {}@Query(() => [AgentRunDTO])@UseGuards(ApplicationTargetGuard)@@ -50,6 +57,10 @@ export class AgentRunsResolver {@Args('limit', { type: () => Int, defaultValue: 100 }) limit: number,@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,): Promise<AgentRunDTO[]> {+ // The application target guard lets unknown ids through, and turns outlive+ // their agent, so a deleted agent's runs would otherwise reach any app+ await this.agentService.findOneAgentById({ id: agentId, workspaceId });+return this.agentRunsService.findAgentRuns({ workspaceId, agentId, limit });}}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.tsindex 8a62fe6ff60..109501c368d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent/utils/repair-tool-call.util.ts@@ -1,3 +1,5 @@+import { Logger } from '@nestjs/common';+import {type LanguageModel,type LanguageModelUsage,@@ -7,6 +9,7 @@ import {type ToolSet,generateText,} from 'ai';+import { isDefined } from 'twenty-shared/utils';import { type z } from 'zod';import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';@@ -14,6 +17,8 @@ import { AiBillingService } from 'src/engine/metadata-modules/ai/ai-billing/servimport { extractCacheCreationTokensFromSteps } from 'src/engine/metadata-modules/ai/ai-billing/utils/extract-cache-creation-tokens.util';import { buildAiTelemetry } from 'src/engine/metadata-modules/ai/ai-models/utils/build-ai-telemetry.util';+const logger = new Logger('repairToolCall');+type ToolCall = {type: 'tool-call';toolCallId: string;@@ -26,6 +31,7 @@ type RepairToolCallBillingContext = {modelId: string;workspaceId: string;userWorkspaceId: string | null;+ agentId: string | null;operationType: UsageOperationType;};@@ -42,7 +48,7 @@ export const repairToolCall = async ({inputSchema: (toolCall: { toolName: string }) => unknown;error: Error;model: LanguageModel;- billingContext?: RepairToolCallBillingContext;+ billingContext: RepairToolCallBillingContext;}): Promise<ToolCall | null> => {if (NoSuchToolError.isInstance(error)) {return null;@@ -84,8 +90,8 @@ export const repairToolCall = async ({].join('\n'),...buildAiTelemetry({functionId: 'repair-tool-call',- workspaceId: billingContext?.workspaceId,- userWorkspaceId: billingContext?.userWorkspaceId,+ workspaceId: billingContext.workspaceId,+ userWorkspaceId: billingContext.userWorkspaceId,}),});@@ -107,19 +113,26 @@ export const repairToolCall = async ({} catch {return null;} finally {- if (billingContext && usage) {+ if (isDefined(usage)) {const cacheCreationTokens = steps? extractCacheCreationTokensFromSteps(steps): 0;- void billingContext.aiBillingService.calculateAndBillUsage(- billingContext.modelId,- { usage, cacheCreationTokens },- billingContext.workspaceId,- billingContext.operationType,- null,- billingContext.userWorkspaceId,- );+ void billingContext.aiBillingService+ .calculateAndBillUsage(+ billingContext.modelId,+ { usage, cacheCreationTokens },+ billingContext.workspaceId,+ billingContext.operationType,+ billingContext.agentId,+ billingContext.userWorkspaceId,+ )+ .catch((error: unknown) =>+ logger.error(+ `Could not bill the repair of tool call ${toolCall.toolCallId} in workspace ${billingContext.workspaceId}`,+ error instanceof Error ? error.stack : error,+ ),+ );}}};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.tsindex 301c733e0da..92341667174 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service.ts@@ -17,7 +17,7 @@ import { extractCacheCreationTokens } from 'src/engine/metadata-modules/ai/ai-biimport { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';import { type AiModelCostConfig } from 'src/engine/metadata-modules/ai/ai-models/types/ai-model-cost-config.type';import { type ModelId } from 'src/engine/metadata-modules/ai/ai-models/types/model-id.type';-import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-history/types/agent-turn-usage.type';+import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type';export type BillingUsageInput = {usage: BillingTokenUsage;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-turn-usage.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/agent-turn-usage.type.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/compute-agent-turn-usage-from-steps.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/compute-agent-turn-usage-from-steps.util.tsindex ea550fcc66e..9bb16b71c49 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/compute-agent-turn-usage-from-steps.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-billing/utils/compute-agent-turn-usage-from-steps.util.ts@@ -2,7 +2,7 @@ import { type BillingTokenUsage } from 'src/engine/metadata-modules/ai/ai-billinimport { computeStepCostBreakdown } from 'src/engine/metadata-modules/ai/ai-billing/utils/compute-step-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';-import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-history/types/agent-turn-usage.type';+import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type';import { type AiModelCostConfig } from 'src/engine/metadata-modules/ai/ai-models/types/ai-model-cost-config.type';type AgentTurnUsageStep = {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 7f018d7d76a..a6c0b67195a 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@@ -60,7 +60,7 @@ import {import { AGENT_CHAT_CHECKPOINT_INTERVAL_MS } from 'src/engine/metadata-modules/ai/ai-chat/constants/agent-chat-checkpoint-interval-ms.constant';import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utils/format-error-with-cause.util';import { getCancelChannel } from 'src/engine/metadata-modules/ai/ai-chat/utils/get-cancel-channel.util';-import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { tagAiChatStreamScope } from 'src/engine/metadata-modules/ai/ai-chat/utils/tag-ai-chat-stream-scope.util';import { AiModelRegistryService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-registry.service';import type { AiModelConfig } from 'src/engine/metadata-modules/ai/ai-models/types/ai-model-config.type';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-thread-record-event.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-thread-record-event.service.spec.tsnew file mode 100644index 00000000000..89e61ce659e--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-thread-record-event.service.spec.ts@@ -0,0 +1,64 @@+import { AgentChatThreadRecordEventService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service';++const CLEARED_THREAD = {+ id: 'thread-id',+ pendingQuestionMessageId: null,+};++const buildService = (storedThread: unknown = CLEARED_THREAD) => {+ const threadRepository = {+ findOne: jest.fn().mockResolvedValue(storedThread),+ };+ const service = new AgentChatThreadRecordEventService(+ threadRepository as never,+ {} as never,+ {} as never,+ );+ const emitThreadUpdated = jest+ .spyOn(service, 'emitThreadUpdated')+ .mockResolvedValue(undefined);++ return { service, emitThreadUpdated };+};++describe('AgentChatThreadRecordEventService emitPendingQuestionCleared', () => {+ const clearArguments = {+ workspaceId: 'workspace-id',+ threadId: 'thread-id',+ messageId: 'question-message-id',+ };++ it('reports the thread as no longer waiting on the question', async () => {+ const { service, emitThreadUpdated } = buildService();++ await service.emitPendingQuestionCleared(clearArguments);++ expect(emitThreadUpdated).toHaveBeenCalledTimes(1);+ expect(emitThreadUpdated).toHaveBeenCalledWith({+ workspaceId: 'workspace-id',+ threadBefore: {+ ...CLEARED_THREAD,+ pendingQuestionMessageId: 'question-message-id',+ },+ threadAfter: CLEARED_THREAD,+ });+ });++ it('does nothing when the thread is gone', async () => {+ const { service, emitThreadUpdated } = buildService(null);++ await service.emitPendingQuestionCleared(clearArguments);++ expect(emitThreadUpdated).not.toHaveBeenCalled();+ });++ it('does not fail the caller when the event cannot be sent', async () => {+ const { service, emitThreadUpdated } = buildService();++ emitThreadUpdated.mockRejectedValue(new Error('cache down'));++ await expect(+ service.emitPendingQuestionCleared(clearArguments),+ ).resolves.toBeUndefined();+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.tsindex 021c81e0a29..0f437fde4fd 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.close-pending-tool-calls.spec.ts@@ -11,18 +11,12 @@ const QUESTIONS = [},];-const CLEARED_THREAD = {- id: 'thread-id',- pendingQuestionMessageId: null,-};-const buildService = ({ claimAffected = 1 } = {}) => {const threadRepository = {- findOne: jest.fn().mockResolvedValue(CLEARED_THREAD),update: jest.fn().mockResolvedValue({ affected: claimAffected }),};const threadRecordEventService = {- emitThreadUpdated: jest.fn().mockResolvedValue(undefined),+ emitPendingQuestionCleared: jest.fn().mockResolvedValue(undefined),};const turnRecorderService = {endWaitingTurn: jest.fn().mockResolvedValue(undefined),@@ -123,14 +117,15 @@ describe('AgentChatService closePendingToolCalls', () => {await service.closePendingToolCalls(closeArguments);- expect(threadRecordEventService.emitThreadUpdated).toHaveBeenCalledTimes(1);- expect(threadRecordEventService.emitThreadUpdated).toHaveBeenCalledWith({+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).toHaveBeenCalledTimes(1);+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).toHaveBeenCalledWith({workspaceId: 'workspace-id',- threadBefore: {- ...CLEARED_THREAD,- pendingQuestionMessageId: 'question-message-id',- },- threadAfter: CLEARED_THREAD,+ threadId: 'thread-id',+ messageId: 'question-message-id',});});@@ -143,7 +138,9 @@ describe('AgentChatService closePendingToolCalls', () => {await service.closePendingToolCalls(closeArguments);expect(messagePartRepository.writePart).not.toHaveBeenCalled();- expect(threadRecordEventService.emitThreadUpdated).not.toHaveBeenCalled();+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).not.toHaveBeenCalled();});});@@ -169,7 +166,9 @@ describe('AgentChatService recordToolCallAnswer', () => {isLastAnswer: true,});- expect(threadRecordEventService.emitThreadUpdated).toHaveBeenCalledTimes(1);+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).toHaveBeenCalledTimes(1);});it('stays quiet when another caller already stopped the wait', async () => {@@ -185,7 +184,9 @@ describe('AgentChatService recordToolCallAnswer', () => {isLastAnswer: true,});- expect(threadRecordEventService.emitThreadUpdated).not.toHaveBeenCalled();+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).not.toHaveBeenCalled();});it('stays quiet while other calls still wait on an answer', async () => {@@ -196,6 +197,8 @@ describe('AgentChatService recordToolCallAnswer', () => {isLastAnswer: false,});- expect(threadRecordEventService.emitThreadUpdated).not.toHaveBeenCalled();+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).not.toHaveBeenCalled();});});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.tsindex 64f09699ae1..f8ff9050441 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-stream-recovery.service.ts@@ -10,7 +10,7 @@ import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utiimport {mapErrorToStreamError,type StreamErrorPayload,-} from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+} from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';import { buildReleaseStreamClaimQuery } from 'src/engine/metadata-modules/ai/ai-history/utils/build-release-stream-claim-query.util';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 4e89c635028..c750b7a85ba 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@@ -31,8 +31,8 @@ import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { AgentMessageStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-status.enum';-import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util';-import { mapDBPartsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util';+import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util';+import { mapDBPartsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util';import { type BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';@@ -44,7 +44,7 @@ import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/serviceimport { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service';import { AiChatFileAttachment } from 'src/engine/metadata-modules/ai/ai-chat/types/ai-chat-file-attachment.type';import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utils/format-error-with-cause.util';-import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import {AiException,AiExceptionCode,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service.tsindex 0079d0f5b46..c266c65c72a 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service.ts@@ -1,4 +1,4 @@-import { Injectable } from '@nestjs/common';+import { Injectable, Logger } from '@nestjs/common';import {ObjectRecordCreateEvent,@@ -9,6 +9,7 @@ import { isDefined } from 'twenty-shared/utils';import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';import { buildAgentChatThreadUpdateEvent } from 'src/engine/metadata-modules/ai/ai-chat/utils/build-agent-chat-thread-update-event.util';import { findAgentChatFlatObjectMetadata } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-agent-chat-flat-object-metadata.util';+import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utils/format-error-with-cause.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';import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';@@ -18,6 +19,8 @@ import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/worksp// chat history writes skip record events, so subscribers only hear of them from here@Injectable()export class AgentChatThreadRecordEventService {+ private readonly logger = new Logger(AgentChatThreadRecordEventService.name);+constructor(@InjectAgentHistoryRepository('agentChatThread')private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@@ -98,6 +101,36 @@ export class AgentChatThreadRecordEventService {});}+ // Chat lists show which chats wait on an answer. The marker is already+ // cleared, so a lost event must not fail the caller+ async emitPendingQuestionCleared({+ workspaceId,+ threadId,+ messageId,+ }: {+ workspaceId: string;+ threadId: string;+ messageId: string;+ }): Promise<void> {+ try {+ const thread = await this.findThread({ workspaceId, threadId });++ if (!isDefined(thread)) {+ return;+ }++ await this.emitThreadUpdated({+ workspaceId,+ threadBefore: { ...thread, pendingQuestionMessageId: messageId },+ threadAfter: thread,+ });+ } catch (error) {+ this.logger.warn(+ `Could not emit the cleared question on thread ${threadId}: ${formatErrorWithCause(error)}`,+ );+ }+ }+private findThread({workspaceId,threadId,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 458edc772ad..ea51ce6da7c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts@@ -3,8 +3,8 @@ import { isUserAuthContext } from 'src/engine/core-modules/auth/guards/is-user-aimport { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';-import { Injectable, Logger } from '@nestjs/common';-import { type ActorMetadata } from 'twenty-shared/types';+import { Injectable } from '@nestjs/common';+import { type ActorMetadata, FileFolder } from 'twenty-shared/types';import { ExtendedUIMessage } from 'twenty-shared/ai';import {@@ -12,7 +12,7 @@ import {isNonEmptyArray,isNonEmptyString,} from 'twenty-shared/utils';-import { type FindOptionsWhere, In, Not } from 'typeorm';+import { type FindOptionsWhere, In, Like, Not } from 'typeorm';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';@@ -24,7 +24,7 @@ import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-histimport { buildEndWaitingAgentTurnQuery } from 'src/engine/metadata-modules/ai/ai-history/utils/build-end-waiting-agent-turn-query.util';import { buildActorMetadataFromAuthContext } from 'src/engine/core-modules/actor/utils/build-actor-metadata-from-auth-context.util';import { AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util';+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util';import { findAwaitingPausingTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool.util';import { closeOpenToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/close-open-tool-parts.util';import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';@@ -36,12 +36,9 @@ import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/simport { AgentConversationWriterService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service';import { AgentTitleGenerationService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-title-generation.service';import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utils/format-error-with-cause.util';@Injectable()export class AgentChatService {- private readonly logger = new Logger(AgentChatService.name);-constructor(@InjectAgentHistoryRepository('agentChatThread')private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,@@ -373,6 +370,7 @@ export class AgentChatService {? await this.fileRepository.find(workspaceId, {where: {id: In(fileAttachments.map((attachment) => attachment.id)),+ path: Like(`${FileFolder.AgentChat}/%`),},select: ['id'],})@@ -632,7 +630,7 @@ export class AgentChatService {);if (isPendingQuestionCleared) {- await this.emitPendingQuestionCleared({+ await this.threadRecordEventService.emitPendingQuestionCleared({workspaceId,threadId,messageId,@@ -674,39 +672,11 @@ export class AgentChatService {workspaceId,});- await this.emitPendingQuestionCleared({ workspaceId, threadId, messageId });- }-- // Chat lists show which chats wait on an answer. The marker is already- // cleared, so a lost event must not fail the caller- private async emitPendingQuestionCleared({- workspaceId,- threadId,- messageId,- }: {- workspaceId: string;- threadId: string;- messageId: string;- }): Promise<void> {- try {- const thread = await this.threadRepository.findOne(workspaceId, {- where: { id: threadId },- });-- if (!isDefined(thread)) {- return;- }-- await this.threadRecordEventService.emitThreadUpdated({- workspaceId,- threadBefore: { ...thread, pendingQuestionMessageId: messageId },- threadAfter: thread,- });- } catch (error) {- this.logger.warn(- `Could not emit the cleared question on thread ${threadId}: ${formatErrorWithCause(error)}`,- );- }+ await this.threadRecordEventService.emitPendingQuestionCleared({+ workspaceId,+ threadId,+ messageId,+ });}async restoreThread({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 26116fb94ae..687d167128d 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@@ -56,7 +56,7 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { AgentActorContextService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service';import { resolveProposedToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/resolve-proposed-tool-call.util';import { endsOnPausingToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/ends-on-pausing-tool-call.util';-import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';+import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util';import { guideUncallableToolCallsToMetaTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/guide-uncallable-tool-calls-to-meta-tool.util';import { AGENT_CONFIG } from 'src/engine/metadata-modules/ai/ai-agent/constants/agent-config.const';import { BrowsingContextType } from 'src/engine/metadata-modules/ai/ai-agent/types/browsing-context.type';@@ -76,7 +76,7 @@ import { AgentChatThreadTargetService } from 'src/engine/metadata-modules/ai/ai-import { MessagePruningService } from 'src/engine/metadata-modules/ai/ai-chat/services/message-pruning.service';import { createAskQuestionTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/ask-question.tool';import { createAttachConversationToRecordTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/attach-conversation-to-record.tool';-import { createProposeToolCallTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/propose-tool-call.tool';+import { createProposeToolCallTool } from 'src/engine/metadata-modules/ai/ai-agent-execution/tools/propose-tool-call.tool';import { createRequestFormTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/request-form.tool';import { createCompleteWorkspaceSetupTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/complete-workspace-setup.tool';import { type AgentChatSender } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-sender.type';@@ -94,8 +94,8 @@ import {getCacheProviderOptions,getCallLevelProviderOptions,injectCacheBreakpoint,-} from 'src/engine/metadata-modules/ai/ai-chat/utils/provider-options.util';-import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-chat/utils/replace-unsupported-file-parts.util';+} from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/provider-options.util';+import { replaceUnsupportedFileParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/replace-unsupported-file-parts.util';import { tagAiChatExecutionScope } from 'src/engine/metadata-modules/ai/ai-chat/utils/tag-ai-chat-execution-scope.util';import { buildAiTelemetry } from 'src/engine/metadata-modules/ai/ai-models/utils/build-ai-telemetry.util';import { AiModelConfigService } from 'src/engine/metadata-modules/ai/ai-models/services/ai-model-config.service';@@ -699,6 +699,7 @@ export class ChatExecutionService {modelId: registeredModel.modelId,workspaceId: workspace.id,userWorkspaceId,+ agentId: null,operationType: UsageOperationType.AI_CHAT_TOKEN,},});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type.tsindex 75fc614334d..e7f93bd14a9 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/agent-chat-thread-last-stream-error.type.ts@@ -1,4 +1,4 @@-import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';export type AgentChatThreadLastStreamError = StreamErrorPayload & {failedAt: string;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/inject-cache-breakpoint-bedrock-payload.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/inject-cache-breakpoint-bedrock-payload.spec.tsindex 01176553314..27f40d23e05 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/inject-cache-breakpoint-bedrock-payload.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/inject-cache-breakpoint-bedrock-payload.spec.ts@@ -5,7 +5,7 @@ import { z } from 'zod';import {getCacheProviderOptions,injectCacheBreakpoint,-} from 'src/engine/metadata-modules/ai/ai-chat/utils/provider-options.util';+} from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/provider-options.util';import { AI_SDK_BEDROCK } from 'src/engine/metadata-modules/ai/ai-models/constants/ai-sdk-package.const';const BEDROCK_MAX_CACHE_POINTS = 4;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/extract-code-interpreter-files.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/extract-code-interpreter-files.util.tsindex c8fcf7ed6ea..7c14b64ee2c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/extract-code-interpreter-files.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/extract-code-interpreter-files.util.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessage, isExtendedFileUIPart } from 'twenty-shared/ai';-import { CODE_INTERPRETER_MIME_TYPES } from 'src/engine/metadata-modules/ai/ai-chat/constants/code-interpreter-mime-types.constant';+import { CODE_INTERPRETER_MIME_TYPES } from 'src/engine/metadata-modules/ai/ai-agent-execution/constants/code-interpreter-mime-types.constant';import { type ExtractCodeInterpreterFilesResult } from 'src/engine/metadata-modules/ai/ai-chat/types/extract-code-interpreter-files-result.type';import { type ExtractedFile } from 'src/engine/metadata-modules/ai/ai-chat/types/extracted-file.type';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.tsindex d707475d131..71a5eb8999b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/find-awaiting-call-text.util.ts@@ -8,7 +8,7 @@ import {} from 'twenty-shared/ai';import { isDefined, isPlainObject } from 'twenty-shared/utils';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';const readNonEmptyString = (value: unknown): string | null =>isString(value) && isNonEmptyString(value.trim()) ? value : null;diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/map-agent-chat-turn-outcome-to-turn-status.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/map-agent-chat-turn-outcome-to-turn-status.util.tsindex 46b6529c02b..06c21a1d74b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/map-agent-chat-turn-outcome-to-turn-status.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/map-agent-chat-turn-outcome-to-turn-status.util.ts@@ -1,8 +1,8 @@import { assertUnreachable } from 'twenty-shared/utils';import { type AgentChatTurnOutcome } from 'src/engine/metadata-modules/ai/ai-chat/types/agent-chat-turn-outcome.type';-import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';import { AGENT_TURN_CREDITS_EXHAUSTED_ERROR } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-turn-credits-exhausted-error.constant';+import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';const FAILURE_ERRORS: Record<diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-turn-credits-exhausted-error.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-turn-credits-exhausted-error.constant.tsindex 9e869839440..34009a9304a 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-turn-credits-exhausted-error.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/constants/agent-turn-credits-exhausted-error.constant.ts@@ -1,4 +1,4 @@-import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';export const AGENT_TURN_CREDITS_EXHAUSTED_ERROR: StreamErrorPayload = {code: 'CREDITS_EXHAUSTED',diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-reader.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-reader.service.tsindex f2d888ea82c..d617550fd8e 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-reader.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-reader.service.ts@@ -9,8 +9,8 @@ import { FileFolder } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { FileUrlService } from 'src/engine/core-modules/file/file-url/file-url.service';-import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';-import { mapDBPartsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util';+import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util';+import { mapDBPartsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util';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 { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service.tsindex 05742c82988..7fbecf5e0cd 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service.ts@@ -8,10 +8,10 @@ import { isDefined } from 'twenty-shared/utils';import { IsNull } from 'typeorm';import { findAwaitingPausingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/find-awaiting-pausing-tool-parts.util';-import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ai-steps-to-ui-message-parts.util';-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util';-import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/types/tool-call-workflow-step.type';-import { stampPendingToolPartsWithWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/utils/stamp-pending-tool-parts-with-workflow-step.util';+import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ai-steps-to-ui-message-parts.util';+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util';+import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';+import { stampPendingToolPartsWithWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/utils/stamp-pending-tool-parts-with-workflow-step.util';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.tsindex ce4fdaa71e1..8cf22d0d25b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service.ts@@ -3,14 +3,14 @@ import { Injectable, Logger } from '@nestjs/common';import { type ActorMetadata, FieldActorSource } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';import { AGENT_TURN_CREDITS_EXHAUSTED_ERROR } from 'src/engine/metadata-modules/ai/ai-history/constants/agent-turn-credits-exhausted-error.constant';+import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';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 { type AgentTurnWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity';-import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-history/types/agent-turn-usage.type';+import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type';import { type RecordableAgentExecution } from 'src/engine/metadata-modules/ai/ai-history/types/recordable-agent-execution.type';import { buildEndWaitingAgentTurnQuery } from 'src/engine/metadata-modules/ai/ai-history/utils/build-end-waiting-agent-turn-query.util';import { buildReleaseStreamClaimQuery } from 'src/engine/metadata-modules/ai/ai-history/utils/build-release-stream-claim-query.util';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity.tsindex 10d215fdb31..c7d0b79ce2f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/standard-objects/agent-turn.workspace-entity.ts@@ -4,7 +4,7 @@ import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migrimport { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { type AgentMessageWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message.workspace-entity';import { type AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';-import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { type StreamErrorPayload } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';export class AgentTurnWorkspaceEntity extends BaseWorkspaceEntity {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/recordable-agent-execution.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/recordable-agent-execution.type.tsindex 8ac5a61b582..7969c1d1c7c 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/recordable-agent-execution.type.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/recordable-agent-execution.type.ts@@ -1,12 +1,12 @@-import { type AgentExecutionResult } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type';+import { type StepResult, type ToolSet } from 'ai';++import { type AgentTurnUsage } from 'src/engine/metadata-modules/ai/ai-billing/types/agent-turn-usage.type';// what recording a turn reads from an execution; usage is absent when the execution ran elsewhereexport type RecordableAgentExecution = {- steps?: Pick<AgentExecutionResult['steps'][number], 'content'>[];+ steps?: Pick<StepResult<ToolSet>, 'content'>[];isPaused?: boolean;-} & Partial<- Pick<- AgentExecutionResult,- 'modelId' | 'turnUsage' | 'hasNoMoreAvailableCredits'- >->;+ modelId?: string;+ turnUsage?: AgentTurnUsage;+ hasNoMoreAvailableCredits?: boolean;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/tool-call-workflow-step.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/types/tool-call-workflow-step.type.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.tssimilarity index 96%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.tsindex adbca3baed6..f1cb1e11292 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts@@ -2,9 +2,9 @@ import { convertToModelMessages, type UIMessage } from 'ai';import { type ExtendedUIMessagePart } from 'twenty-shared/ai';import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';-import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';-import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util';-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util';+import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util';+import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util';+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util';const toolPart = (state: string,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/finalize-dangling-tool-parts.util.spec.tssimilarity index 98%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/finalize-dangling-tool-parts.util.spec.tsindex b2c02b8b519..e79bcb554f6 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/finalize-dangling-tool-parts.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/finalize-dangling-tool-parts.util.spec.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';+import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util';const buildToolPart = (state: string,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-ai-steps-to-ui-message-parts.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-ai-steps-to-ui-message-parts.util.spec.tssimilarity index 97%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-ai-steps-to-ui-message-parts.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-ai-steps-to-ui-message-parts.util.spec.tsindex e6c389903ee..daeb80e34d3 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-ai-steps-to-ui-message-parts.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-ai-steps-to-ui-message-parts.util.spec.ts@@ -1,6 +1,6 @@import { type StepResult, type ToolSet } from 'ai';-import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ai-steps-to-ui-message-parts.util';+import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ai-steps-to-ui-message-parts.util';const buildStep = (content: StepResult<ToolSet>['content'],diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/map-error-to-stream-error.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-error-to-stream-error.util.spec.tssimilarity index 94%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/map-error-to-stream-error.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-error-to-stream-error.util.spec.tsindex 5f01b800d7c..49a47742eb9 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/map-error-to-stream-error.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-error-to-stream-error.util.spec.ts@@ -5,7 +5,7 @@ import {import {STREAM_EXECUTION_FAILED_CODE,mapErrorToStreamError,-} from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+} from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';describe('mapErrorToStreamError', () => {it('maps an AiException to its typed code and message', () => {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-message-parts.dynamic-tool.spec.tssimilarity index 96%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-message-parts.dynamic-tool.spec.tsindex f0a3a698cf3..d7a0ec012fe 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-message-parts.dynamic-tool.spec.ts@@ -1,8 +1,8 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';-import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util';-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util';+import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util';+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util';const dynamicToolPart = (overrides: Record<string, unknown> = {},diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-ui-message-parts-to-db-parts.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-ui-message-parts-to-db-parts.util.spec.tssimilarity index 94%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-ui-message-parts-to-db-parts.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-ui-message-parts-to-db-parts.util.spec.tsindex e700d4166a9..ca54ee25512 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/map-ui-message-parts-to-db-parts.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/map-ui-message-parts-to-db-parts.util.spec.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util';+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util';describe('mapUIMessagePartsToDBParts', () => {it('stores a dangling tool call as an interrupted one', () => {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/message-part-provider-metadata-mapping.util.spec.tssimilarity index 89%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/message-part-provider-metadata-mapping.util.spec.tsindex e11b3ee34dc..b0f4e628e01 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/__tests__/message-part-provider-metadata-mapping.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/message-part-provider-metadata-mapping.util.spec.ts@@ -1,8 +1,8 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';import { AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';-import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util';-import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util';+import { mapDBPartToUIMessagePart } from 'src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util';+import { mapUIMessagePartsToDBParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util';describe('message part provider metadata mapping', () => {it('persists and restores OpenAI encrypted reasoning metadata', () => {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/stamp-pending-tool-parts-with-workflow-step.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/stamp-pending-tool-parts-with-workflow-step.util.spec.tssimilarity index 91%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/stamp-pending-tool-parts-with-workflow-step.util.spec.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/stamp-pending-tool-parts-with-workflow-step.util.spec.tsindex 6eb9ad241a2..6650c5b6070 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/stamp-pending-tool-parts-with-workflow-step.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/__tests__/stamp-pending-tool-parts-with-workflow-step.util.spec.ts@@ -1,6 +1,6 @@import { type ExtendedUIMessagePart } from 'twenty-shared/ai';-import { stampPendingToolPartsWithWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/utils/stamp-pending-tool-parts-with-workflow-step.util';+import { stampPendingToolPartsWithWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/utils/stamp-pending-tool-parts-with-workflow-step.util';const WORKFLOW_STEP = { workflowRunId: 'run-id', stepId: 'step-id' };diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util.tssimilarity index 72%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util.tsindex c8d39511ce6..621652bb7a2 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util.ts@@ -1,4 +1,4 @@-import { readToolCallStatus } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/read-tool-call-status.util';+import { readToolCallStatus } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-status.util';export const isAwaitingPausingToolOutput = (toolOutput: unknown): boolean =>readToolCallStatus(toolOutput) === 'pending';diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ai-steps-to-ui-message-parts.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-ai-steps-to-ui-message-parts.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ai-steps-to-ui-message-parts.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-ai-steps-to-ui-message-parts.util.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-db-parts-to-ui-message-parts.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-db-parts-to-ui-message-parts.util.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util.tssimilarity index 97%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util.tsindex 1ee64d490b9..36d3dbcf368 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ui-message-parts-to-db-parts.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/map-ui-message-parts-to-db-parts.util.ts@@ -5,7 +5,7 @@ import {} from 'twenty-shared/ai';import { type AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';-import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/finalize-dangling-tool-parts.util';+import { finalizeDanglingToolParts } from 'src/engine/metadata-modules/ai/ai-history/utils/finalize-dangling-tool-parts.util';// stored messages are replayed to a model, so dangling tool parts are finalized firstexport const mapUIMessagePartsToDBParts = (diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/read-tool-call-status.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-status.util.tssimilarity index 100%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/read-tool-call-status.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-status.util.tsdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util.tssimilarity index 93%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util.tsindex a5e80930839..00258535f42 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util.ts@@ -1,7 +1,7 @@import { isNonEmptyString } from '@sniptt/guards';import { isPlainObject } from 'twenty-shared/utils';-import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/types/tool-call-workflow-step.type';+import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';// a workflow step posting a call to a member's inbox records itself in the pending output,// which the server writes and the answer replaces, so the answer can resume that stepdiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/stamp-pending-tool-parts-with-workflow-step.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/stamp-pending-tool-parts-with-workflow-step.util.tssimilarity index 85%rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/stamp-pending-tool-parts-with-workflow-step.util.tsrename to packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/stamp-pending-tool-parts-with-workflow-step.util.tsindex 4cc8afc00a5..b1839054e31 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/stamp-pending-tool-parts-with-workflow-step.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-history/utils/stamp-pending-tool-parts-with-workflow-step.util.ts@@ -2,8 +2,8 @@ import { isToolUIPart } from 'ai';import { type ExtendedUIMessagePart } from 'twenty-shared/ai';import { isPlainObject } from 'twenty-shared/utils';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';-import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/types/tool-call-workflow-step.type';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';+import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';// A pending call names the step that waits on it, so its answer or outcome// resumes that step even in a conversation other runs also write todiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.tsindex d32957157f5..91a448f0e4b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/ai-tool-call-answer.module.ts@@ -5,14 +5,13 @@ import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-import { AgentChatStreamStateModule } from 'src/engine/metadata-modules/ai/ai-chat/agent-chat-stream-state.module';import { AiChatModule } from 'src/engine/metadata-modules/ai/ai-chat/ai-chat.module';import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';+import { AwaitedToolCallHandlerModule } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/awaited-tool-call-handler.module';import { ToolCallAnswerResolver } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/resolvers/tool-call-answer.resolver';import { ToolCallAnswerService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service';import { AiGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/ai/interceptors/ai-graphql-api-exception.interceptor';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { WorkflowRunModule } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.module';-import { WorkflowRunnerModule } from 'src/modules/workflow/workflow-runner/workflow-runner.module';-// sits above chat and workflow since an answer can resume either+// an answer resumes a chat here, or the run waiting on it through the handler it registered@Module({imports: [AgentHistoryModule,@@ -21,8 +20,7 @@ import { WorkflowRunnerModule } from 'src/modules/workflow/workflow-runner/workfAgentChatStreamStateModule,PermissionsModule,ToolProviderModule,- WorkflowRunModule,- WorkflowRunnerModule,+ AwaitedToolCallHandlerModule,],providers: [ToolCallAnswerService,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/awaited-tool-call-handler.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/awaited-tool-call-handler.module.tsnew file mode 100644index 00000000000..ec45051cf2e--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/awaited-tool-call-handler.module.ts@@ -0,0 +1,9 @@+import { Module } from '@nestjs/common';++import { AwaitedToolCallHandlerRegistryService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/awaited-tool-call-handler-registry.service';++@Module({+ providers: [AwaitedToolCallHandlerRegistryService],+ exports: [AwaitedToolCallHandlerRegistryService],+})+export class AwaitedToolCallHandlerModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/awaited-tool-call-handler-registry.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/awaited-tool-call-handler-registry.service.tsnew file mode 100644index 00000000000..cba8d69f351--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/awaited-tool-call-handler-registry.service.ts@@ -0,0 +1,30 @@+import { Injectable } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import {+ AiException,+ AiExceptionCode,+} from 'src/engine/metadata-modules/ai/ai.exception';+import { type AwaitedToolCallHandler } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/types/awaited-tool-call-handler.type';++// the workflow module registers here so the engine answers calls a run waits on without importing it+@Injectable()+export class AwaitedToolCallHandlerRegistryService {+ private handler: AwaitedToolCallHandler | null = null;++ register(handler: AwaitedToolCallHandler): void {+ this.handler = handler;+ }++ getHandlerOrThrow(): AwaitedToolCallHandler {+ if (!isDefined(this.handler)) {+ throw new AiException(+ 'No handler is registered for tool calls a run waits on',+ AiExceptionCode.AGENT_EXECUTION_FAILED,+ );+ }++ return this.handler;+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.tsindex 9e835932fb0..61c377b67df 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/services/tool-call-answer.service.ts@@ -12,7 +12,7 @@ import { type ToolContext } from 'src/engine/core-modules/tool-provider/types/toimport { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { type PausingToolCompletionContext } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/types/pausing-tool-completion-context.type';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';import { parsePausingToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/parse-pausing-tool-call.util';import { AgentActorContextService } from 'src/engine/metadata-modules/ai/ai-agent-execution/services/agent-actor-context.service';import { AgentChatActorService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-actor.service';@@ -23,7 +23,7 @@ import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/simport { AgentChatTurnPreflightService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-turn-preflight.service';import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';import { formatErrorWithCause } from 'src/engine/metadata-modules/ai/ai-chat/utils/format-error-with-cause.util';-import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util';+import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util';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 { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';@@ -32,10 +32,9 @@ import {AiExceptionCode,} from 'src/engine/metadata-modules/ai/ai.exception';import { PermissionsService } from 'src/engine/metadata-modules/permissions/permissions.service';-import { WorkflowRunStatus } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';-import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';-import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';-import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service';+import { AwaitedToolCallHandlerRegistryService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/awaited-tool-call-handler-registry.service';+import { type AwaitedToolCallWaiter } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/types/awaited-tool-call-handler.type';+import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';type AnswerToolCallArgs = {@@ -67,8 +66,7 @@ export class ToolCallAnswerService {private readonly threadService: AgentChatThreadService,private readonly actorService: AgentChatActorService,private readonly eventPublisherService: AgentChatEventPublisherService,- private readonly workflowRunnerWorkspaceService: WorkflowRunnerWorkspaceService,- private readonly workflowRunWorkspaceService: WorkflowRunWorkspaceService,+ private readonly awaitedToolCallHandlerRegistry: AwaitedToolCallHandlerRegistryService,private readonly permissionsService: PermissionsService,private readonly turnPreflightService: AgentChatTurnPreflightService,private readonly agentActorContextService: AgentActorContextService,@@ -102,7 +100,6 @@ export class ToolCallAnswerService {// a workflow step that posted the call waits on it, and the answer resumes that step. An answer// replaces that output, so a call no longer pending starts nothing and is refused belowconst workflowStep = readToolCallWorkflowStep(toolPart.toolOutput);- const workflowRunId = workflowStep?.workflowRunId ?? null;const isToolCallPending =thread.pendingQuestionMessageId === toolPart.messageId &&isAwaitingPausingToolOutput(toolPart.toolOutput);@@ -149,7 +146,9 @@ export class ToolCallAnswerService {);}- let step: WorkflowAction | null = null;+ let resumeWaiter:+ | Extract<AwaitedToolCallWaiter, { status: 'ready' }>['resume']+ | null = null;let isClaimedAsRunning = false;let isLastAnswer: boolean;let answerText: string;@@ -166,23 +165,12 @@ export class ToolCallAnswerService {throw this.notPending();}- if (isDefined(workflowRunId)) {- step = await this.workflowRunWorkspaceService.findStepAwaitingAnswer({- threadId,- workflowRunId,- workspaceId,- expectedStepId: workflowStep?.stepId,- });+ if (isDefined(workflowStep)) {+ const waiter = await this.awaitedToolCallHandlerRegistry+ .getHandlerOrThrow()+ .findWaiter({ workspaceId, threadId, workflowStep });- if (- !isDefined(step) &&- (await this.workflowRunWorkspaceService.isStepStillRunning({- stepId: workflowStep?.stepId,- threadId,- workflowRunId,- workspaceId,- }))- ) {+ if (waiter.status === 'not_ready') {throw new AiException('The workflow step is not ready for an answer yet',AiExceptionCode.TOOL_CALL_NOT_PENDING,@@ -192,7 +180,7 @@ export class ToolCallAnswerService {);}- if (!isDefined(step)) {+ if (waiter.status === 'gone') {await this.agentChatService.closePendingToolCalls({threadId,messageId: toolPart.messageId,@@ -201,6 +189,8 @@ export class ToolCallAnswerService {throw this.notPending();}++ resumeWaiter = waiter.resume;}const runningToolResult = pausingToolCall.toRunningToolResult?.(@@ -247,7 +237,7 @@ export class ToolCallAnswerService {// a call claimed as running cannot be answered again, so the run or turn fails, which// closes the call as interrupted instead of leaving it waiting on an outcomeif (isClaimedAsRunning) {- if (!isDefined(workflowRunId)) {+ if (!isDefined(workflowStep)) {await this.agentChatService.closePendingToolCalls({threadId,@@ -266,7 +256,7 @@ export class ToolCallAnswerService {threadId,workspaceId,streamId,- workflowRunId,+ workflowStep,error,});} else {@@ -286,7 +276,7 @@ export class ToolCallAnswerService {threadId,userWorkspaceId,turnStatus:- isDefined(step) || !isLastAnswer+ isDefined(resumeWaiter) || !isLastAnswer? AgentTurnStatus.COMPLETED: AgentTurnStatus.RUNNING,uiMessage: {@@ -315,21 +305,15 @@ export class ToolCallAnswerService {);// runs resume in their own executor, and only the last answer resumes a chat- if (isDefined(step) || !isLastAnswer) {+ if (isDefined(resumeWaiter) || !isLastAnswer) {await this.streamRecoveryService.releaseStreamClaim({threadId,workspaceId,streamId,});- if (isLastAnswer && isDefined(workflowRunId) && isDefined(step)) {- await this.workflowRunnerWorkspaceService.resumeAnsweredStep({- workspaceId,- workflowRunId,- step,- threadId,- toolResult,- });+ if (isLastAnswer && isDefined(resumeWaiter)) {+ await resumeWaiter(toolResult);}return { streamId: null, turnId: answerMessage.turnId };@@ -352,7 +336,7 @@ export class ToolCallAnswerService {threadId,workspaceId,streamId,- workflowRunId,+ workflowStep,error,});@@ -364,16 +348,16 @@ export class ToolCallAnswerService {threadId,workspaceId,streamId,- workflowRunId,+ workflowStep,error,}: {threadId: string;workspaceId: string;streamId: string;- workflowRunId: string | null;+ workflowStep: ToolCallWorkflowStep | null;error: unknown;}): Promise<void> {- if (!isDefined(workflowRunId)) {+ if (!isDefined(workflowStep)) {await this.streamRecoveryService.failStream({threadId,workspaceId,@@ -389,12 +373,9 @@ export class ToolCallAnswerService {workspaceId,streamId,});- await this.workflowRunWorkspaceService.endWorkflowRun({- workflowRunId,- workspaceId,- status: WorkflowRunStatus.FAILED,- error: 'The run could not resume after its question was answered',- });+ await this.awaitedToolCallHandlerRegistry+ .getHandlerOrThrow()+ .failWaiter({ workspaceId, workflowStep });}// an answer that resumes a workflow step starts no chat turn, so it skips the model anddiff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/types/awaited-tool-call-handler.type.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/types/awaited-tool-call-handler.type.tsnew file mode 100644index 00000000000..8e0ff5b4392--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-tool-call-answer/types/awaited-tool-call-handler.type.ts@@ -0,0 +1,21 @@+import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';++export type AwaitedToolCallWaiter =+ | {+ status: 'ready';+ resume: (toolResult: Record<string, unknown>) => Promise<void>;+ }+ | { status: 'not_ready' }+ | { status: 'gone' };++export type AwaitedToolCallHandler = {+ findWaiter: (args: {+ workspaceId: string;+ threadId: string;+ workflowStep: ToolCallWorkflowStep;+ }) => Promise<AwaitedToolCallWaiter>;+ failWaiter: (args: {+ workspaceId: string;+ workflowStep: ToolCallWorkflowStep;+ }) => Promise<void>;+};diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.tsindex 2ed2f114095..5b495dff24a 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-agent-chat-pending-input.workspace-service.ts@@ -14,7 +14,7 @@ import { v5 } from 'uuid';import { RecordShareStorageService } from 'src/engine/core-modules/record-share/services/record-share-storage.service';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { PAUSING_TOOLS } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/constants/pausing-tools.constant';-import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/map-ai-steps-to-ui-message-parts.util';+import { mapAiStepsToUIMessageParts } from 'src/engine/metadata-modules/ai/ai-history/utils/map-ai-steps-to-ui-message-parts.util';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 { AgentConversationWriterService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-conversation-writer.service';diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.tsindex efdf0b05d87..5f390d6ff7d 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts@@ -5,13 +5,13 @@ import { FieldActorSource } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { WorkflowRunRecordShareService } from 'src/engine/core-modules/workflow/services/workflow-run-record-share.service';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service';import { AgentInboxService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service';-import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/types/tool-call-workflow-step.type';+import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';import { findLastMessageText } from 'src/engine/metadata-modules/ai/ai-chat/utils/find-last-message-text.util';-import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util';-import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-chat/utils/map-error-to-stream-error.util';+import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util';+import { mapErrorToStreamError } from 'src/engine/metadata-modules/ai/ai-history/utils/map-error-to-stream-error.util';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service';diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/find-agent-step-wait.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/find-agent-step-wait.util.tsindex 2d2adc1a162..316c3d4a820 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/find-agent-step-wait.util.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/utils/find-agent-step-wait.util.ts@@ -4,7 +4,7 @@ import {workflowStepWaitSchema,} from 'twenty-shared/workflow';-import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/is-awaiting-pausing-tool-output.util';+import { isAwaitingPausingToolOutput } from 'src/engine/metadata-modules/ai/ai-history/utils/is-awaiting-pausing-tool-output.util';import { WORKFLOW_AGENT_WAIT_TOOL_NAMES } from 'src/modules/workflow/workflow-executor/workflow-actions/ai-agent/constants/workflow-agent-wait-tool-names.constant';// The wait an execution paused on, when it ended on a wait tool calldiff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.tsindex 6f4a2421fa8..c8ec5c6e045 100644--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/send-chat-message/send-chat-message.workflow-action.ts@@ -13,7 +13,7 @@ import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/inteimport { ToolRegistryService } from 'src/engine/core-modules/tool-provider/services/tool-registry.service';import { type ToolContext } from 'src/engine/core-modules/tool-provider/types/tool-context.type';-import { readToolCallStatus } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/read-tool-call-status.util';+import { readToolCallStatus } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-status.util';import { resolveProposedToolCall } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/utils/resolve-proposed-tool-call.util';import { AgentInboxService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service';import { buildProposeToolCallPendingOutput } from 'src/engine/metadata-modules/ai/ai-agent-execution/pausing-tools/propose-tool-call.pausing-tool';diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.tsindex 27f6666e9b4..87588c6f80c 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/__tests__/workflow-run.workspace-service.conversation.spec.ts@@ -52,6 +52,9 @@ describe('WorkflowRunWorkspaceService conversations', () => {const turnRecorderService = {endWaitingTurn: jest.fn().mockResolvedValue(undefined),};+ const threadRecordEventService = {+ emitPendingQuestionCleared: jest.fn().mockResolvedValue(undefined),+ };messagePartRepository.query.mockImplementation(async (_workspaceId, run) =>run({@@ -68,6 +71,7 @@ describe('WorkflowRunWorkspaceService conversations', () => {messagePartRepository as never,{ cancelRunWaits: jest.fn().mockResolvedValue(undefined) } as never,turnRecorderService as never,+ threadRecordEventService as never,);// The run lock serializes these methods with every other step write.@@ -110,6 +114,7 @@ describe('WorkflowRunWorkspaceService conversations', () => {threadRepository,messagePartRepository,turnRecorderService,+ threadRecordEventService,updateWorkflowRun,};};@@ -329,6 +334,20 @@ describe('WorkflowRunWorkspaceService conversations', () => {});});+ it('tells open chat lists the conversation no longer waits on an answer', async () => {+ const { service, threadRecordEventService } = buildService();++ await endRun(service);++ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).toHaveBeenCalledWith({+ workspaceId: 'workspace-id',+ threadId: 'thread-id',+ messageId: 'message-id',+ });+ });+it('leaves open a call another run posted in a conversation they share', async () => {const { service, threadRepository, messagePartRepository } =buildService();@@ -353,14 +372,21 @@ describe('WorkflowRunWorkspaceService conversations', () => {});it('leaves a conversation to the answer holding its claim', async () => {- const { service, threadRepository, messagePartRepository } =- buildService();+ const {+ service,+ threadRepository,+ messagePartRepository,+ threadRecordEventService,+ } = buildService();threadRepository.update.mockResolvedValue({ affected: 0 });await endRun(service);expect(messagePartRepository.writePart).not.toHaveBeenCalled();+ expect(+ threadRecordEventService.emitPendingQuestionCleared,+ ).not.toHaveBeenCalled();});it('still ends the run when its conversations cannot be closed', async () => {diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.tsindex e2e3cb8b567..daaad23db03 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.module.ts@@ -5,6 +5,7 @@ import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.mimport { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';import { RecordPositionModule } from 'src/engine/core-modules/record-position/record-position.module';+import { AgentChatThreadLifecycleModule } from 'src/engine/metadata-modules/ai/ai-chat/agent-chat-thread-lifecycle.module';import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';import { WorkflowRunRecordShareModule } from 'src/engine/core-modules/workflow/workflow-run-record-share.module';import { WorkflowCommonModule } from 'src/modules/workflow/common/workflow-common.module';@@ -23,6 +24,7 @@ import { WorkflowStepWaitStoreModule } from 'src/modules/workflow/workflow-wait/FeatureFlagModule,WorkflowRunRecordShareModule,AgentHistoryModule,+ AgentChatThreadLifecycleModule,WorkflowStepWaitStoreModule,],providers: [diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.tsindex 445c68527d3..c23e7d3bb0c 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service.ts@@ -15,7 +15,7 @@ import { PermissionsException } from 'src/engine/metadata-modules/permissions/peimport { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';-import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-chat/utils/read-tool-call-workflow-step.util';+import { readToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/utils/read-tool-call-workflow-step.util';import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';import { type AgentMessagePartWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-message-part.workspace-entity';@@ -38,6 +38,7 @@ import {WorkflowRunExceptionCode,} from 'src/modules/workflow/workflow-runner/exceptions/workflow-run.exception';import { AgentTurnStatus } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-turn-status.enum';+import { AgentChatThreadRecordEventService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service';import { AgentTurnRecorderService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-turn-recorder.service';@Injectable()@@ -55,6 +56,7 @@ export class WorkflowRunWorkspaceService {private readonly messagePartRepository: AgentHistoryRepository<AgentMessagePartWorkspaceEntity>,private readonly workflowStepWaitWorkspaceService: WorkflowStepWaitWorkspaceService,private readonly turnRecorderService: AgentTurnRecorderService,+ private readonly threadRecordEventService: AgentChatThreadRecordEventService,) {}async createCoreWorkflowRun({@@ -788,6 +790,12 @@ export class WorkflowRunWorkspaceService {continue;}+ await this.threadRecordEventService.emitPendingQuestionCleared({+ workspaceId,+ threadId: id,+ messageId: pendingQuestionMessageId,+ });+// the question is already cleared, so its calls must close before anything else can failawait closeOpenToolParts({messagePartRepository: this.messagePartRepository,diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-runner.module.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-runner.module.tsindex 7587fc75c30..b879c269e87 100644--- a/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-runner.module.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workflow-runner.module.ts@@ -11,6 +11,8 @@ import { RunWorkflowJob } from 'src/modules/workflow/workflow-runner/jobs/run-woimport { WorkflowRunQueueModule } from 'src/modules/workflow/workflow-runner/workflow-run-queue/workflow-run-queue.module';import { WorkflowRunModule } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.module';import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service';+import { WorkflowAwaitedToolCallHandlerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-awaited-tool-call-handler.workspace-service';+import { AwaitedToolCallHandlerModule } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/awaited-tool-call-handler.module';import { CoreWorkflowRunnerService } from 'src/modules/workflow/workflow-runner/services/core-workflow-runner.service';import { WorkflowCoreModule } from 'src/engine/core-modules/workflow/workflow-core.module';import { WorkflowVersionCoreModule } from 'src/engine/core-modules/workflow/workflow-version-core.module';@@ -30,11 +32,13 @@ import { WorkflowExecutionContextModule } from 'src/modules/workflow/workflow-exWorkflowCoreModule,WorkflowVersionCoreModule,WorkflowExecutionContextModule,+ AwaitedToolCallHandlerModule,],providers: [WorkflowRunnerWorkspaceService,CoreWorkflowRunnerService,RunWorkflowJob,+ WorkflowAwaitedToolCallHandlerWorkspaceService,],exports: [WorkflowRunnerWorkspaceService, CoreWorkflowRunnerService],})diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-awaited-tool-call-handler.workspace-service.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-awaited-tool-call-handler.workspace-service.spec.tsnew file mode 100644index 00000000000..276841ca9bb--- /dev/null+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/__tests__/workflow-awaited-tool-call-handler.workspace-service.spec.ts@@ -0,0 +1,51 @@+import {+ WorkflowRunException,+ WorkflowRunExceptionCode,+} from 'src/modules/workflow/workflow-runner/exceptions/workflow-run.exception';+import { WorkflowAwaitedToolCallHandlerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-awaited-tool-call-handler.workspace-service';++describe('WorkflowAwaitedToolCallHandlerWorkspaceService', () => {+ const buildHandler = (findStepAwaitingAnswer: jest.Mock) => {+ const workflowRunWorkspaceService = {+ findStepAwaitingAnswer,+ isStepStillRunning: jest.fn().mockResolvedValue(false),+ };++ return new WorkflowAwaitedToolCallHandlerWorkspaceService(+ { register: jest.fn() } as never,+ workflowRunWorkspaceService as never,+ {} as never,+ );+ };++ const findWaiter = (+ handler: WorkflowAwaitedToolCallHandlerWorkspaceService,+ ) =>+ handler.findWaiter({+ workspaceId: 'workspace-id',+ threadId: 'thread-id',+ workflowStep: { workflowRunId: 'workflow-run-id', stepId: 'step-id' },+ });++ it('reports a deleted workflow run as gone', async () => {+ const handler = buildHandler(+ jest+ .fn()+ .mockRejectedValue(+ new WorkflowRunException(+ 'Workflow run not found',+ WorkflowRunExceptionCode.WORKFLOW_RUN_NOT_FOUND,+ ),+ ),+ );++ await expect(findWaiter(handler)).resolves.toEqual({ status: 'gone' });+ });++ it('rethrows other errors', async () => {+ const error = new Error('Database unavailable');+ const handler = buildHandler(jest.fn().mockRejectedValue(error));++ await expect(findWaiter(handler)).rejects.toBe(error);+ });+});diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-awaited-tool-call-handler.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-awaited-tool-call-handler.workspace-service.tsnew file mode 100644index 00000000000..f24feb7ca62--- /dev/null+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/workspace-services/workflow-awaited-tool-call-handler.workspace-service.ts@@ -0,0 +1,118 @@+import { Injectable, type OnModuleInit } from '@nestjs/common';++import { isDefined } from 'twenty-shared/utils';++import { type ToolCallWorkflowStep } from 'src/engine/metadata-modules/ai/ai-history/types/tool-call-workflow-step.type';+import { AwaitedToolCallHandlerRegistryService } from 'src/engine/metadata-modules/ai/ai-tool-call-answer/services/awaited-tool-call-handler-registry.service';+import {+ type AwaitedToolCallHandler,+ type AwaitedToolCallWaiter,+} from 'src/engine/metadata-modules/ai/ai-tool-call-answer/types/awaited-tool-call-handler.type';+import { WorkflowRunStatus } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';+import {+ WorkflowRunException,+ WorkflowRunExceptionCode,+} from 'src/modules/workflow/workflow-runner/exceptions/workflow-run.exception';+import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';+import { WorkflowRunnerWorkspaceService } from 'src/modules/workflow/workflow-runner/workspace-services/workflow-runner.workspace-service';++@Injectable()+export class WorkflowAwaitedToolCallHandlerWorkspaceService+ implements AwaitedToolCallHandler, OnModuleInit+{+ constructor(+ private readonly registry: AwaitedToolCallHandlerRegistryService,+ private readonly workflowRunWorkspaceService: WorkflowRunWorkspaceService,+ private readonly workflowRunnerWorkspaceService: WorkflowRunnerWorkspaceService,+ ) {}++ onModuleInit(): void {+ this.registry.register(this);+ }++ async findWaiter({+ workspaceId,+ threadId,+ workflowStep: { workflowRunId, stepId },+ }: {+ workspaceId: string;+ threadId: string;+ workflowStep: ToolCallWorkflowStep;+ }): Promise<AwaitedToolCallWaiter> {+ try {+ return await this.findWaiterOfExistingRun({+ workspaceId,+ threadId,+ workflowRunId,+ stepId,+ });+ } catch (error) {+ if (+ error instanceof WorkflowRunException &&+ error.code === WorkflowRunExceptionCode.WORKFLOW_RUN_NOT_FOUND+ ) {+ return { status: 'gone' };+ }++ throw error;+ }+ }++ private async findWaiterOfExistingRun({+ workspaceId,+ threadId,+ workflowRunId,+ stepId,+ }: {+ workspaceId: string;+ threadId: string;+ workflowRunId: string;+ stepId: string;+ }): Promise<AwaitedToolCallWaiter> {+ const step = await this.workflowRunWorkspaceService.findStepAwaitingAnswer({+ threadId,+ workflowRunId,+ workspaceId,+ expectedStepId: stepId,+ });++ if (isDefined(step)) {+ return {+ status: 'ready',+ resume: (toolResult) =>+ this.workflowRunnerWorkspaceService.resumeAnsweredStep({+ workspaceId,+ workflowRunId,+ step,+ threadId,+ toolResult,+ }),+ };+ }++ const isStepStillRunning =+ await this.workflowRunWorkspaceService.isStepStillRunning({+ stepId,+ threadId,+ workflowRunId,+ workspaceId,+ });++ return { status: isStepStillRunning ? 'not_ready' : 'gone' };+ }++ async failWaiter({+ workspaceId,+ workflowStep: { workflowRunId },+ }: {+ workspaceId: string;+ workflowStep: ToolCallWorkflowStep;+ }): Promise<void> {+ await this.workflowRunWorkspaceService.endWorkflowRun({+ workflowRunId,+ workspaceId,+ status: WorkflowRunStatus.FAILED,+ error: 'The run could not resume after its question was answered',+ });+ }+}