The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(ai-chat) - fix AI chat turns dying on tool results that carry Date values (#25921)
Etienne12c58d503d79
diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/output-transforms/__tests__/normalize-tool-output-to-json-values.util.spec.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/output-transforms/__tests__/normalize-tool-output-to-json-values.util.spec.tsnew file mode 100644index 00000000000..87f0d90fa91--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/output-transforms/__tests__/normalize-tool-output-to-json-values.util.spec.ts@@ -0,0 +1,63 @@+import { modelMessageSchema } from 'ai';+import { z } from 'zod';++import { normalizeToolOutputToJsonValues } from 'src/engine/core-modules/tool-provider/output-transforms/normalize-tool-output-to-json-values.util';++const output = {+ success: true,+ message: 'Found 1 company records',+ result: {+ records: [+ {+ id: '1',+ name: 'Acme',+ createdAt: new Date('2026-09-14T09:15:22.895Z'),+ },+ ],+ },+};++const asToolMessages = (output: unknown) => [+ {+ role: 'tool',+ content: [+ {+ type: 'tool-result',+ toolCallId: 'call_1',+ toolName: 'execute_tool',+ output: { type: 'json', value: output },+ },+ ],+ },+];++describe('normalizeToolOutputToJsonValues', () => {+ it('turns dates into ISO strings', () => {+ expect(normalizeToolOutputToJsonValues(output)).toEqual({+ success: true,+ message: 'Found 1 company records',+ result: {+ records: [+ { id: '1', name: 'Acme', createdAt: '2026-09-14T09:15:22.895Z' },+ ],+ },+ });+ });+});++describe('tool output reaching the model', () => {+ it('is rejected by the ModelMessage schema when it carries a date', () => {+ expect(+ z.array(modelMessageSchema).safeParse(asToolMessages(output)).success,+ ).toBe(false);+ });++ it('is accepted once normalized', () => {+ expect(+ z+ .array(modelMessageSchema)+ .safeParse(asToolMessages(normalizeToolOutputToJsonValues(output)))+ .success,+ ).toBe(true);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/output-transforms/normalize-tool-output-to-json-values.util.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/output-transforms/normalize-tool-output-to-json-values.util.tsnew file mode 100644index 00000000000..36b0ac566ac--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/output-transforms/normalize-tool-output-to-json-values.util.ts@@ -0,0 +1,11 @@+import { type ToolOutput } from 'src/engine/core-modules/tool/types/tool-output.type';++export const normalizeToolOutputToJsonValues = (+ output: ToolOutput,+): ToolOutput => {+ try {+ return JSON.parse(JSON.stringify(output));+ } catch {+ return output;+ }+};diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.tsindex b5df4e8f859..1559f6e3b6a 100644--- a/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/services/tool-registry.service.ts@@ -10,6 +10,7 @@ import { type ToolRetrievalOptions } from 'src/engine/core-modules/tool-providerimport { TOOL_PROVIDERS } from 'src/engine/core-modules/tool-provider/constants/tool-providers.token';import { compactToolOutput } from 'src/engine/core-modules/tool-provider/output-transforms/compact-tool-output.util';+import { normalizeToolOutputToJsonValues } from 'src/engine/core-modules/tool-provider/output-transforms/normalize-tool-output-to-json-values.util';import { ToolExecutorService } from 'src/engine/core-modules/tool-provider/services/tool-executor.service';import { type LearnToolsAspect } from 'src/engine/core-modules/tool-provider/tools/learn-tools.tool';import { type ToolContext } from 'src/engine/core-modules/tool-provider/types/tool-context.type';@@ -144,13 +145,15 @@ export class ToolRegistryService {? (compactToolOutput(result) as ToolOutput): result;- return spillLargeOutput- ? this.toolOutputSpillService.spillIfTooLarge(+ const inlined = spillLargeOutput+ ? await this.toolOutputSpillService.spillIfTooLarge(compacted,{ workspaceId: context.workspaceId },{ toolName: descriptor.name },): compacted;++ return normalizeToolOutputToJsonValues(inlined);};toolSet[descriptor.name] = {@@ -335,13 +338,15 @@ export class ToolRegistryService {? (compactToolOutput(result) as ToolOutput): result;- return options?.spillLargeOutput- ? this.toolOutputSpillService.spillIfTooLarge(+ const inlined = options?.spillLargeOutput+ ? await this.toolOutputSpillService.spillIfTooLarge(compacted,{ workspaceId: fullContext.workspaceId },{ toolName },): compacted;++ return normalizeToolOutputToJsonValues(inlined);} catch (error) {const errorMessage =error instanceof Error ? error.message : String(error);