Fix greptile comments

Author: Theodore Li

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -3,6 +3,7 @@ import { mcpServers } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray, isNull } from 'drizzle-orm'
 import { createMcpToolId } from '@/lib/mcp/utils'
+import { getCustomToolById } from '@/lib/workflows/custom-tools/operations'
 import { getAllBlocks } from '@/blocks'
 import type { BlockOutput } from '@/blocks/types'
 import {
@@ -283,7 +284,6 @@ export class AgentBlockHandler implements BlockHandler {
     }
 
     try {
-      const { getCustomToolById } = await import('@/lib/workflows/custom-tools/operations')
       const tool = await getCustomToolById({
         toolId: customToolId,
         userId: ctx.userId,

apps/sim/lib/workflows/custom-tools/operations.ts

@@ -158,6 +158,36 @@ export async function getCustomToolById(params: {
   return legacyTool[0] || null
 }
 
+export async function getCustomToolByIdOrTitle(params: {
+  identifier: string
+  userId: string
+  workspaceId?: string
+}) {
+  const { identifier, userId, workspaceId } = params
+
+  const conditions = [
+    or(eq(customTools.id, identifier), eq(customTools.title, identifier)),
+  ]
+
+  if (workspaceId) {
+    const workspaceTool = await db
+      .select()
+      .from(customTools)
+      .where(and(eq(customTools.workspaceId, workspaceId), ...conditions))
+      .limit(1)
+    if (workspaceTool[0]) return workspaceTool[0]
+  }
+
+  const legacyTool = await db
+    .select()
+    .from(customTools)
+    .where(
+      and(isNull(customTools.workspaceId), eq(customTools.userId, userId), ...conditions)
+    )
+    .limit(1)
+  return legacyTool[0] || null
+}
+
 export async function deleteCustomTool(params: {
   toolId: string
   userId: string

apps/sim/tools/index.test.ts

@@ -24,6 +24,7 @@ const {
   mockRateLimiterFns,
   mockGetCustomToolById,
   mockListCustomTools,
+  mockGetCustomToolByIdOrTitle,
 } = vi.hoisted(() => ({
   mockIsHosted: { value: false },
   mockEnv: { NEXT_PUBLIC_APP_URL: 'http://localhost:3000' } as Record<string, string | undefined>,
@@ -36,6 +37,7 @@ const {
   },
   mockGetCustomToolById: vi.fn(),
   mockListCustomTools: vi.fn(),
+  mockGetCustomToolByIdOrTitle: vi.fn(),
 }))
 
 // Mock feature flags
@@ -225,6 +227,7 @@ vi.mock('@/hooks/queries/utils/custom-tool-cache', () => {
 vi.mock('@/lib/workflows/custom-tools/operations', () => ({
   getCustomToolById: mockGetCustomToolById,
   listCustomTools: mockListCustomTools,
+  getCustomToolByIdOrTitle: mockGetCustomToolByIdOrTitle,
 }))
 
 vi.mock('@/tools/utils.server', async (importOriginal) => {
@@ -320,7 +323,7 @@ describe('Custom Tools', () => {
   })
 
   it('resolves custom tools through the async helper', async () => {
-    mockGetCustomToolById.mockResolvedValue({
+    mockGetCustomToolByIdOrTitle.mockResolvedValue({
       id: 'remote-tool-123',
       title: 'Custom Weather Tool',
       schema: {

apps/sim/tools/utils.server.ts

@@ -3,8 +3,8 @@ import {
   secureFetchWithPinnedIP,
   validateUrlWithDNS,
 } from '@/lib/core/security/input-validation.server'
+import { getCustomToolByIdOrTitle } from '@/lib/workflows/custom-tools/operations'
 import { isCustomTool } from '@/executor/constants'
-import type { CustomToolDefinition } from '@/hooks/queries/custom-tools'
 import { extractErrorMessage } from '@/tools/error-extractors'
 import { tools } from '@/tools/registry'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
@@ -114,23 +114,18 @@ async function fetchCustomToolFromDB(
       return undefined
     }
 
-    const { getCustomToolById, listCustomTools } = await import(
-      '@/lib/workflows/custom-tools/operations'
-    )
-
-    // Try to find by ID first, fall back to searching by title
-    const customTool =
-      (await getCustomToolById({ toolId: identifier, userId, workspaceId })) ??
-      (await listCustomTools({ userId, workspaceId })).find(
-        (t: { title: string }) => t.title === identifier
-      )
+    const customTool = await getCustomToolByIdOrTitle({
+      identifier,
+      userId,
+      workspaceId,
+    })
 
     if (!customTool) {
       logger.error(`Custom tool not found: ${identifier}`)
       return undefined
     }
 
-    const toolConfig = createToolConfig(customTool as unknown as CustomToolDefinition, customToolId)
+    const toolConfig = createToolConfig(customTool, customToolId)
 
     return {
       ...toolConfig,

apps/sim/tools/utils.ts

@@ -295,7 +295,7 @@ export function getTool(toolId: string, _workspaceId?: string): ToolConfig | und
 
 // Helper function to create a tool config from a custom tool
 export function createToolConfig(
-  customTool: CustomToolDefinition,
+  customTool: { title: string; schema: any; code?: string },
   customToolId: string
 ): ToolConfig {
   // Create a parameter schema from the custom tool schema