From 304952972b84405f495f00d40acef3d39f284c8d Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Fri, 13 Nov 2026 10:03:30 -0800
Subject: [PATCH 1/2] improvement(search-mcp): log the field names a rejected
 tool call's arguments carry

---
 .../lib/knowledge/mcp/tool-arguments.test.ts  | 28 +++++++++++++++++++
 apps/sim/lib/knowledge/mcp/tool-arguments.ts  | 18 ++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 apps/sim/lib/knowledge/mcp/tool-arguments.test.ts

diff --git a/apps/sim/lib/knowledge/mcp/tool-arguments.test.ts b/apps/sim/lib/knowledge/mcp/tool-arguments.test.ts
new file mode 100644
index 00000000000..bca0b850c9f
--- /dev/null
+++ b/apps/sim/lib/knowledge/mcp/tool-arguments.test.ts
@@ -0,0 +1,28 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { toolCallInputIssues } from '@/lib/knowledge/mcp/tool-arguments'
+
+const searchCall = (args: Record<string, unknown>) => ({
+  jsonrpc: '2.0',
+  id: 1,
+  method: 'tools/call',
+  params: { name: 'search', arguments: args },
+})
+
+describe('toolCallInputIssues', () => {
+  it('names the fields a native query carries that the schema does not know', () => {
+    const issues = toolCallInputIssues(
+      searchCall({
+        query: 'roadmap',
+        nativeQueries: [{ provider: 'jira', query: 'roadmap', limit: 5 }],
+      })
+    )
+    expect(issues?.issues).toContainEqual({
+      code: 'unrecognized_keys',
+      path: 'nativeQueries.0',
+      keys: ['limit'],
+    })
+  })
+})
diff --git a/apps/sim/lib/knowledge/mcp/tool-arguments.ts b/apps/sim/lib/knowledge/mcp/tool-arguments.ts
index 0e0603ed0ae..0a10fc590c4 100644
--- a/apps/sim/lib/knowledge/mcp/tool-arguments.ts
+++ b/apps/sim/lib/knowledge/mcp/tool-arguments.ts
@@ -87,9 +87,15 @@ export function repairToolCallMessage(message: Record<string, unknown>) {
   return { message: { ...message, params: { ...call, arguments: args } }, repairs: [...repairs] }
 }
 
+/** Unrecognized field names a rejection records, each cut short, so a log line stays bounded. */
+const MAX_LOGGED_KEYS = 5
+const MAX_LOGGED_KEY_CHARACTERS = 64
+
 /**
  * Where a tool call's arguments fail its input schema, as field paths and issue codes without
- * values. The SDK rejects such a call before the tool runs, so nothing else records it.
+ * values, plus the names of fields the schema does not know, so a repeated client mistake can be
+ * told apart from a new one. The SDK rejects such a call before the tool runs, so nothing else
+ * records it.
  */
 export function toolCallInputIssues(message: Record<string, unknown>) {
   const call = readToolCall(message)
@@ -99,6 +105,14 @@ export function toolCallInputIssues(message: Record<string, unknown>) {
   if (parsed.success) return undefined
   return {
     toolName: call.name,
-    issues: parsed.error.issues.map(({ code, path }) => ({ code, path: path.join('.') })),
+    issues: parsed.error.issues.map((issue) => ({
+      code: issue.code,
+      path: issue.path.join('.'),
+      ...(issue.code === 'unrecognized_keys' && {
+        keys: issue.keys
+          .slice(0, MAX_LOGGED_KEYS)
+          .map((key) => key.slice(0, MAX_LOGGED_KEY_CHARACTERS)),
+      }),
+    })),
   }
 }

From dc3bbd8258dd3b65cef8cfb7d7bf1a1ccea7fe66 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Fri, 13 Nov 2026 10:14:02 -0800
Subject: [PATCH 2/2] improvement(search-mcp): say the logged-key cap applies
 per schema issue

---
 apps/sim/lib/knowledge/mcp/tool-arguments.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/sim/lib/knowledge/mcp/tool-arguments.ts b/apps/sim/lib/knowledge/mcp/tool-arguments.ts
index 0a10fc590c4..80ee4ee4d2e 100644
--- a/apps/sim/lib/knowledge/mcp/tool-arguments.ts
+++ b/apps/sim/lib/knowledge/mcp/tool-arguments.ts
@@ -87,7 +87,10 @@ export function repairToolCallMessage(message: Record<string, unknown>) {
   return { message: { ...message, params: { ...call, arguments: args } }, repairs: [...repairs] }
 }
 
-/** Unrecognized field names a rejection records, each cut short, so a log line stays bounded. */
+/**
+ * Unrecognized field names logged per schema issue, each cut short. The schema caps native queries
+ * at nine, so a rejection's log line stays bounded.
+ */
 const MAX_LOGGED_KEYS = 5
 const MAX_LOGGED_KEY_CHARACTERS = 64