The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(ai): prevent chat thread bricking from tool parts with null input (#21752)
Félix Malfaitf96e36d3e675
diff --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-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.tsindex 9837fd2b2e2..4946d301415 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-agent-execution/utils/__tests__/finalize-dangling-tool-parts.roundtrip.spec.ts@@ -68,6 +68,27 @@ const unresolvedToolCallIds = async (return [...pending];};+// convertToModelMessages drops the `input` field when a tool part's input is+// nullish, so every reconstructed tool-call must carry a defined input.+const toolCallInputs = async (messages: UIMessage[]): Promise<unknown[]> => {+ const modelMessages = await convertToModelMessages(messages);+ const inputs: unknown[] = [];++ for (const message of modelMessages) {+ if (!Array.isArray(message.content)) {+ continue;+ }++ for (const content of message.content) {+ if (typeof content === 'object' && content.type === 'tool-call') {+ inputs.push(content.input);+ }+ }+ }++ return inputs;+};+describe('finalizeDanglingToolParts round-trip', () => {const interruptedBatch: ExtendedUIMessagePart[] = [{ type: 'text', text: 'Creating items…' } as ExtendedUIMessagePart,@@ -127,4 +148,43 @@ describe('finalizeDanglingToolParts round-trip', () => {]),);});++ // A tool call that failed input validation: persisted as output-error with+ // a null input (issue #21695).+ const validationErroredPart: ExtendedUIMessagePart = {+ type: 'tool-execute_tool',+ toolCallId: 'validation_failed_1',+ state: 'output-error',+ errorText: 'Invalid input for tool execute_tool: Type validation failed',+ } as unknown as ExtendedUIMessagePart;++ it('replays a validation-errored tool part with a defined input', async () => {+ const reloaded = persistAndReload(+ finalizeDanglingToolParts([validationErroredPart]),+ );++ const inputs = await toolCallInputs(buildThread(reloaded));++ expect(inputs).toHaveLength(1);+ expect(inputs[0]).toBeDefined();+ expect(inputs[0]).toEqual({});+ });++ it('keeps a validation-errored tool call resolved after the round-trip', async () => {+ const reloaded = persistAndReload(+ finalizeDanglingToolParts([validationErroredPart]),+ );++ expect(await unresolvedToolCallIds(buildThread(reloaded))).toEqual([]);+ });++ it('persists an empty object rather than null for a missing tool input', () => {+ const [dbPart] = mapUIMessagePartsToDBParts(+ finalizeDanglingToolParts([validationErroredPart]),+ 'message-1',+ 'workspace-1',+ );++ expect(dbPart.toolInput).toEqual({});+ });});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-agent-execution/utils/__tests__/finalize-dangling-tool-parts.util.spec.tsindex beb9ad1f9f8..8d3b15a0300 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-agent-execution/utils/__tests__/finalize-dangling-tool-parts.util.spec.ts@@ -39,12 +39,47 @@ describe('finalizeDanglingToolParts', () => {expect(finalizeDanglingToolParts([part])).toEqual([part]);});- it('leaves an errored tool part untouched', () => {+ it('leaves an errored tool part with an input untouched', () => {const part = buildToolPart('output-error', { errorText: 'boom' });expect(finalizeDanglingToolParts([part])).toEqual([part]);});+ it('backfills an empty input for an output-error part missing its input', () => {+ const part = buildToolPart('output-error', {+ input: undefined,+ errorText: 'Invalid input for tool execute_tool: Type validation failed',+ });++ expect(finalizeDanglingToolParts([part])).toEqual([+ {+ type: 'tool-execute_tool',+ toolCallId: 'call_1',+ input: {},+ state: 'output-error',+ errorText:+ 'Invalid input for tool execute_tool: Type validation failed',+ },+ ]);+ });++ it('preserves the existing error message when backfilling input', () => {+ const part = buildToolPart('output-error', {+ input: null,+ errorText: 'original validation error',+ });++ expect(finalizeDanglingToolParts([part])).toEqual([+ {+ type: 'tool-execute_tool',+ toolCallId: 'call_1',+ input: {},+ state: 'output-error',+ errorText: 'original validation error',+ },+ ]);+ });+it('drops an input-streaming tool part with incomplete arguments', () => {const part = buildToolPart('input-streaming');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-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.tsindex e795e7abd32..8e1541b1efd 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-agent-execution/utils/__tests__/map-message-parts.dynamic-tool.spec.ts@@ -70,6 +70,23 @@ describe('AgentMessagePart mappers — dynamic-tool support', () => {});});+ it('defaults a missing tool input to an empty object on persist (issue #21695)', () => {+ const [row] = mapUIMessagePartsToDBParts(+ [+ staticToolPart({+ state: 'output-error',+ input: undefined,+ output: undefined,+ errorText: 'Invalid input for tool execute_tool',+ }),+ ],+ 'message-1',+ 'workspace-1',+ );++ expect(row.toolInput).toEqual({});+ });+it('round-trips a dynamic-tool part through DB and back', () => {const original = dynamicToolPart();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-agent-execution/utils/finalize-dangling-tool-parts.util.tsindex 2bbe17f0073..6b6c1b677e5 100644--- 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-agent-execution/utils/finalize-dangling-tool-parts.util.ts@@ -3,17 +3,35 @@ import { type ExtendedUIMessagePart } from 'twenty-shared/ai';const INTERRUPTED_TOOL_ERROR_TEXT = 'Tool execution was interrupted.';+// A tool part with a nullish input serializes to a `tool_use` block with no+// `input` field, which Anthropic rejects — bricking every later turn (#21695).export const finalizeDanglingToolParts = (parts: ExtendedUIMessagePart[],): ExtendedUIMessagePart[] =>parts.filter((part) => !(isToolUIPart(part) && part.state === 'input-streaming'))- .map((part) =>- isToolUIPart(part) && part.state === 'input-available'- ? ({- ...part,- state: 'output-error',- errorText: INTERRUPTED_TOOL_ERROR_TEXT,- } as ExtendedUIMessagePart)- : part,- );+ .map((part) => {+ if (!isToolUIPart(part)) {+ return part;+ }++ // Dangling call interrupted mid-flight: resolve it as an error.+ if (part.state === 'input-available') {+ return {+ ...part,+ state: 'output-error',+ input: part.input ?? {},+ errorText: INTERRUPTED_TOOL_ERROR_TEXT,+ } as ExtendedUIMessagePart;+ }++ // Errored before its input was captured (e.g. failed input validation).+ if (part.state === 'output-error' && part.input == null) {+ return {+ ...part,+ input: {},+ } as ExtendedUIMessagePart;+ }++ return part;+ });diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.tsindex 3435d35fd77..9c7eed7ba81 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-execution/utils/mapUIMessagePartsToDBParts.ts@@ -82,7 +82,8 @@ export const mapUIMessagePartsToDBParts = (...basePart,toolName: getToolName(part),toolCallId: part.toolCallId,- toolInput: part.input,+ // A nullish input yields an invalid tool_use block (#21695).+ toolInput: part.input ?? {},toolOutput: part.output,errorMessage: part.errorText,state: part.state,