fix(tools): stop normalizeToolId eating the _v2 version suffix

table_query_rows_v2 starts with 'table_query_rows_', so the resource-suffix
strip normalized it to the v1 tool. The executor then logged the v2 id while
issuing v1's request shape — GET /rows?filter=<predicate> instead of
POST /query with a predicate body — so a correctly configured table_v2 block
400'd with 'Filter looks like a v2 predicate tree but reached the legacy filter
compiler'. The guard was right; the tool resolution was wrong.

A trailing _v<n> is a version marker, not a resource id, so it is no longer
stripped. Versioned ops are matched longest-first and listed alongside their
unversioned form, so table_query_rows_v2_<tableId> still normalizes to
table_query_rows_v2 rather than collapsing to v1.

Applies to the knowledge ops too — same loop shape, same latent trap the first
time one of them is versioned.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011M563cbFy2S74GvSDf2C3R

Author: TheodoreSpeaks

apps/sim/tools/normalize.test.ts

@@ -0,0 +1,40 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { normalizeToolId } from '@/tools/normalize'
+
+describe('normalizeToolId', () => {
+  it('strips a resource-id suffix', () => {
+    expect(normalizeToolId('table_query_rows_tbl_1a2c1741')).toBe('table_query_rows')
+    expect(normalizeToolId('knowledge_search_5cc56998-3e1d-4d91')).toBe('knowledge_search')
+    expect(normalizeToolId('workflow_executor_f3d81b32')).toBe('workflow_executor')
+    expect(normalizeToolId('deployed_block_executor_custom_block_9')).toBe(
+      'deployed_block_executor'
+    )
+  })
+
+  it('leaves a bare tool id alone', () => {
+    expect(normalizeToolId('table_query_rows')).toBe('table_query_rows')
+    expect(normalizeToolId('gmail_send')).toBe('gmail_send')
+  })
+
+  /**
+   * Regression: `table_query_rows_v2` starts with `table_query_rows_`, so the
+   * resource-suffix strip turned it into the v1 tool. The executor then logged
+   * the v2 id while issuing v1's `GET /rows?filter=<predicate>` — which reached
+   * the legacy filter compiler and 400'd on a correctly configured v2 block.
+   */
+  it('does not mistake a version suffix for a resource id', () => {
+    expect(normalizeToolId('table_query_rows_v2')).toBe('table_query_rows_v2')
+  })
+
+  it('still strips a resource id from a VERSIONED op', () => {
+    expect(normalizeToolId('table_query_rows_v2_tbl_1a2c1741')).toBe('table_query_rows_v2')
+  })
+
+  it('is not fooled by a table id that merely starts with v', () => {
+    expect(normalizeToolId('table_query_rows_v2x')).toBe('table_query_rows')
+    expect(normalizeToolId('table_query_rows_version')).toBe('table_query_rows')
+  })
+})

apps/sim/tools/normalize.ts

@@ -6,6 +6,29 @@
  *
  * Pure string utility — no server dependencies, safe to import in client components.
  */
+
+/**
+ * A trailing `_v2`-style segment is a VERSION marker, not a resource id, so it
+ * must not be stripped: `table_query_rows_v2` is its own registered tool, and
+ * normalizing it to `table_query_rows` silently executes the v1 tool's request
+ * shape under the v2 tool's name.
+ */
+const VERSION_SUFFIX = /^v\d+$/
+
+/**
+ * Longest id first, so a versioned op claims its own suffixed ids before the
+ * unversioned prefix can match them (`table_query_rows_v2_<tableId>` must
+ * normalize to `table_query_rows_v2`, not `table_query_rows`).
+ */
+function stripResourceSuffix(toolId: string, ops: string[]): string | null {
+  for (const op of [...ops].sort((a, b) => b.length - a.length)) {
+    if (!toolId.startsWith(`${op}_`) || toolId.length <= op.length + 1) continue
+    if (VERSION_SUFFIX.test(toolId.slice(op.length + 1))) continue
+    return op
+  }
+  return null
+}
+
 export function normalizeToolId(toolId: string): string {
   // Custom (deploy-as-block) tools: 'deployed_block_executor_custom_block_<id>' ->
   // 'deployed_block_executor'. Note the id deliberately does NOT start with
@@ -23,14 +46,12 @@ export function normalizeToolId(toolId: string): string {
   }
 
   const knowledgeOps = ['knowledge_search', 'knowledge_upload_chunk', 'knowledge_create_document']
-  for (const op of knowledgeOps) {
-    if (toolId.startsWith(`${op}_`) && toolId.length > op.length + 1) {
-      return op
-    }
-  }
+  const knowledge = stripResourceSuffix(toolId, knowledgeOps)
+  if (knowledge) return knowledge
 
   const tableOps = [
     'table_query_rows',
+    'table_query_rows_v2',
     'table_insert_row',
     'table_batch_insert_rows',
     'table_update_row',
@@ -41,11 +62,8 @@ export function normalizeToolId(toolId: string): string {
     'table_delete_row',
     'table_get_schema',
   ]
-  for (const op of tableOps) {
-    if (toolId.startsWith(`${op}_`) && toolId.length > op.length + 1) {
-      return op
-    }
-  }
+  const table = stripResourceSuffix(toolId, tableOps)
+  if (table) return table
 
   return toolId
 }