improvement(repo): reorganize contracts directory (#4376)

* chore(contracts): reorg microsoft/google contracts

* chore(contracts): reorg directory

apps/sim/app/api/proxy/tts/stream/route.ts

@@ -3,7 +3,7 @@ import { chat } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { ttsStreamContract } from '@/lib/api/contracts/media-tools'
+import { ttsStreamContract } from '@/lib/api/contracts/media/tts-stream'
 import { parseRequest } from '@/lib/api/server'
 import { env } from '@/lib/core/config/env'
 import { validateAuthToken } from '@/lib/core/security/deployment'

apps/sim/app/api/speech/token/route.ts

@@ -3,7 +3,7 @@ import { chat } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { speechTokenBodySchema } from '@/lib/api/contracts/media-tools'
+import { speechTokenBodySchema } from '@/lib/api/contracts/media/speech'
 import { getSession } from '@/lib/auth'
 import { checkServerSideUsageLimits } from '@/lib/billing/calculations/usage-monitor'
 import { recordUsage } from '@/lib/billing/core/usage-log'

apps/sim/app/api/tools/a2a/cancel-task/route.ts

@@ -2,7 +2,7 @@ import type { Task } from '@a2a-js/sdk'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aCancelTaskContract } from '@/lib/api/contracts/internal-tools'
+import { a2aCancelTaskContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/delete-push-notification/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aDeletePushNotificationContract } from '@/lib/api/contracts/internal-tools'
+import { a2aDeletePushNotificationContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/get-agent-card/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aGetAgentCardContract } from '@/lib/api/contracts/internal-tools'
+import { a2aGetAgentCardContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/get-push-notification/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aGetPushNotificationContract } from '@/lib/api/contracts/internal-tools'
+import { a2aGetPushNotificationContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/get-task/route.ts

@@ -2,7 +2,7 @@ import type { Task } from '@a2a-js/sdk'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aGetTaskContract } from '@/lib/api/contracts/internal-tools'
+import { a2aGetTaskContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/resubscribe/route.ts

@@ -9,7 +9,7 @@ import type {
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/utils'
-import { a2aResubscribeContract } from '@/lib/api/contracts/internal-tools'
+import { a2aResubscribeContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/a2a/send-message/route.ts

@@ -4,7 +4,7 @@ import { toError } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/utils'
-import { a2aSendMessageContract } from '@/lib/api/contracts/internal-tools'
+import { a2aSendMessageContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'

apps/sim/app/api/tools/a2a/set-push-notification/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { a2aSetPushNotificationContract } from '@/lib/api/contracts/internal-tools'
+import { a2aSetPushNotificationContract } from '@/lib/api/contracts/tools/internal/a2a'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'

apps/sim/app/api/tools/cursor/download-artifact/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { cursorDownloadArtifactContract } from '@/lib/api/contracts/internal-tools'
+import { cursorDownloadArtifactContract } from '@/lib/api/contracts/tools/internal/cursor'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/custom/route.ts

@@ -9,7 +9,7 @@ import {
   deleteCustomToolContract,
   listCustomToolsContract,
   upsertCustomToolsContract,
-} from '@/lib/api/contracts/custom-tools'
+} from '@/lib/api/contracts/tools/custom'
 import { parseRequest } from '@/lib/api/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/discord/channels/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { discordChannelsContract } from '@/lib/api/contracts'
+import { discordChannelsContract } from '@/lib/api/contracts/tools/communication/discord'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateNumericId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/discord/send-message/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { discordSendMessageContract } from '@/lib/api/contracts'
+import { discordSendMessageContract } from '@/lib/api/contracts/tools/communication/discord'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateNumericId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/discord/servers/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { discordServersContract } from '@/lib/api/contracts'
+import { discordServersContract } from '@/lib/api/contracts/tools/communication/discord'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateNumericId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/docusign/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { docusignToolContract } from '@/lib/api/contracts/internal-tools'
+import { docusignToolContract } from '@/lib/api/contracts/tools/internal/docusign'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/extend/parse/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { extendParseContract } from '@/lib/api/contracts/media-tools'
+import { extendParseContract } from '@/lib/api/contracts/tools/media/document-parse'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/file/manage/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { fileManageContract } from '@/lib/api/contracts/media-tools'
+import { fileManageContract } from '@/lib/api/contracts/tools/file'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'

apps/sim/app/api/tools/gmail/add-label/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailAddLabelContract } from '@/lib/api/contracts/google-tools'
+import { gmailAddLabelContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateAlphanumericId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/gmail/archive/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailArchiveContract } from '@/lib/api/contracts/google-tools'
+import { gmailArchiveContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/delete/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailDeleteContract } from '@/lib/api/contracts/google-tools'
+import { gmailDeleteContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/draft/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailDraftContract } from '@/lib/api/contracts/google-tools'
+import { gmailDraftContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/edit-draft/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailEditDraftContract } from '@/lib/api/contracts/google-tools'
+import { gmailEditDraftContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/mark-read/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailMarkReadContract } from '@/lib/api/contracts/google-tools'
+import { gmailMarkReadContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/mark-unread/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailMarkUnreadContract } from '@/lib/api/contracts/google-tools'
+import { gmailMarkUnreadContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/move/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailMoveContract } from '@/lib/api/contracts/google-tools'
+import { gmailMoveContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/remove-label/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailRemoveLabelContract } from '@/lib/api/contracts/google-tools'
+import { gmailRemoveLabelContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateAlphanumericId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/gmail/send/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailSendContract } from '@/lib/api/contracts/google-tools'
+import { gmailSendContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/gmail/unarchive/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { gmailUnarchiveContract } from '@/lib/api/contracts/google-tools'
+import { gmailUnarchiveContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/google_drive/download/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { googleDriveDownloadContract } from '@/lib/api/contracts/google-tools'
+import { googleDriveDownloadContract } from '@/lib/api/contracts/tools/google'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/google_drive/upload/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { googleDriveUploadContract } from '@/lib/api/contracts/google-tools'
+import { googleDriveUploadContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/google_vault/download-export-file/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { googleVaultDownloadExportFileContract } from '@/lib/api/contracts/google-tools'
+import { googleVaultDownloadExportFileContract } from '@/lib/api/contracts/tools/google'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/image/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { type NextRequest, NextResponse } from 'next/server'
-import { imageProxyQuerySchema } from '@/lib/api/contracts/media-tools'
+import { imageProxyQuerySchema } from '@/lib/api/contracts/tools/media/image'
 import { getValidationErrorMessage, searchParamsToObject } from '@/lib/api/server/validation'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/mistral/parse/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mistralParseContract } from '@/lib/api/contracts/media-tools'
+import { mistralParseContract } from '@/lib/api/contracts/tools/media/document-parse'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/mongodb/delete/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mongodbDeleteContract } from '@/lib/api/contracts/database-tools'
+import { mongodbDeleteContract } from '@/lib/api/contracts/tools/databases/mongodb'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mongodb/execute/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mongodbExecuteContract } from '@/lib/api/contracts/database-tools'
+import { mongodbExecuteContract } from '@/lib/api/contracts/tools/databases/mongodb'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mongodb/insert/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mongodbInsertContract } from '@/lib/api/contracts/database-tools'
+import { mongodbInsertContract } from '@/lib/api/contracts/tools/databases/mongodb'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mongodb/introspect/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mongodbIntrospectContract } from '@/lib/api/contracts/database-tools'
+import { mongodbIntrospectContract } from '@/lib/api/contracts/tools/databases/mongodb'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mongodb/query/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mongodbQueryContract } from '@/lib/api/contracts/database-tools'
+import { mongodbQueryContract } from '@/lib/api/contracts/tools/databases/mongodb'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mongodb/update/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mongodbUpdateContract } from '@/lib/api/contracts/database-tools'
+import { mongodbUpdateContract } from '@/lib/api/contracts/tools/databases/mongodb'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mysql/delete/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mysqlDeleteContract } from '@/lib/api/contracts/database-tools'
+import { mysqlDeleteContract } from '@/lib/api/contracts/tools/databases/mysql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mysql/execute/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mysqlExecuteContract } from '@/lib/api/contracts/database-tools'
+import { mysqlExecuteContract } from '@/lib/api/contracts/tools/databases/mysql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mysql/insert/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mysqlInsertContract } from '@/lib/api/contracts/database-tools'
+import { mysqlInsertContract } from '@/lib/api/contracts/tools/databases/mysql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mysql/introspect/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mysqlIntrospectContract } from '@/lib/api/contracts/database-tools'
+import { mysqlIntrospectContract } from '@/lib/api/contracts/tools/databases/mysql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mysql/query/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mysqlQueryContract } from '@/lib/api/contracts/database-tools'
+import { mysqlQueryContract } from '@/lib/api/contracts/tools/databases/mysql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/mysql/update/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { mysqlUpdateContract } from '@/lib/api/contracts/database-tools'
+import { mysqlUpdateContract } from '@/lib/api/contracts/tools/databases/mysql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/create/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jCreateContract } from '@/lib/api/contracts/database-tools'
+import { neo4jCreateContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/delete/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jDeleteContract } from '@/lib/api/contracts/database-tools'
+import { neo4jDeleteContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/execute/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jExecuteContract } from '@/lib/api/contracts/database-tools'
+import { neo4jExecuteContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/introspect/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jIntrospectContract } from '@/lib/api/contracts/database-tools'
+import { neo4jIntrospectContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/merge/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jMergeContract } from '@/lib/api/contracts/database-tools'
+import { neo4jMergeContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/query/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jQueryContract } from '@/lib/api/contracts/database-tools'
+import { neo4jQueryContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/neo4j/update/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { neo4jUpdateContract } from '@/lib/api/contracts/database-tools'
+import { neo4jUpdateContract } from '@/lib/api/contracts/tools/databases/neo4j'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/create-item/route.ts

@@ -2,7 +2,7 @@ import type { ItemCreateParams } from '@1password/sdk'
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordCreateItemContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordCreateItemContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/delete-item/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordDeleteItemContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordDeleteItemContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/get-item/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordGetItemContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordGetItemContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/get-vault/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordGetVaultContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordGetVaultContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/list-items/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordListItemsContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordListItemsContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/list-vaults/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordListVaultsContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordListVaultsContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/replace-item/route.ts

@@ -2,7 +2,7 @@ import type { Item } from '@1password/sdk'
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordReplaceItemContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordReplaceItemContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/resolve-secret/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordResolveSecretContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordResolveSecretContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/onepassword/update-item/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { onePasswordUpdateItemContract } from '@/lib/api/contracts/internal-tools'
+import { onePasswordUpdateItemContract } from '@/lib/api/contracts/tools/internal/onepassword'
 import { parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/postgresql/delete/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { postgresqlDeleteContract } from '@/lib/api/contracts/database-tools'
+import { postgresqlDeleteContract } from '@/lib/api/contracts/tools/databases/postgresql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/postgresql/execute/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { postgresqlExecuteContract } from '@/lib/api/contracts/database-tools'
+import { postgresqlExecuteContract } from '@/lib/api/contracts/tools/databases/postgresql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/postgresql/insert/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { postgresqlInsertContract } from '@/lib/api/contracts/database-tools'
+import { postgresqlInsertContract } from '@/lib/api/contracts/tools/databases/postgresql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/postgresql/introspect/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { postgresqlIntrospectContract } from '@/lib/api/contracts/database-tools'
+import { postgresqlIntrospectContract } from '@/lib/api/contracts/tools/databases/postgresql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/postgresql/query/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { postgresqlQueryContract } from '@/lib/api/contracts/database-tools'
+import { postgresqlQueryContract } from '@/lib/api/contracts/tools/databases/postgresql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/postgresql/update/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { postgresqlUpdateContract } from '@/lib/api/contracts/database-tools'
+import { postgresqlUpdateContract } from '@/lib/api/contracts/tools/databases/postgresql'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/pulse/parse/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { pulseParseContract } from '@/lib/api/contracts/media-tools'
+import { pulseParseContract } from '@/lib/api/contracts/tools/media/document-parse'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/quiver/image-to-svg/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { quiverImageToSvgContract } from '@/lib/api/contracts/internal-tools'
+import { quiverImageToSvgContract } from '@/lib/api/contracts/tools/internal/quiver'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/quiver/text-to-svg/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { quiverTextToSvgContract } from '@/lib/api/contracts/internal-tools'
+import { quiverTextToSvgContract } from '@/lib/api/contracts/tools/internal/quiver'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/rds/delete/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { rdsDeleteContract } from '@/lib/api/contracts/database-tools'
+import { rdsDeleteContract } from '@/lib/api/contracts/tools/databases/rds'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/rds/execute/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { rdsExecuteContract } from '@/lib/api/contracts/database-tools'
+import { rdsExecuteContract } from '@/lib/api/contracts/tools/databases/rds'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/rds/insert/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { rdsInsertContract } from '@/lib/api/contracts/database-tools'
+import { rdsInsertContract } from '@/lib/api/contracts/tools/databases/rds'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/rds/introspect/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { rdsIntrospectContract } from '@/lib/api/contracts/database-tools'
+import { rdsIntrospectContract } from '@/lib/api/contracts/tools/databases/rds'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/rds/query/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { rdsQueryContract } from '@/lib/api/contracts/database-tools'
+import { rdsQueryContract } from '@/lib/api/contracts/tools/databases/rds'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/rds/update/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { rdsUpdateContract } from '@/lib/api/contracts/database-tools'
+import { rdsUpdateContract } from '@/lib/api/contracts/tools/databases/rds'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/redis/execute/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import Redis from 'ioredis'
 import { type NextRequest, NextResponse } from 'next/server'
-import { redisExecuteContract } from '@/lib/api/contracts/database-tools'
+import { redisExecuteContract } from '@/lib/api/contracts/tools/databases/redis'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'

apps/sim/app/api/tools/reducto/parse/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { reductoParseContract } from '@/lib/api/contracts/media-tools'
+import { reductoParseContract } from '@/lib/api/contracts/tools/media/document-parse'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/sap_s4hana/proxy/route.ts

@@ -6,7 +6,7 @@ import {
   assertSafeSapExternalUrl,
   type SapS4HanaProxyRequest,
   sapS4HanaProxyContract,
-} from '@/lib/api/contracts/internal-tools'
+} from '@/lib/api/contracts/tools/internal/sap'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/sendgrid/send-mail/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { sendGridSendMailContract } from '@/lib/api/contracts'
+import { sendGridSendMailContract } from '@/lib/api/contracts/tools/communication/email'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/slack/add-reaction/route.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackAddReactionContract } from '@/lib/api/contracts'
+import { slackAddReactionContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/slack/channels/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackChannelsSelectorContract } from '@/lib/api/contracts/selectors'
+import { slackChannelsSelectorContract } from '@/lib/api/contracts/selectors/slack'
 import { parseRequest } from '@/lib/api/server'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
 import { validateAlphanumericId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/slack/delete-message/route.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackDeleteMessageContract } from '@/lib/api/contracts'
