fix(security): isolate opaque tool schemas

TheodoreSpeaks · TheodoreSpeaks · commit ff822805406e · 2026-08-11T19:55:51.000-07:00
diff --git a/apps/sim/lib/workflows/search-replace/indexer.test.ts b/apps/sim/lib/workflows/search-replace/indexer.test.ts
@@ -39,6 +39,23 @@ describe('indexWorkflowSearchMatches', () => {
     ])
   })
 
+  it.each(['custom-tool', 'mcp'])(
+    'keeps %s params non-authoritative when its tool ID collides with a built-in',
+    (type) => {
+      expect(
+        getToolInputParamConfigs({
+          tool: { type, toolId: 'gmail_send', params: { body: 'literal-secret' } },
+        })
+      ).toEqual([
+        expect.objectContaining({
+          paramId: 'body',
+          authoritative: false,
+          value: 'literal-secret',
+        }),
+      ])
+    }
+  )
+
   it('finds plain text matches across nested subblock values', () => {
     const workflow = createSearchReplaceWorkflowFixture()
 
diff --git a/apps/sim/lib/workflows/search-replace/indexer.ts b/apps/sim/lib/workflows/search-replace/indexer.ts
@@ -698,10 +698,10 @@ export function getToolInputParamConfigs({
   credentialTypeById?: Record<string, string | undefined>
   blockConfigs?: WorkflowSearchIndexerOptions['blockConfigs']
 }): ResolvedToolInputParamConfig[] {
-  const toolId =
-    tool.type !== 'custom-tool' && tool.type !== 'mcp'
-      ? getToolIdForOperation(tool.type, tool.operation) || tool.toolId
-      : tool.toolId
+  const hasAuthoritativeRegistryDefinition = tool.type !== 'custom-tool' && tool.type !== 'mcp'
+  const toolId = hasAuthoritativeRegistryDefinition
+    ? getToolIdForOperation(tool.type, tool.operation) || tool.toolId
+    : undefined
   const toolParamValues = tool.params ?? {}
   const values = { operation: tool.operation, ...toolParamValues }
   const genericFallback = () =>
@@ -737,20 +737,14 @@ export function getToolInputParamConfigs({
     toolIndex,
     tool.type
   )
-  const blockConfig =
-    tool.type !== 'custom-tool' && tool.type !== 'mcp'
-      ? (blockConfigs?.[tool.type] ?? getBlock(tool.type))
-      : null
-  const subBlocksResult =
-    tool.type !== 'custom-tool' && tool.type !== 'mcp'
-      ? getSubBlocksForToolInput(
-          toolId,
-          tool.type,
-          values,
-          scopedCanonicalModes,
-          blockConfig?.subBlocks ? { subBlocks: blockConfig.subBlocks } : undefined
-        )
-      : null
+  const blockConfig = blockConfigs?.[tool.type] ?? getBlock(tool.type)
+  const subBlocksResult = getSubBlocksForToolInput(
+    toolId,
+    tool.type,
+    values,
+    scopedCanonicalModes,
+    blockConfig?.subBlocks ? { subBlocks: blockConfig.subBlocks } : undefined
+  )
   const toolParams = getToolParametersConfig(toolId, tool.type, values)
   const displayParams = toolParams?.userInputParameters ?? []
 
