Skip to content

The open alternative to Salesforce, designed for AI.

Gate a background run's human-input tools in one place (#27564)

Félix Malfait0dfc372e6a7c
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts
index adf59cd8866..67715c58c42 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/__tests__/agent-runner.service.spec.ts
@@ -180,14 +180,8 @@ describe('AgentRunnerService', () => {
spec: { ...RUN_INPUT.spec, capabilities: { canAskHumans } },
});
- const [{ pausingTools, canProposeToolCalls }] =
- agentAsyncExecutorService.executeAgent.mock.calls[0];
-
- expect(canProposeToolCalls).toBe(canAskHumans);
- expect(Object.keys(pausingTools)).toEqual(
- canAskHumans
- ? expect.arrayContaining(['ask_question', 'request_form'])
- : expect.not.arrayContaining(['ask_question', 'request_form']),
+ expect(agentAsyncExecutorService.executeAgent).toHaveBeenCalledWith(
+ expect.objectContaining({ canAskHumans }),
);
},
);
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.ts
index 11dc760c727..659ae744159 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
@@ -13,9 +13,11 @@ import {
} from 'ai';
import { type RunAgentMessage } from 'twenty-shared/application';
import {
+ ASK_QUESTION_TOOL_NAME,
AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID,
type ExtendedUIMessage,
PROPOSE_TOOL_CALL_TOOL_NAME,
+ REQUEST_FORM_TOOL_NAME,
} from 'twenty-shared/ai';
import {
isDefined,
@@ -77,6 +79,8 @@ import { mergeLanguageModelUsage } from 'src/engine/metadata-modules/ai/ai-billi
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 { createAskQuestionTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/ask-question.tool';
+import { createRequestFormTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/request-form.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';
@@ -331,15 +335,14 @@ export class AgentAsyncExecutorService {
toolLoadingStrategy = 'preload',
priorMessages = [],
pausingTools = {},
- canProposeToolCalls = false,
+ canAskHumans = false,
}: {
agent: AgentEntity | null;
messages: RunAgentMessage[];
// a continued conversation, with the tool calls and results plain run messages cannot carry
priorMessages?: ExtendedUIMessage[];
pausingTools?: ToolSet;
- // offers propose_tool_call over the registry tools the agent can call itself, or emails without an agent
- canProposeToolCalls?: boolean;
+ canAskHumans?: boolean;
baseSystemPrompt: string;
workspaceId: string;
executionContext: AgentRunExecutionContext;
@@ -493,15 +496,24 @@ export class AgentAsyncExecutorService {
modalities,
});
- // an agent proposes its own tools; a step without an agent has none, so it proposes only emails
- const offeredPausingTools: ToolSet =
- canProposeToolCalls && (!isDefined(agent) || isDefined(proposableTools))
+ const offeredPausingTools: ToolSet = {
+ ...pausingTools,
+ ...(canAskHumans
+ ? {
+ [ASK_QUESTION_TOOL_NAME]: createAskQuestionTool({
+ isWorkspaceSetupThread: false,
+ }),
+ [REQUEST_FORM_TOOL_NAME]: createRequestFormTool(),
+ }
+ : {}),
+ // an agent proposes its own tools; a step without an agent has none, so it proposes only emails
+ ...(canAskHumans && (!isDefined(agent) || isDefined(proposableTools))
? {
- ...pausingTools,
[PROPOSE_TOOL_CALL_TOOL_NAME]:
this.buildProposeToolCallTool(proposableTools),
}
- : pausingTools;
+ : {}),
+ };
const offeredToolNames = Object.keys(offeredPausingTools);
const textResponse = await generateText({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts
index 3885ac28825..08e3b21c699 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/services/agent-runner.service.ts
@@ -1,11 +1,7 @@
import { Injectable, Logger } from '@nestjs/common';
import { isNonEmptyString } from '@sniptt/guards';
-import {
- ASK_QUESTION_TOOL_NAME,
- REQUEST_FORM_TOOL_NAME,
- type AgentRunSummary,
-} from 'twenty-shared/ai';
+import { type AgentRunSummary } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
@@ -25,8 +21,6 @@ import { type ContinueAgentRunJobData } from 'src/engine/metadata-modules/ai/ai-
import { buildAgentRunSummary } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/build-agent-run-summary.util';
import { sumAgentRunSummaries } from 'src/engine/metadata-modules/ai/ai-agent-execution/utils/sum-agent-run-summaries.util';
import { AgentEntity } from 'src/engine/metadata-modules/ai/ai-agent/entities/agent.entity';
-import { createAskQuestionTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/ask-question.tool';
-import { createRequestFormTool } from 'src/engine/metadata-modules/ai/ai-chat/tools/request-form.tool';
import { AgentConversationReaderService } from 'src/engine/metadata-modules/ai/ai-history/services/agent-conversation-reader.service';
import { withDedicatedAiTrace } from 'src/engine/metadata-modules/ai/ai-models/utils/with-dedicated-ai-trace.util';
import {
@@ -244,18 +238,8 @@ export class AgentRunnerService {
AGENT_WAIT_PROMPT,
...(isNonEmptyString(spec.instructions) ? [spec.instructions] : []),
].join('\n\n'),
- pausingTools: {
- ...createAgentWaitTools(),
- ...(spec.capabilities.canAskHumans
- ? {
- [ASK_QUESTION_TOOL_NAME]: createAskQuestionTool({
- isWorkspaceSetupThread: false,
- }),
- [REQUEST_FORM_TOOL_NAME]: createRequestFormTool(),
- }
- : {}),
- },
- canProposeToolCalls: spec.capabilities.canAskHumans,
+ pausingTools: createAgentWaitTools(),
+ canAskHumans: spec.capabilities.canAskHumans,
workspaceId,
executionContext,
additionalExcludedToolNames: spec.additionalExcludedToolNames,