+import { slackDeleteMessageContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/slack/download/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackDownloadContract } from '@/lib/api/contracts'
+import { slackDownloadContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import {

apps/sim/app/api/tools/slack/read-messages/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackReadMessagesContract } from '@/lib/api/contracts'
+import { slackReadMessagesContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/slack/remove-reaction/route.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackRemoveReactionContract } from '@/lib/api/contracts'
+import { slackRemoveReactionContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/slack/send-ephemeral/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackSendEphemeralContract } from '@/lib/api/contracts'
+import { slackSendEphemeralContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/slack/send-message/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackSendMessageContract } from '@/lib/api/contracts'
+import { slackSendMessageContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/slack/update-message/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { slackUpdateMessageContract } from '@/lib/api/contracts'
+import { slackUpdateMessageContract } from '@/lib/api/contracts/tools/communication/slack'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/sms/send/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { smsSendContract } from '@/lib/api/contracts'
+import { smsSendContract } from '@/lib/api/contracts/tools/communication/messaging'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { env } from '@/lib/core/config/env'

apps/sim/app/api/tools/smtp/send/route.ts

@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { type NextRequest, NextResponse } from 'next/server'
 import nodemailer from 'nodemailer'
-import { smtpSendContract } from '@/lib/api/contracts'
+import { smtpSendContract } from '@/lib/api/contracts/tools/communication/email'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'

apps/sim/app/api/tools/stagehand/agent/route.ts

@@ -1,7 +1,7 @@
 import type { Stagehand as StagehandType } from '@browserbasehq/stagehand'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { stagehandAgentContract } from '@/lib/api/contracts/internal-tools'
+import { stagehandAgentContract } from '@/lib/api/contracts/tools/internal/stagehand'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { env } from '@/lib/core/config/env'

apps/sim/app/api/tools/stagehand/extract/route.ts

@@ -1,7 +1,7 @@
 import type { Stagehand as StagehandType } from '@browserbasehq/stagehand'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { stagehandExtractContract } from '@/lib/api/contracts/internal-tools'
+import { stagehandExtractContract } from '@/lib/api/contracts/tools/internal/stagehand'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { env } from '@/lib/core/config/env'

apps/sim/app/api/tools/stt/route.ts

@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { sleep } from '@sim/utils/helpers'
 import { generateId } from '@sim/utils/id'
 import { type NextRequest, NextResponse } from 'next/server'
-import { sttToolContract } from '@/lib/api/contracts/media-tools'
+import { sttToolContract } from '@/lib/api/contracts/tools/media/stt'
 import { getValidationErrorMessage, parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { extractAudioFromVideo, isVideoFile } from '@/lib/audio/extractor'
 import { checkInternalAuth } from '@/lib/auth/hybrid'

apps/sim/app/api/tools/supabase/storage-upload/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { supabaseStorageUploadContract } from '@/lib/api/contracts/database-tools'
+import { supabaseStorageUploadContract } from '@/lib/api/contracts/tools/databases/supabase'
 import { parseToolRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateSupabaseProjectId } from '@/lib/core/security/input-validation'

apps/sim/app/api/tools/telegram/send-document/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { telegramSendDocumentContract } from '@/lib/api/contracts'
+import { telegramSendDocumentContract } from '@/lib/api/contracts/tools/communication/messaging'
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

apps/sim/app/api/tools/textract/parse/route.ts

@@ -2,7 +2,7 @@ import crypto from 'crypto'
 import { createLogger } from '@sim/logger'
 import { sleep } from '@sim/utils/helpers'
 import { type NextRequest, NextResponse } from 'next/server'
-import { textractParseContract } from '@/lib/api/contracts/media-tools'
+import { textractParseContract } from '@/lib/api/contracts/tools/media/document-parse'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/core/execution-limits'

apps/sim/app/api/tools/thinking/route.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { thinkingToolContract } from '@/lib/api/contracts'
+import { thinkingToolContract } from '@/lib/api/contracts/tools/internal/thinking'
 import { parseRequest } from '@/lib/api/server'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'

apps/sim/app/api/tools/tts/route.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
-import { ttsToolContract } from '@/lib/api/contracts/media-tools'
+import { ttsToolContract } from '@/lib/api/contracts/tools/media/tts'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/core/execution-limits'