Skip to content

The open alternative to Salesforce, designed for AI.

fix(ai-chat): preload web_search action tool when driver is enabled (#19461)

Félix Malfait7aed9291cd53
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500014000-fix-message-thread-view-and-label-identifier.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500014000-fix-message-thread-view-and-label-identifier.command.ts
index 737160af9d0..dba76ce1a70 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500014000-fix-message-thread-view-and-label-identifier.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-21/1-21-workspace-command-1775500014000-fix-message-thread-view-and-label-identifier.command.ts
@@ -155,6 +155,7 @@ export class FixMessageThreadViewAndLabelIdentifierCommand extends ActiveOrSuspe
workspaceId,
applicationUniversalIdentifier:
twentyStandardFlatApplication.universalIdentifier,
+ isSystemBuild: true,
},
);
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.ts
index 2f062fcbbbc..239e522981b 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
@@ -142,8 +142,15 @@ export class ChatExecutionService {
`Built tool catalog with ${toolCatalog.length} tools, ${skillCatalog.length} skills available`,
);
+ const useNativeSearch = this.webSearchService.shouldUseNativeSearch();
+
+ const toolNamesToPreload = [
+ ...COMMON_PRELOAD_TOOLS,
+ ...(useNativeSearch ? [] : ['web_search']),
+ ];
+
const preloadedTools = await this.toolRegistry.getToolsByName(
- COMMON_PRELOAD_TOOLS,
+ toolNamesToPreload,
toolContext,
);
@@ -163,8 +170,6 @@ export class ChatExecutionService {
registeredModel.modelId,
);
- const useNativeSearch = this.webSearchService.shouldUseNativeSearch();
-
const { tools: nativeSearchTools, callableToolNames: searchToolNames } =
useNativeSearch
? this.getNativeWebSearchTools(registeredModel)