From 39fc649284fb7540dc1a44938a6568ee69511bf4 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 30 Jan 2026 16:52:01 -0800
Subject: [PATCH 1/4] feat(invitations): added invitations query hook, migrated
 all tool files to use absolute imports

---
 .../notifications/notifications.tsx           |   8 +-
 .../workspace-permissions-provider.tsx        |  90 ++-
 .../settings-modal/components/files/files.tsx |   7 +-
 .../components/permissions-table.tsx          |   7 +-
 .../components/invite-modal/invite-modal.tsx  | 566 +++++++-----------
 .../w/components/sidebar/hooks/index.ts       |   2 +-
 .../sidebar/hooks/use-workspace-management.ts | 389 ++++--------
 apps/sim/hooks/queries/invitations.ts         | 350 +++++++++++
 apps/sim/hooks/queries/oauth-connections.ts   |  92 ++-
 apps/sim/hooks/queries/workspace.ts           | 208 ++++++-
 apps/sim/hooks/use-slack-accounts.ts          |  52 --
 apps/sim/hooks/use-user-permissions.ts        |   4 +-
 apps/sim/hooks/use-workspace-permissions.ts   | 107 ----
 apps/sim/tools/a2a/cancel_task.ts             |   4 +-
 .../sim/tools/a2a/delete_push_notification.ts |   7 +-
 apps/sim/tools/a2a/get_agent_card.ts          |   4 +-
 apps/sim/tools/a2a/get_push_notification.ts   |   7 +-
 apps/sim/tools/a2a/get_task.ts                |   4 +-
 apps/sim/tools/a2a/resubscribe.ts             |   4 +-
 apps/sim/tools/a2a/send_message.ts            |   4 +-
 apps/sim/tools/a2a/set_push_notification.ts   |   7 +-
 apps/sim/tools/apify/run_actor_async.ts       |   2 +-
 apps/sim/tools/apify/run_actor_sync.ts        |   2 +-
 apps/sim/tools/google_groups/add_alias.ts     |   5 +-
 apps/sim/tools/google_groups/add_member.ts    |   2 +-
 apps/sim/tools/google_groups/create_group.ts  |   2 +-
 apps/sim/tools/google_groups/delete_group.ts  |   2 +-
 apps/sim/tools/google_groups/get_group.ts     |   2 +-
 apps/sim/tools/google_groups/get_member.ts    |   2 +-
 apps/sim/tools/google_groups/get_settings.ts  |   5 +-
 apps/sim/tools/google_groups/has_member.ts    |   2 +-
 apps/sim/tools/google_groups/list_aliases.ts  |   5 +-
 apps/sim/tools/google_groups/list_groups.ts   |   2 +-
 apps/sim/tools/google_groups/list_members.ts  |   5 +-
 apps/sim/tools/google_groups/remove_alias.ts  |   5 +-
 apps/sim/tools/google_groups/remove_member.ts |   5 +-
 apps/sim/tools/google_groups/update_group.ts  |   2 +-
 apps/sim/tools/google_groups/update_member.ts |   5 +-
 .../tools/google_groups/update_settings.ts    |   5 +-
 apps/sim/tools/http/webhook_request.ts        |   2 +-
 .../incidentio/incident_statuses_list.ts      |   4 +-
 .../tools/incidentio/incident_types_list.ts   |   4 +-
 apps/sim/tools/incidentio/severities_list.ts  |   5 +-
 apps/sim/tools/incidentio/users_list.ts       |   5 +-
 apps/sim/tools/incidentio/users_show.ts       |   5 +-
 apps/sim/tools/incidentio/workflows_create.ts |   2 +-
 apps/sim/tools/incidentio/workflows_delete.ts |   2 +-
 apps/sim/tools/incidentio/workflows_list.ts   |   2 +-
 apps/sim/tools/incidentio/workflows_show.ts   |   2 +-
 apps/sim/tools/incidentio/workflows_update.ts |   2 +-
 apps/sim/tools/intercom/get_company.ts        |   3 -
 apps/sim/tools/intercom/get_conversation.ts   |   3 -
 apps/sim/tools/intercom/list_companies.ts     |   3 -
 apps/sim/tools/intercom/list_contacts.ts      |   3 -
 apps/sim/tools/intercom/list_conversations.ts |   3 -
 apps/sim/tools/intercom/reply_conversation.ts |   3 -
 apps/sim/tools/intercom/search_contacts.ts    |   3 -
 apps/sim/tools/kalshi/amend_order.ts          |   4 +-
 apps/sim/tools/kalshi/cancel_order.ts         |   4 +-
 apps/sim/tools/kalshi/create_order.ts         |   4 +-
 apps/sim/tools/kalshi/get_balance.ts          |   4 +-
 apps/sim/tools/kalshi/get_candlesticks.ts     |   4 +-
 apps/sim/tools/kalshi/get_event.ts            |   4 +-
 apps/sim/tools/kalshi/get_events.ts           |   8 +-
 apps/sim/tools/kalshi/get_exchange_status.ts  |   4 +-
 apps/sim/tools/kalshi/get_fills.ts            |   6 +-
 apps/sim/tools/kalshi/get_market.ts           |   4 +-
 apps/sim/tools/kalshi/get_markets.ts          |   6 +-
 apps/sim/tools/kalshi/get_order.ts            |   4 +-
 apps/sim/tools/kalshi/get_orderbook.ts        |   4 +-
 apps/sim/tools/kalshi/get_orders.ts           |   6 +-
 apps/sim/tools/kalshi/get_positions.ts        |   6 +-
 apps/sim/tools/kalshi/get_series_by_ticker.ts |   4 +-
 apps/sim/tools/kalshi/get_trades.ts           |   8 +-
 apps/sim/tools/kalshi/types.ts                |   5 -
 apps/sim/tools/mailchimp/add_member.ts        |   6 +-
 apps/sim/tools/mailchimp/add_member_tags.ts   |   2 +-
 .../tools/mailchimp/add_or_update_member.ts   |   6 +-
 .../sim/tools/mailchimp/add_segment_member.ts |   9 +-
 .../mailchimp/add_subscriber_to_automation.ts |   7 +-
 apps/sim/tools/mailchimp/archive_member.ts    |   5 +-
 apps/sim/tools/mailchimp/create_audience.ts   |   4 +-
 .../tools/mailchimp/create_batch_operation.ts |   4 +-
 apps/sim/tools/mailchimp/create_campaign.ts   |   6 +-
 apps/sim/tools/mailchimp/create_interest.ts   |   7 +-
 .../mailchimp/create_interest_category.ts     |   7 +-
 .../tools/mailchimp/create_landing_page.ts    |   7 +-
 .../sim/tools/mailchimp/create_merge_field.ts |   7 +-
 apps/sim/tools/mailchimp/create_segment.ts    |   4 +-
 apps/sim/tools/mailchimp/create_template.ts   |   5 +-
 apps/sim/tools/mailchimp/delete_audience.ts   |   5 +-
 .../tools/mailchimp/delete_batch_operation.ts |   5 +-
 apps/sim/tools/mailchimp/delete_campaign.ts   |   5 +-
 apps/sim/tools/mailchimp/delete_interest.ts   |   5 +-
 .../mailchimp/delete_interest_category.ts     |   5 +-
 .../tools/mailchimp/delete_landing_page.ts    |   5 +-
 apps/sim/tools/mailchimp/delete_member.ts     |   5 +-
 .../sim/tools/mailchimp/delete_merge_field.ts |   5 +-
 apps/sim/tools/mailchimp/delete_segment.ts    |   5 +-
 apps/sim/tools/mailchimp/delete_template.ts   |   5 +-
 apps/sim/tools/mailchimp/get_audience.ts      |   7 +-
 apps/sim/tools/mailchimp/get_audiences.ts     |   7 +-
 apps/sim/tools/mailchimp/get_automation.ts    |   7 +-
 apps/sim/tools/mailchimp/get_automations.ts   |   7 +-
 .../tools/mailchimp/get_batch_operation.ts    |   7 +-
 .../tools/mailchimp/get_batch_operations.ts   |   7 +-
 apps/sim/tools/mailchimp/get_campaign.ts      |   9 +-
 .../tools/mailchimp/get_campaign_content.ts   |   9 +-
 .../tools/mailchimp/get_campaign_report.ts    |   9 +-
 .../tools/mailchimp/get_campaign_reports.ts   |   9 +-
 apps/sim/tools/mailchimp/get_campaigns.ts     |   9 +-
 apps/sim/tools/mailchimp/get_interest.ts      |   7 +-
 .../mailchimp/get_interest_categories.ts      |   5 +-
 .../tools/mailchimp/get_interest_category.ts  |   7 +-
 apps/sim/tools/mailchimp/get_interests.ts     |   5 +-
 apps/sim/tools/mailchimp/get_landing_page.ts  |   7 +-
 apps/sim/tools/mailchimp/get_landing_pages.ts |   7 +-
 apps/sim/tools/mailchimp/get_member.ts        |   9 +-
 apps/sim/tools/mailchimp/get_member_tags.ts   |   5 +-
 apps/sim/tools/mailchimp/get_members.ts       |   9 +-
 apps/sim/tools/mailchimp/get_merge_field.ts   |   5 +-
 apps/sim/tools/mailchimp/get_merge_fields.ts  |   7 +-
 apps/sim/tools/mailchimp/get_segment.ts       |   7 +-
 .../tools/mailchimp/get_segment_members.ts    |   7 +-
 apps/sim/tools/mailchimp/get_segments.ts      |   5 +-
 apps/sim/tools/mailchimp/get_template.ts      |   7 +-
 apps/sim/tools/mailchimp/get_templates.ts     |   7 +-
 apps/sim/tools/mailchimp/pause_automation.ts  |   2 +-
 .../tools/mailchimp/publish_landing_page.ts   |   2 +-
 .../sim/tools/mailchimp/remove_member_tags.ts |   2 +-
 .../tools/mailchimp/remove_segment_member.ts  |   2 +-
 .../sim/tools/mailchimp/replicate_campaign.ts |   2 +-
 apps/sim/tools/mailchimp/schedule_campaign.ts |   2 +-
 apps/sim/tools/mailchimp/send_campaign.ts     |   2 +-
 .../tools/mailchimp/set_campaign_content.ts   |   6 +-
 apps/sim/tools/mailchimp/start_automation.ts  |   2 +-
 apps/sim/tools/mailchimp/unarchive_member.ts  |   6 +-
 .../tools/mailchimp/unpublish_landing_page.ts |   2 +-
 .../tools/mailchimp/unschedule_campaign.ts    |   2 +-
 apps/sim/tools/mailchimp/update_audience.ts   |   4 +-
 apps/sim/tools/mailchimp/update_campaign.ts   |   6 +-
 apps/sim/tools/mailchimp/update_interest.ts   |   4 +-
 .../mailchimp/update_interest_category.ts     |   4 +-
 .../tools/mailchimp/update_landing_page.ts    |   4 +-
 apps/sim/tools/mailchimp/update_member.ts     |   6 +-
 .../sim/tools/mailchimp/update_merge_field.ts |   4 +-
 apps/sim/tools/mailchimp/update_segment.ts    |   4 +-
 apps/sim/tools/mailchimp/update_template.ts   |   4 +-
 apps/sim/tools/search/tool.ts                 |   2 +-
 apps/sim/tools/shopify/adjust_inventory.ts    |   4 +-
 apps/sim/tools/shopify/cancel_order.ts        |   4 +-
 apps/sim/tools/shopify/create_customer.ts     |   4 +-
 apps/sim/tools/shopify/create_fulfillment.ts  |   4 +-
 apps/sim/tools/shopify/create_product.ts      |   4 +-
 apps/sim/tools/shopify/delete_customer.ts     |   2 +-
 apps/sim/tools/shopify/delete_product.ts      |   2 +-
 apps/sim/tools/shopify/get_collection.ts      |   4 +-
 apps/sim/tools/shopify/get_customer.ts        |   4 +-
 apps/sim/tools/shopify/get_inventory_level.ts |   7 +-
 apps/sim/tools/shopify/get_order.ts           |   4 +-
 apps/sim/tools/shopify/get_product.ts         |   4 +-
 apps/sim/tools/shopify/list_collections.ts    |   4 +-
 apps/sim/tools/shopify/list_customers.ts      |   4 +-
 .../sim/tools/shopify/list_inventory_items.ts |   7 +-
 apps/sim/tools/shopify/list_locations.ts      |   4 +-
 apps/sim/tools/shopify/list_orders.ts         |   4 +-
 apps/sim/tools/shopify/list_products.ts       |   4 +-
 apps/sim/tools/shopify/update_customer.ts     |   4 +-
 apps/sim/tools/shopify/update_order.ts        |   4 +-
 apps/sim/tools/shopify/update_product.ts      |   4 +-
 apps/sim/tools/similarweb/bounce_rate.ts      |   5 +-
 apps/sim/tools/similarweb/pages_per_visit.ts  |   5 +-
 apps/sim/tools/similarweb/traffic_visits.ts   |   5 +-
 apps/sim/tools/similarweb/visit_duration.ts   |   5 +-
 apps/sim/tools/similarweb/website_overview.ts |   5 +-
 apps/sim/tools/spotify/add_to_queue.ts        |   2 +-
 .../tools/spotify/add_tracks_to_playlist.ts   |   5 +-
 apps/sim/tools/spotify/check_saved_tracks.ts  |   5 +-
 apps/sim/tools/spotify/create_playlist.ts     |   5 +-
 apps/sim/tools/spotify/get_album.ts           |   6 +-
 apps/sim/tools/spotify/get_album_tracks.ts    |   2 +-
 apps/sim/tools/spotify/get_albums.ts          |   2 +-
 apps/sim/tools/spotify/get_artist.ts          |   2 +-
 apps/sim/tools/spotify/get_artist_albums.ts   |   5 +-
 .../tools/spotify/get_artist_top_tracks.ts    |   7 +-
 apps/sim/tools/spotify/get_artists.ts         |   2 +-
 apps/sim/tools/spotify/get_categories.ts      |   5 +-
 apps/sim/tools/spotify/get_current_user.ts    |   5 +-
 .../tools/spotify/get_currently_playing.ts    |   2 +-
 apps/sim/tools/spotify/get_devices.ts         |   2 +-
 .../sim/tools/spotify/get_followed_artists.ts |   2 +-
 apps/sim/tools/spotify/get_new_releases.ts    |   7 +-
 apps/sim/tools/spotify/get_playback_state.ts  |  10 +-
 apps/sim/tools/spotify/get_playlist.ts        |   4 +-
 apps/sim/tools/spotify/get_playlist_tracks.ts |   7 +-
 apps/sim/tools/spotify/get_queue.ts           |   2 +-
 apps/sim/tools/spotify/get_recently_played.ts |   7 +-
 apps/sim/tools/spotify/get_saved_albums.ts    |   2 +-
 apps/sim/tools/spotify/get_saved_tracks.ts    |   7 +-
 apps/sim/tools/spotify/get_top_artists.ts     |   2 +-
 apps/sim/tools/spotify/get_top_tracks.ts      |   7 +-
 apps/sim/tools/spotify/get_track.ts           |   7 +-
 apps/sim/tools/spotify/get_tracks.ts          |   7 +-
 apps/sim/tools/spotify/get_user_playlists.ts  |   5 +-
 apps/sim/tools/spotify/pause.ts               |   2 +-
 apps/sim/tools/spotify/play.ts                |   2 +-
 .../spotify/remove_tracks_from_playlist.ts    |   4 +-
 apps/sim/tools/spotify/save_tracks.ts         |   2 +-
 apps/sim/tools/spotify/search.ts              |   6 +-
 apps/sim/tools/spotify/set_volume.ts          |   2 +-
 apps/sim/tools/spotify/skip_next.ts           |   2 +-
 apps/sim/tools/spotify/skip_previous.ts       |   2 +-
 apps/sim/tools/stagehand/extract.ts           |   3 -
 apps/sim/tools/typeform/insights.ts           |   3 -
 apps/sim/tools/wealthbox/read_contact.ts      |   3 -
 apps/sim/tools/wealthbox/read_note.ts         |   3 -
 apps/sim/tools/wordpress/create_category.ts   |   2 +-
 apps/sim/tools/wordpress/create_comment.ts    |   2 +-
 apps/sim/tools/wordpress/create_page.ts       |   2 +-
 apps/sim/tools/wordpress/create_post.ts       |   2 +-
 apps/sim/tools/wordpress/create_tag.ts        |   2 +-
 apps/sim/tools/wordpress/delete_comment.ts    |   2 +-
 apps/sim/tools/wordpress/delete_media.ts      |   2 +-
 apps/sim/tools/wordpress/delete_page.ts       |   2 +-
 apps/sim/tools/wordpress/delete_post.ts       |   2 +-
 apps/sim/tools/wordpress/get_current_user.ts  |   2 +-
 apps/sim/tools/wordpress/get_media.ts         |   2 +-
 apps/sim/tools/wordpress/get_page.ts          |   2 +-
 apps/sim/tools/wordpress/get_post.ts          |   2 +-
 apps/sim/tools/wordpress/get_user.ts          |   2 +-
 apps/sim/tools/wordpress/list_categories.ts   |   2 +-
 apps/sim/tools/wordpress/list_comments.ts     |   2 +-
 apps/sim/tools/wordpress/list_media.ts        |   2 +-
 apps/sim/tools/wordpress/list_pages.ts        |   2 +-
 apps/sim/tools/wordpress/list_posts.ts        |   2 +-
 apps/sim/tools/wordpress/list_tags.ts         |   2 +-
 apps/sim/tools/wordpress/list_users.ts        |   2 +-
 apps/sim/tools/wordpress/search_content.ts    |   2 +-
 apps/sim/tools/wordpress/update_comment.ts    |   2 +-
 apps/sim/tools/wordpress/update_page.ts       |   2 +-
 apps/sim/tools/wordpress/update_post.ts       |   2 +-
 apps/sim/tools/wordpress/upload_media.ts      |  11 +-
 .../zendesk/autocomplete_organizations.ts     |   5 +-
 apps/sim/tools/zendesk/create_organization.ts |   6 +-
 .../zendesk/create_organizations_bulk.ts      |   2 +-
 apps/sim/tools/zendesk/create_ticket.ts       |   6 +-
 apps/sim/tools/zendesk/create_tickets_bulk.ts |   2 +-
 apps/sim/tools/zendesk/create_user.ts         |   2 +-
 apps/sim/tools/zendesk/create_users_bulk.ts   |   2 +-
 apps/sim/tools/zendesk/delete_organization.ts |   5 +-
 apps/sim/tools/zendesk/delete_ticket.ts       |   5 +-
 apps/sim/tools/zendesk/delete_user.ts         |   5 +-
 apps/sim/tools/zendesk/get_current_user.ts    |   5 +-
 apps/sim/tools/zendesk/get_organization.ts    |   9 +-
 apps/sim/tools/zendesk/get_organizations.ts   |   5 +-
 apps/sim/tools/zendesk/get_ticket.ts          |   9 +-
 apps/sim/tools/zendesk/get_tickets.ts         |   5 +-
 apps/sim/tools/zendesk/get_user.ts            |   5 +-
 apps/sim/tools/zendesk/get_users.ts           |   5 +-
 apps/sim/tools/zendesk/merge_tickets.ts       |   5 +-
 apps/sim/tools/zendesk/search.ts              |  10 +-
 apps/sim/tools/zendesk/search_count.ts        |   5 +-
 apps/sim/tools/zendesk/search_users.ts        |   5 +-
 apps/sim/tools/zendesk/update_organization.ts |   6 +-
 apps/sim/tools/zendesk/update_ticket.ts       |   6 +-
 apps/sim/tools/zendesk/update_tickets_bulk.ts |   5 +-
 apps/sim/tools/zendesk/update_user.ts         |   2 +-
 apps/sim/tools/zendesk/update_users_bulk.ts   |   2 +-
 biome.json                                    |  27 +-
 269 files changed, 1542 insertions(+), 1484 deletions(-)
 create mode 100644 apps/sim/hooks/queries/invitations.ts
 delete mode 100644 apps/sim/hooks/use-slack-accounts.ts
 delete mode 100644 apps/sim/hooks/use-workspace-permissions.ts

diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/notifications.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/notifications.tsx
index 216ccf8414..81bbfa3a28 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/notifications.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/notifications.tsx
@@ -32,8 +32,7 @@ import {
   useTestNotification,
   useUpdateNotification,
 } from '@/hooks/queries/notifications'
-import { useConnectOAuthService } from '@/hooks/queries/oauth-connections'
-import { useSlackAccounts } from '@/hooks/use-slack-accounts'
+import { useConnectedAccounts, useConnectOAuthService } from '@/hooks/queries/oauth-connections'
 import { CORE_TRIGGER_TYPES, type CoreTriggerType } from '@/stores/logs/filters/types'
 import { SlackChannelSelector } from './components/slack-channel-selector'
 import { WorkflowSelector } from './components/workflow-selector'
@@ -167,7 +166,8 @@ export function NotificationSettings({
   const deleteNotification = useDeleteNotification()
   const testNotification = useTestNotification()
 
-  const { accounts: slackAccounts, isLoading: isLoadingSlackAccounts } = useSlackAccounts()
+  const { data: slackAccounts = [], isLoading: isLoadingSlackAccounts } =
+    useConnectedAccounts('slack')
   const connectSlack = useConnectOAuthService()
 
   useEffect(() => {
@@ -530,7 +530,7 @@ export function NotificationSettings({
         message:
           result.data?.error || (result.data?.success ? 'Test sent successfully' : 'Test failed'),
       })
-    } catch (error) {
+    } catch (_error) {
       setTestStatus({ id, success: false, message: 'Failed to send test' })
     }
   }
diff --git a/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx b/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
index 607d177888..ab198204d0 100644
--- a/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
@@ -1,32 +1,28 @@
 'use client'
 
 import type React from 'react'
-import { createContext, useContext, useEffect, useMemo, useState } from 'react'
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 import { createLogger } from '@sim/logger'
+import { useQueryClient } from '@tanstack/react-query'
 import { useParams } from 'next/navigation'
-import { useUserPermissions, type WorkspaceUserPermissions } from '@/hooks/use-user-permissions'
 import {
-  useWorkspacePermissions,
+  useWorkspacePermissionsQuery,
   type WorkspacePermissions,
-} from '@/hooks/use-workspace-permissions'
+  workspaceKeys,
+} from '@/hooks/queries/workspace'
+import { useUserPermissions, type WorkspaceUserPermissions } from '@/hooks/use-user-permissions'
 import { useNotificationStore } from '@/stores/notifications'
 import { useOperationQueueStore } from '@/stores/operation-queue/store'
 
 const logger = createLogger('WorkspacePermissionsProvider')
 
 interface WorkspacePermissionsContextType {
-  // Raw workspace permissions data
   workspacePermissions: WorkspacePermissions | null
   permissionsLoading: boolean
   permissionsError: string | null
   updatePermissions: (newPermissions: WorkspacePermissions) => void
   refetchPermissions: () => Promise<void>
-
-  // Computed user permissions (connection-aware)
   userPermissions: WorkspaceUserPermissions & { isOfflineMode?: boolean }
-
-  // Connection state management
-  setOfflineMode: (isOffline: boolean) => void
 }
 
 const WorkspacePermissionsContext = createContext<WorkspacePermissionsContextType>({
@@ -43,7 +39,6 @@ const WorkspacePermissionsContext = createContext<WorkspacePermissionsContextTyp
     isLoading: false,
     error: null,
   },
-  setOfflineMode: () => {},
 })
 
 interface WorkspacePermissionsProviderProps {
@@ -51,35 +46,20 @@ interface WorkspacePermissionsProviderProps {
 }
 
 /**
- * Provider that manages workspace permissions and user access
- * Also provides connection-aware permissions that enforce read-only mode when offline
+ * Provides workspace permissions and connection-aware user access throughout the app.
+ * Enforces read-only mode when offline to prevent data loss.
  */
 export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsProviderProps) {
   const params = useParams()
   const workspaceId = params?.workspaceId as string
+  const queryClient = useQueryClient()
 
-  // Manage offline mode state locally
-  const [isOfflineMode, setIsOfflineMode] = useState(false)
-
-  // Track whether we've already surfaced an offline notification to avoid duplicates
   const [hasShownOfflineNotification, setHasShownOfflineNotification] = useState(false)
-
-  // Get operation error state directly from the store (avoid full useCollaborativeWorkflow subscription)
   const hasOperationError = useOperationQueueStore((state) => state.hasOperationError)
-
   const addNotification = useNotificationStore((state) => state.addNotification)
 
-  // Set offline mode when there are operation errors
-  useEffect(() => {
-    if (hasOperationError) {
-      setIsOfflineMode(true)
-    }
-  }, [hasOperationError])
+  const isOfflineMode = hasOperationError
 
-  /**
-   * Surface a global notification when entering offline mode.
-   * Uses the shared notifications system instead of bespoke UI in individual components.
-   */
   useEffect(() => {
     if (!isOfflineMode || hasShownOfflineNotification) {
       return
@@ -89,7 +69,6 @@ export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsP
       addNotification({
         level: 'error',
         message: 'Connection unavailable',
-        // Global notification (no workflowId) so it is visible regardless of the active workflow
         action: {
           type: 'refresh',
           message: '',
@@ -101,40 +80,44 @@ export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsP
     }
   }, [addNotification, hasShownOfflineNotification, isOfflineMode])
 
-  // Fetch workspace permissions and loading state
   const {
-    permissions: workspacePermissions,
-    loading: permissionsLoading,
-    error: permissionsError,
-    updatePermissions,
-    refetch: refetchPermissions,
-  } = useWorkspacePermissions(workspaceId)
-
-  // Get base user permissions from workspace permissions
+    data: workspacePermissions,
+    isLoading: permissionsLoading,
+    error: permissionsErrorObj,
+    refetch,
+  } = useWorkspacePermissionsQuery(workspaceId)
+
+  const permissionsError = permissionsErrorObj?.message ?? null
+
+  const updatePermissions = useCallback(
+    (newPermissions: WorkspacePermissions) => {
+      if (!workspaceId) return
+      queryClient.setQueryData(workspaceKeys.permissions(workspaceId), newPermissions)
+    },
+    [workspaceId, queryClient]
+  )
+
+  const refetchPermissions = useCallback(async () => {
+    await refetch()
+  }, [refetch])
+
   const baseUserPermissions = useUserPermissions(
-    workspacePermissions,
+    workspacePermissions ?? null,
     permissionsLoading,
     permissionsError
   )
 
-  // Note: Connection-based error detection removed - only rely on operation timeouts
-  // The 5-second operation timeout system will handle all error cases
-
-  // Create connection-aware permissions that override user permissions when offline
   const userPermissions = useMemo((): WorkspaceUserPermissions & { isOfflineMode?: boolean } => {
     if (isOfflineMode) {
-      // In offline mode, force read-only permissions regardless of actual user permissions
       return {
         ...baseUserPermissions,
         canEdit: false,
         canAdmin: false,
-        // Keep canRead true so users can still view content
         canRead: baseUserPermissions.canRead,
         isOfflineMode: true,
       }
     }
 
-    // When online, use normal permissions
     return {
       ...baseUserPermissions,
       isOfflineMode: false,
@@ -143,13 +126,12 @@ export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsP
 
   const contextValue = useMemo(
     () => ({
-      workspacePermissions,
+      workspacePermissions: workspacePermissions ?? null,
       permissionsLoading,
       permissionsError,
       updatePermissions,
       refetchPermissions,
       userPermissions,
-      setOfflineMode: setIsOfflineMode,
     }),
     [
       workspacePermissions,
@@ -169,8 +151,8 @@ export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsP
 }
 
 /**
- * Hook to access workspace permissions and data from context
- * This provides both raw workspace permissions and computed user permissions
+ * Accesses workspace permissions data and operations from context.
+ * Must be used within a WorkspacePermissionsProvider.
  */
 export function useWorkspacePermissionsContext(): WorkspacePermissionsContextType {
   const context = useContext(WorkspacePermissionsContext)
@@ -183,8 +165,8 @@ export function useWorkspacePermissionsContext(): WorkspacePermissionsContextTyp
 }
 
 /**
- * Hook to access user permissions from context
- * This replaces individual useUserPermissions calls and includes connection-aware permissions
+ * Accesses the current user's computed permissions including offline mode status.
+ * Convenience hook that extracts userPermissions from the context.
  */
 export function useUserPermissionsContext(): WorkspaceUserPermissions & {
   isOfflineMode?: boolean
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/files/files.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/files/files.tsx
index 824dbf0263..92422d6ee0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/files/files.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/files/files.tsx
@@ -21,14 +21,13 @@ import { cn } from '@/lib/core/utils/cn'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { getFileExtension } from '@/lib/uploads/utils/file-utils'
 import { getDocumentIcon } from '@/app/workspace/[workspaceId]/knowledge/components'
+import { useWorkspacePermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
   useDeleteWorkspaceFile,
   useStorageInfo,
   useUploadWorkspaceFile,
   useWorkspaceFiles,
 } from '@/hooks/queries/workspace-files'
-import { useUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
 
 const logger = createLogger('FileUploadsSettings')
 const isBillingEnabled = isTruthy(getEnv('NEXT_PUBLIC_BILLING_ENABLED'))
@@ -94,9 +93,7 @@ export function Files() {
   const fileInputRef = useRef<HTMLInputElement>(null)
   const scrollContainerRef = useRef<HTMLDivElement>(null)
 
-  const { permissions: workspacePermissions, loading: permissionsLoading } =
-    useWorkspacePermissions(workspaceId)
-  const userPermissions = useUserPermissions(workspacePermissions, permissionsLoading)
+  const { userPermissions, permissionsLoading } = useWorkspacePermissionsContext()
 
   const handleUploadClick = () => {
     fileInputRef.current?.click()
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx
index b27970559e..92f0b9cafb 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx
@@ -4,7 +4,7 @@ import { Badge, Button, Tooltip } from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
 import type { PermissionType } from '@/lib/workspaces/permissions/utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import type { WorkspacePermissions } from '@/hooks/use-workspace-permissions'
+import type { WorkspacePermissions } from '@/hooks/queries/workspace'
 import { PermissionSelector } from './permission-selector'
 import { PermissionsTableSkeleton } from './permissions-table-skeleton'
 import type { UserPermissions } from './types'
@@ -14,7 +14,7 @@ export interface PermissionsTableProps {
   onPermissionChange: (userId: string, permissionType: PermissionType) => void
   onRemoveMember?: (userId: string, email: string) => void
   onRemoveInvitation?: (invitationId: string, email: string) => void
-  onResendInvitation?: (invitationId: string, email: string) => void
+  onResendInvitation?: (invitationId: string) => void
   disabled?: boolean
   existingUserPermissionChanges: Record<string, Partial<UserPermissions>>
   isSaving?: boolean
@@ -143,7 +143,6 @@ export const PermissionsTable = ({
         <div>
           {allUsers.map((user) => {
             const isCurrentUser = user.isCurrentUser === true
-            const isExistingUser = filteredExistingUsers.some((eu) => eu.email === user.email)
             const isPendingInvitation = user.isPendingInvitation === true
             const userIdentifier = user.userId || user.email
             const originalPermission = workspacePermissions?.users?.find(
@@ -205,7 +204,7 @@ export const PermissionsTable = ({
                             <span className='inline-flex'>
                               <Button
                                 variant='ghost'
-                                onClick={() => onResendInvitation(user.invitationId!, user.email)}
+                                onClick={() => onResendInvitation(user.invitationId!)}
                                 disabled={
                                   disabled ||
                                   isSaving ||
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
index 9d962d86d7..76b4442d64 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
@@ -19,7 +19,14 @@ import { useSession } from '@/lib/auth/auth-client'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { useWorkspacePermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { PermissionsTable } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table'
-import { API_ENDPOINTS } from '@/stores/constants'
+import {
+  useBatchSendWorkspaceInvitations,
+  useCancelWorkspaceInvitation,
+  usePendingInvitations,
+  useRemoveWorkspaceMember,
+  useResendWorkspaceInvitation,
+  useUpdateWorkspacePermissions,
+} from '@/hooks/queries/invitations'
 import type { PermissionType, UserPermissions } from './components/types'
 
 const logger = createLogger('InviteModal')
@@ -30,38 +37,22 @@ interface InviteModalProps {
   workspaceName?: string
 }
 
-interface PendingInvitation {
-  id: string
-  workspaceId: string
-  email: string
-  permissions: PermissionType
-  status: string
-  createdAt: string
-}
-
 export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalProps) {
   const formRef = useRef<HTMLFormElement>(null)
   const [emailItems, setEmailItems] = useState<TagItem[]>([])
   const [userPermissions, setUserPermissions] = useState<UserPermissions[]>([])
-  const [pendingInvitations, setPendingInvitations] = useState<UserPermissions[]>([])
-  const [isPendingInvitationsLoading, setIsPendingInvitationsLoading] = useState(false)
   const [existingUserPermissionChanges, setExistingUserPermissionChanges] = useState<
     Record<string, Partial<UserPermissions>>
   >({})
-  const [isSubmitting, setIsSubmitting] = useState(false)
-  const [isSaving, setIsSaving] = useState(false)
   const cooldownIntervalsRef = useRef<Map<string, NodeJS.Timeout>>(new Map())
   const [errorMessage, setErrorMessage] = useState<string | null>(null)
   const [memberToRemove, setMemberToRemove] = useState<{ userId: string; email: string } | null>(
     null
   )
-  const [isRemovingMember, setIsRemovingMember] = useState(false)
   const [invitationToRemove, setInvitationToRemove] = useState<{
     invitationId: string
     email: string
   } | null>(null)
-  const [isRemovingInvitation, setIsRemovingInvitation] = useState(false)
-  const [resendingInvitationIds, setResendingInvitationIds] = useState<Record<string, boolean>>({})
   const [resendCooldowns, setResendCooldowns] = useState<Record<string, number>>({})
   const [resentInvitationIds, setResentInvitationIds] = useState<Record<string, boolean>>({})
   const params = useParams()
@@ -72,50 +63,26 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     workspacePermissions,
     permissionsLoading,
     updatePermissions,
-    refetchPermissions,
     userPermissions: userPerms,
   } = useWorkspacePermissionsContext()
 
+  const { data: pendingInvitations = [], isLoading: isPendingInvitationsLoading } =
+    usePendingInvitations(open ? workspaceId : undefined)
+
+  const batchSendInvitations = useBatchSendWorkspaceInvitations()
+  const cancelInvitation = useCancelWorkspaceInvitation()
+  const resendInvitation = useResendWorkspaceInvitation()
+  const removeMember = useRemoveWorkspaceMember()
+  const updatePermissionsMutation = useUpdateWorkspacePermissions()
+
   const hasPendingChanges = Object.keys(existingUserPermissionChanges).length > 0
   const validEmails = emailItems.filter((item) => item.isValid).map((item) => item.value)
   const hasNewInvites = validEmails.length > 0
 
-  const fetchPendingInvitations = useCallback(async () => {
-    if (!workspaceId) return
-
-    setIsPendingInvitationsLoading(true)
-    try {
-      const response = await fetch('/api/workspaces/invitations')
-      if (response.ok) {
-        const data = await response.json()
-        const workspacePendingInvitations =
-          data.invitations
-            ?.filter(
-              (inv: PendingInvitation) =>
-                inv.status === 'pending' && inv.workspaceId === workspaceId
-            )
-            .map((inv: PendingInvitation) => ({
-              email: inv.email,
-              permissionType: inv.permissions,
-              isPendingInvitation: true,
-              invitationId: inv.id,
-            })) || []
-
-        setPendingInvitations(workspacePendingInvitations)
-      }
-    } catch (error) {
-      logger.error('Error fetching pending invitations:', error)
-    } finally {
-      setIsPendingInvitationsLoading(false)
-    }
-  }, [workspaceId])
-
-  useEffect(() => {
-    if (open && workspaceId) {
-      fetchPendingInvitations()
-      refetchPermissions()
-    }
-  }, [open, workspaceId, fetchPendingInvitations, refetchPermissions])
+  const isSubmitting = batchSendInvitations.isPending
+  const isSaving = updatePermissionsMutation.isPending
+  const isRemovingMember = removeMember.isPending
+  const isRemovingInvitation = cancelInvitation.isPending
 
   useEffect(() => {
     if (open) {
@@ -180,16 +147,12 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     [emailItems, pendingInvitations, workspacePermissions?.users, session?.user?.email]
   )
 
-  const removeEmailItem = useCallback(
-    (_value: string, index: number, isValid?: boolean) => {
-      const itemToRemove = emailItems[index]
-      setEmailItems((prev) => prev.filter((_, i) => i !== index))
-      if (isValid ?? itemToRemove?.isValid) {
-        setUserPermissions((prev) => prev.filter((user) => user.email !== itemToRemove?.value))
-      }
-    },
-    [emailItems]
-  )
+  const removeEmailItem = useCallback((value: string, index: number, isValid?: boolean) => {
+    setEmailItems((prev) => prev.filter((_, i) => i !== index))
+    if (isValid) {
+      setUserPermissions((prev) => prev.filter((user) => user.email !== value))
+    }
+  }, [])
 
   const fileInputOptions: FileInputOptions = useMemo(
     () => ({
@@ -198,7 +161,8 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
       extractValues: (text: string) => {
         const emailRegex = /[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/g
         const matches = text.match(emailRegex) || []
-        return [...new Set(matches.map((e) => e.toLowerCase()))]
+        const uniqueEmails = [...new Set(matches.map((e) => e.toLowerCase()))]
+        return uniqueEmails.filter((email) => quickValidateEmail(email).isValid)
       },
       tooltip: 'Upload emails',
     }),
@@ -230,53 +194,38 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     [workspacePermissions?.users]
   )
 
-  const handleSaveChanges = useCallback(async () => {
+  const handleSaveChanges = useCallback(() => {
     if (!userPerms.canAdmin || !hasPendingChanges || !workspaceId) return
 
-    setIsSaving(true)
     setErrorMessage(null)
 
-    try {
-      const updates = Object.entries(existingUserPermissionChanges).map(([userId, changes]) => ({
-        userId,
-        permissions: changes.permissionType || 'read',
-      }))
-
-      const response = await fetch(API_ENDPOINTS.WORKSPACE_PERMISSIONS(workspaceId), {
-        method: 'PATCH',
-        headers: {
-          'Content-Type': 'application/json',
+    const updates = Object.entries(existingUserPermissionChanges).map(([userId, changes]) => ({
+      userId,
+      permissions: (changes.permissionType || 'read') as 'admin' | 'write' | 'read',
+    }))
+
+    updatePermissionsMutation.mutate(
+      { workspaceId, updates },
+      {
+        onSuccess: (data) => {
+          if (data.users && data.total !== undefined) {
+            updatePermissions({ users: data.users, total: data.total })
+          }
+          setExistingUserPermissionChanges({})
+        },
+        onError: (error) => {
+          logger.error('Error saving permission changes:', error)
+          setErrorMessage(error.message || 'Failed to save permission changes. Please try again.')
         },
-        body: JSON.stringify({ updates }),
-      })
-
-      const data = await response.json()
-
-      if (!response.ok) {
-        throw new Error(data.error || 'Failed to update permissions')
-      }
-
-      if (data.users && data.total !== undefined) {
-        updatePermissions({ users: data.users, total: data.total })
       }
-
-      setExistingUserPermissionChanges({})
-    } catch (error) {
-      logger.error('Error saving permission changes:', error)
-      const errorMsg =
-        error instanceof Error
-          ? error.message
-          : 'Failed to save permission changes. Please try again.'
-      setErrorMessage(errorMsg)
-    } finally {
-      setIsSaving(false)
-    }
+    )
   }, [
     userPerms.canAdmin,
     hasPendingChanges,
     workspaceId,
     existingUserPermissionChanges,
     updatePermissions,
+    updatePermissionsMutation,
   ])
 
   const handleRestoreChanges = useCallback(() => {
@@ -289,62 +238,57 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     setMemberToRemove({ userId, email })
   }, [])
 
-  const handleRemoveMemberConfirm = useCallback(async () => {
+  const handleRemoveMemberConfirm = useCallback(() => {
     if (!memberToRemove || !workspaceId || !userPerms.canAdmin) return
 
-    setIsRemovingMember(true)
     setErrorMessage(null)
 
-    try {
-      const userRecord = workspacePermissions?.users?.find(
-        (user) => user.userId === memberToRemove.userId
-      )
+    const userRecord = workspacePermissions?.users?.find(
+      (user) => user.userId === memberToRemove.userId
+    )
 
-      if (!userRecord) {
-        throw new Error('User is not a member of this workspace')
-      }
-
-      const response = await fetch(`/api/workspaces/members/${memberToRemove.userId}`, {
-        method: 'DELETE',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          workspaceId: workspaceId,
-        }),
-      })
-
-      const data = await response.json()
+    if (!userRecord) {
+      setErrorMessage('User is not a member of this workspace')
+      setMemberToRemove(null)
+      return
+    }
 
-      if (!response.ok) {
-        throw new Error(data.error || 'Failed to remove member')
-      }
+    removeMember.mutate(
+      { userId: memberToRemove.userId, workspaceId },
+      {
+        onSuccess: () => {
+          if (workspacePermissions) {
+            const updatedUsers = workspacePermissions.users.filter(
+              (user) => user.userId !== memberToRemove.userId
+            )
+            updatePermissions({
+              users: updatedUsers,
+              total: workspacePermissions.total - 1,
+            })
+          }
 
-      if (workspacePermissions) {
-        const updatedUsers = workspacePermissions.users.filter(
-          (user) => user.userId !== memberToRemove.userId
-        )
-        updatePermissions({
-          users: updatedUsers,
-          total: workspacePermissions.total - 1,
-        })
+          setExistingUserPermissionChanges((prev) => {
+            const updated = { ...prev }
+            delete updated[memberToRemove.userId]
+            return updated
+          })
+          setMemberToRemove(null)
+        },
+        onError: (error) => {
+          logger.error('Error removing member:', error)
+          setErrorMessage(error.message || 'Failed to remove member. Please try again.')
+          setMemberToRemove(null)
+        },
       }
-
-      setExistingUserPermissionChanges((prev) => {
-        const updated = { ...prev }
-        delete updated[memberToRemove.userId]
-        return updated
-      })
-    } catch (error) {
-      logger.error('Error removing member:', error)
-      const errorMsg =
-        error instanceof Error ? error.message : 'Failed to remove member. Please try again.'
-      setErrorMessage(errorMsg)
-    } finally {
-      setIsRemovingMember(false)
-      setMemberToRemove(null)
-    }
-  }, [memberToRemove, workspaceId, userPerms.canAdmin, workspacePermissions, updatePermissions])
+    )
+  }, [
+    memberToRemove,
+    workspaceId,
+    userPerms.canAdmin,
+    workspacePermissions,
+    updatePermissions,
+    removeMember,
+  ])
 
   const handleRemoveMemberCancel = useCallback(() => {
     setMemberToRemove(null)
@@ -354,120 +298,93 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     setInvitationToRemove({ invitationId, email })
   }, [])
 
-  const handleRemoveInvitationConfirm = useCallback(async () => {
+  const handleRemoveInvitationConfirm = useCallback(() => {
     if (!invitationToRemove || !workspaceId || !userPerms.canAdmin) return
 
-    setIsRemovingInvitation(true)
     setErrorMessage(null)
 
-    try {
-      const response = await fetch(
-        `/api/workspaces/invitations/${invitationToRemove.invitationId}`,
-        {
-          method: 'DELETE',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        }
-      )
-
-      const data = await response.json()
-
-      if (!response.ok) {
-        throw new Error(data.error || 'Failed to cancel invitation')
+    cancelInvitation.mutate(
+      { invitationId: invitationToRemove.invitationId, workspaceId },
+      {
+        onSuccess: () => {
+          setInvitationToRemove(null)
+        },
+        onError: (error) => {
+          logger.error('Error cancelling invitation:', error)
+          setErrorMessage(error.message || 'Failed to cancel invitation. Please try again.')
+          setInvitationToRemove(null)
+        },
       }
-
-      setPendingInvitations((prev) =>
-        prev.filter((inv) => inv.invitationId !== invitationToRemove.invitationId)
-      )
-    } catch (error) {
-      logger.error('Error cancelling invitation:', error)
-      const errorMsg =
-        error instanceof Error ? error.message : 'Failed to cancel invitation. Please try again.'
-      setErrorMessage(errorMsg)
-    } finally {
-      setIsRemovingInvitation(false)
-      setInvitationToRemove(null)
-    }
-  }, [invitationToRemove, workspaceId, userPerms.canAdmin])
+    )
+  }, [invitationToRemove, workspaceId, userPerms.canAdmin, cancelInvitation])
 
   const handleRemoveInvitationCancel = useCallback(() => {
     setInvitationToRemove(null)
   }, [])
 
   const handleResendInvitation = useCallback(
-    async (invitationId: string, email: string) => {
+    (invitationId: string) => {
       if (!workspaceId || !userPerms.canAdmin) return
 
       const secondsLeft = resendCooldowns[invitationId]
       if (secondsLeft && secondsLeft > 0) return
 
-      setResendingInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
       setErrorMessage(null)
 
-      try {
-        const response = await fetch(`/api/workspaces/invitations/${invitationId}`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        })
+      resendInvitation.mutate(
+        { invitationId, workspaceId },
+        {
+          onSuccess: () => {
+            setResentInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
+            setTimeout(() => {
+              setResentInvitationIds((prev) => {
+                const next = { ...prev }
+                delete next[invitationId]
+                return next
+              })
+            }, 4000)
 
-        const data = await response.json()
+            setResendCooldowns((prev) => ({ ...prev, [invitationId]: 60 }))
 
-        if (!response.ok) {
-          throw new Error(data.error || 'Failed to resend invitation')
-        }
+            const existingInterval = cooldownIntervalsRef.current.get(invitationId)
+            if (existingInterval) {
+              clearInterval(existingInterval)
+            }
 
-        setResentInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
-        setTimeout(() => {
-          setResentInvitationIds((prev) => {
-            const next = { ...prev }
-            delete next[invitationId]
-            return next
-          })
-        }, 4000)
-      } catch (error) {
-        logger.error('Error resending invitation:', error)
-        const errorMsg =
-          error instanceof Error ? error.message : 'Failed to resend invitation. Please try again.'
-        setErrorMessage(errorMsg)
-      } finally {
-        setResendingInvitationIds((prev) => {
-          const next = { ...prev }
-          delete next[invitationId]
-          return next
-        })
-        setResendCooldowns((prev) => ({ ...prev, [invitationId]: 60 }))
+            const interval = setInterval(() => {
+              setResendCooldowns((prev) => {
+                const current = prev[invitationId]
+                if (current === undefined) return prev
+                if (current <= 1) {
+                  const next = { ...prev }
+                  delete next[invitationId]
+                  clearInterval(interval)
+                  cooldownIntervalsRef.current.delete(invitationId)
+                  return next
+                }
+                return { ...prev, [invitationId]: current - 1 }
+              })
+            }, 1000)
 
-        const existingInterval = cooldownIntervalsRef.current.get(invitationId)
-        if (existingInterval) {
-          clearInterval(existingInterval)
+            cooldownIntervalsRef.current.set(invitationId, interval)
+          },
+          onError: (error) => {
+            logger.error('Error resending invitation:', error)
+            setErrorMessage(error.message || 'Failed to resend invitation. Please try again.')
+          },
         }
-
-        const interval = setInterval(() => {
-          setResendCooldowns((prev) => {
-            const current = prev[invitationId]
-            if (current === undefined) return prev
-            if (current <= 1) {
-              const next = { ...prev }
-              delete next[invitationId]
-              clearInterval(interval)
-              cooldownIntervalsRef.current.delete(invitationId)
-              return next
-            }
-            return { ...prev, [invitationId]: current - 1 }
-          })
-        }, 1000)
-
-        cooldownIntervalsRef.current.set(invitationId, interval)
-      }
+      )
     },
-    [workspaceId, userPerms.canAdmin, resendCooldowns]
+    [workspaceId, userPerms.canAdmin, resendCooldowns, resendInvitation]
   )
 
+  const resendingInvitationIds = useMemo(() => {
+    if (!resendInvitation.isPending || !resendInvitation.variables) return {}
+    return { [resendInvitation.variables.invitationId]: true }
+  }, [resendInvitation.isPending, resendInvitation.variables])
+
   const handleSubmit = useCallback(
-    async (e: React.FormEvent) => {
+    (e: React.FormEvent) => {
       e.preventDefault()
 
       setErrorMessage(null)
@@ -476,115 +393,46 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
         return
       }
 
-      setIsSubmitting(true)
-
-      try {
-        const failedInvites: string[] = []
-
-        const results = await Promise.all(
-          validEmails.map(async (email) => {
-            try {
-              const userPermission = userPermissions.find((up) => up.email === email)
-              const permissionType = userPermission?.permissionType || 'read'
-
-              const response = await fetch('/api/workspaces/invitations', {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                  workspaceId,
-                  email: email,
-                  role: 'member',
-                  permission: permissionType,
-                }),
-              })
-
-              const data = await response.json()
-
-              if (!response.ok) {
-                failedInvites.push(email)
-
-                if (data.error) {
-                  setErrorMessage(data.error)
-                }
-
-                return false
-              }
+      const invitations = validEmails.map((email) => {
+        const userPermission = userPermissions.find((up) => up.email === email)
+        return {
+          email,
+          permission: (userPermission?.permissionType || 'read') as 'admin' | 'write' | 'read',
+        }
+      })
 
-              return true
-            } catch {
-              failedInvites.push(email)
-              return false
+      batchSendInvitations.mutate(
+        { workspaceId, invitations },
+        {
+          onSuccess: (result) => {
+            if (result.failed.length > 0) {
+              setEmailItems(result.failed.map((f) => ({ value: f.email, isValid: true })))
+              setUserPermissions((prev) =>
+                prev.filter((user) => result.failed.some((f) => f.email === user.email))
+              )
+              setErrorMessage(result.failed[0].error)
+            } else {
+              setEmailItems([])
+              setUserPermissions([])
             }
-          })
-        )
-
-        const successCount = results.filter(Boolean).length
-        const successfulEmails = validEmails.filter((_, index) => results[index])
-
-        if (successCount > 0) {
-          if (successfulEmails.length > 0) {
-            const newPendingInvitations: UserPermissions[] = successfulEmails.map((email) => {
-              const userPermission = userPermissions.find((up) => up.email === email)
-              const permissionType = userPermission?.permissionType || 'read'
-
-              return {
-                email,
-                permissionType,
-                isPendingInvitation: true,
-              }
-            })
-
-            setPendingInvitations((prev) => {
-              const existingEmails = new Set(prev.map((inv) => inv.email))
-              const merged = [...prev]
-
-              newPendingInvitations.forEach((inv) => {
-                if (!existingEmails.has(inv.email)) {
-                  merged.push(inv)
-                }
-              })
-
-              return merged
-            })
-          }
-
-          fetchPendingInvitations()
-
-          if (failedInvites.length > 0) {
-            setEmailItems(failedInvites.map((email) => ({ value: email, isValid: true })))
-            setUserPermissions((prev) => prev.filter((user) => failedInvites.includes(user.email)))
-          } else {
-            setEmailItems([])
-            setUserPermissions([])
-          }
+          },
+          onError: (error) => {
+            logger.error('Error inviting members:', error)
+            setErrorMessage(error.message || 'An unexpected error occurred. Please try again.')
+          },
         }
-      } catch (err) {
-        logger.error('Error inviting members:', err)
-        const errorMessage =
-          err instanceof Error ? err.message : 'An unexpected error occurred. Please try again.'
-        setErrorMessage(errorMessage)
-      } finally {
-        setIsSubmitting(false)
-      }
+      )
     },
-    [validEmails, workspaceId, userPermissions, fetchPendingInvitations]
+    [validEmails, workspaceId, userPermissions, batchSendInvitations]
   )
 
   const resetState = useCallback(() => {
     setEmailItems([])
     setUserPermissions([])
-    setPendingInvitations([])
-    setIsPendingInvitationsLoading(false)
     setExistingUserPermissionChanges({})
-    setIsSubmitting(false)
-    setIsSaving(false)
     setErrorMessage(null)
     setMemberToRemove(null)
-    setIsRemovingMember(false)
     setInvitationToRemove(null)
-    setIsRemovingInvitation(false)
     setResendCooldowns({})
     setResentInvitationIds({})
 
@@ -592,6 +440,17 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     cooldownIntervalsRef.current.clear()
   }, [])
 
+  const pendingInvitationsForTable: UserPermissions[] = useMemo(
+    () =>
+      pendingInvitations.map((inv) => ({
+        email: inv.email,
+        permissionType: inv.permissionType,
+        isPendingInvitation: true,
+        invitationId: inv.invitationId,
+      })),
+    [pendingInvitations]
+  )
+
   return (
     <Modal
       open={open}
@@ -681,7 +540,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
                 isSaving={isSaving}
                 workspacePermissions={workspacePermissions}
                 permissionsLoading={permissionsLoading}
-                pendingInvitations={pendingInvitations}
+                pendingInvitations={pendingInvitationsForTable}
                 isPendingInvitationsLoading={isPendingInvitationsLoading}
                 resendingInvitationIds={resendingInvitationIds}
                 resentInvitationIds={resentInvitationIds}
@@ -691,26 +550,29 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
           </ModalBody>
 
           <ModalFooter className='justify-between'>
-            {hasPendingChanges && userPerms.canAdmin && (
-              <div className='flex gap-[8px]'>
-                <Button
-                  type='button'
-                  variant='default'
-                  disabled={isSaving || isSubmitting}
-                  onClick={handleRestoreChanges}
-                >
-                  Restore Changes
-                </Button>
-                <Button
-                  type='button'
-                  variant='tertiary'
-                  disabled={isSaving || isSubmitting}
-                  onClick={handleSaveChanges}
-                >
-                  {isSaving ? 'Saving...' : 'Save Changes'}
-                </Button>
-              </div>
-            )}
+            <div
+              className={`flex gap-[8px] ${hasPendingChanges && userPerms.canAdmin ? '' : 'pointer-events-none invisible'}`}
+              aria-hidden={!(hasPendingChanges && userPerms.canAdmin)}
+            >
+              <Button
+                type='button'
+                variant='default'
+                disabled={isSaving || isSubmitting}
+                onClick={handleRestoreChanges}
+                tabIndex={hasPendingChanges && userPerms.canAdmin ? 0 : -1}
+              >
+                Restore Changes
+              </Button>
+              <Button
+                type='button'
+                variant='tertiary'
+                disabled={isSaving || isSubmitting}
+                onClick={handleSaveChanges}
+                tabIndex={hasPendingChanges && userPerms.canAdmin ? 0 : -1}
+              >
+                {isSaving ? 'Saving...' : 'Save Changes'}
+              </Button>
+            </div>
 
             <Button
               type='button'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/index.ts
index 259876c21b..84c1d3f96f 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/index.ts
@@ -14,4 +14,4 @@ export {
 export { useSidebarResize } from './use-sidebar-resize'
 export { useWorkflowOperations } from './use-workflow-operations'
 export { useWorkflowSelection } from './use-workflow-selection'
-export { useWorkspaceManagement } from './use-workspace-management'
+export { useWorkspaceManagement, type Workspace } from './use-workspace-management'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
index 15aedd57a5..c9ca75f867 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
@@ -1,31 +1,33 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { createLogger } from '@sim/logger'
+import { useQueryClient } from '@tanstack/react-query'
 import { usePathname, useRouter } from 'next/navigation'
 import { generateWorkspaceName } from '@/lib/workspaces/naming'
+import { useLeaveWorkspace } from '@/hooks/queries/invitations'
+import {
+  useCreateWorkspace,
+  useDeleteWorkspace,
+  useUpdateWorkspaceName,
+  useWorkspacesQuery,
+  type Workspace,
+  workspaceKeys,
+} from '@/hooks/queries/workspace'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 const logger = createLogger('useWorkspaceManagement')
 
-interface Workspace {
-  id: string
-  name: string
-  ownerId: string
-  role?: string
-  membershipId?: string
-  permissions?: 'admin' | 'write' | 'read' | null
-}
-
 interface UseWorkspaceManagementProps {
   workspaceId: string
   sessionUserId?: string
 }
 
 /**
- * Custom hook to manage workspace operations including fetching, switching, creating, deleting, and leaving workspaces.
+ * Manages workspace operations including fetching, switching, creating, deleting, and leaving workspaces.
  * Handles workspace validation and URL synchronization.
  *
- * @param props - Configuration object containing workspaceId and sessionUserId
- * @returns Workspace management state and operations
+ * @param props.workspaceId - The current workspace ID from the URL
+ * @param props.sessionUserId - The current user's session ID
+ * @returns Workspace state and operations
  */
 export function useWorkspaceManagement({
   workspaceId,
@@ -33,140 +35,68 @@ export function useWorkspaceManagement({
 }: UseWorkspaceManagementProps) {
   const router = useRouter()
   const pathname = usePathname()
+  const queryClient = useQueryClient()
   const switchToWorkspace = useWorkflowRegistry((state) => state.switchToWorkspace)
 
-  // Workspace management state
-  const [workspaces, setWorkspaces] = useState<Workspace[]>([])
-  const [activeWorkspace, setActiveWorkspace] = useState<Workspace | null>(null)
-  const [isWorkspacesLoading, setIsWorkspacesLoading] = useState(true)
-  const [isCreatingWorkspace, setIsCreatingWorkspace] = useState(false)
-  const [isDeleting, setIsDeleting] = useState(false)
-  const [isLeaving, setIsLeaving] = useState(false)
+  const {
+    data: workspaces = [],
+    isLoading: isWorkspacesLoading,
+    refetch: refetchWorkspaces,
+  } = useWorkspacesQuery(Boolean(sessionUserId))
+
+  const leaveWorkspaceMutation = useLeaveWorkspace()
+  const createWorkspaceMutation = useCreateWorkspace()
+  const deleteWorkspaceMutation = useDeleteWorkspace()
+  const updateWorkspaceNameMutation = useUpdateWorkspaceName()
 
-  // Refs to avoid dependency issues
   const workspaceIdRef = useRef<string>(workspaceId)
   const routerRef = useRef<ReturnType<typeof useRouter>>(router)
   const pathnameRef = useRef<string | null>(pathname || null)
-  const activeWorkspaceRef = useRef<Workspace | null>(null)
-  const isInitializedRef = useRef<boolean>(false)
+  const hasValidatedRef = useRef<boolean>(false)
 
-  // Update refs when values change
   workspaceIdRef.current = workspaceId
   routerRef.current = router
   pathnameRef.current = pathname || null
-  activeWorkspaceRef.current = activeWorkspace
 
-  /**
-   * Refresh workspace list without validation logic - used for non-current workspace operations
-   */
-  const refreshWorkspaceList = useCallback(async () => {
-    setIsWorkspacesLoading(true)
-    try {
-      const response = await fetch('/api/workspaces')
-      const data = await response.json()
-
-      if (data.workspaces && Array.isArray(data.workspaces)) {
-        const fetchedWorkspaces = data.workspaces as Workspace[]
-        setWorkspaces(fetchedWorkspaces)
-
-        // Only update activeWorkspace if it still exists in the fetched workspaces
-        // Use functional update to avoid dependency on activeWorkspace
-        setActiveWorkspace((currentActive) => {
-          if (!currentActive) {
-            return currentActive
-          }
+  const activeWorkspace = useMemo(() => {
+    if (!workspaces.length) return null
+    return workspaces.find((w) => w.id === workspaceId) ?? null
+  }, [workspaces, workspaceId])
 
-          const matchingWorkspace = fetchedWorkspaces.find(
-            (workspace) => workspace.id === currentActive.id
-          )
-          if (matchingWorkspace) {
-            return matchingWorkspace
-          }
+  const activeWorkspaceRef = useRef<Workspace | null>(activeWorkspace)
+  activeWorkspaceRef.current = activeWorkspace
 
-          // Active workspace was deleted, clear it
-          logger.warn(`Active workspace ${currentActive.id} no longer exists`)
-          return null
-        })
-      }
-    } catch (err) {
-      logger.error('Error refreshing workspace list:', err)
-    } finally {
-      setIsWorkspacesLoading(false)
+  useEffect(() => {
+    if (isWorkspacesLoading || hasValidatedRef.current || !workspaces.length) {
+      return
     }
-  }, [])
 
-  const fetchWorkspaces = useCallback(async () => {
-    setIsWorkspacesLoading(true)
-    try {
-      const response = await fetch('/api/workspaces')
-      const data = await response.json()
+    const currentWorkspaceId = workspaceIdRef.current
+    const matchingWorkspace = workspaces.find((w) => w.id === currentWorkspaceId)
 
-      if (data.workspaces && Array.isArray(data.workspaces)) {
-        const fetchedWorkspaces = data.workspaces as Workspace[]
-        setWorkspaces(fetchedWorkspaces)
+    if (!matchingWorkspace) {
+      logger.warn(`Workspace ${currentWorkspaceId} not found in user's workspaces`)
+      const fallbackWorkspace = workspaces[0]
+      logger.info(`Redirecting to fallback workspace: ${fallbackWorkspace.id}`)
+      routerRef.current?.push(`/workspace/${fallbackWorkspace.id}/w`)
+    }
 
-        // Handle active workspace selection with URL validation using refs
-        const currentWorkspaceId = workspaceIdRef.current
-        const currentRouter = routerRef.current
+    hasValidatedRef.current = true
+  }, [workspaces, isWorkspacesLoading])
 
-        if (currentWorkspaceId) {
-          const matchingWorkspace = fetchedWorkspaces.find(
-            (workspace) => workspace.id === currentWorkspaceId
-          )
-          if (matchingWorkspace) {
-            setActiveWorkspace(matchingWorkspace)
-          } else {
-            logger.warn(`Workspace ${currentWorkspaceId} not found in user's workspaces`)
-
-            // Fallback to first workspace if current not found
-            if (fetchedWorkspaces.length > 0) {
-              const fallbackWorkspace = fetchedWorkspaces[0]
-              setActiveWorkspace(fallbackWorkspace)
-
-              // Update URL to match the fallback workspace
-              logger.info(`Redirecting to fallback workspace: ${fallbackWorkspace.id}`)
-              currentRouter?.push(`/workspace/${fallbackWorkspace.id}/w`)
-            } else {
-              logger.error('No workspaces available for user')
-            }
-          }
-        }
-      }
-    } catch (err) {
-      logger.error('Error fetching workspaces:', err)
-    } finally {
-      setIsWorkspacesLoading(false)
-    }
-  }, [])
+  const refreshWorkspaceList = useCallback(async () => {
+    await queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
+  }, [queryClient])
+
+  const fetchWorkspaces = useCallback(async () => {
+    hasValidatedRef.current = false
+    await refetchWorkspaces()
+  }, [refetchWorkspaces])
 
-  /**
-   * Update workspace name both in API and local state
-   */
   const updateWorkspaceName = useCallback(
     async (workspaceId: string, newName: string): Promise<boolean> => {
       try {
-        const response = await fetch(`/api/workspaces/${workspaceId}`, {
-          method: 'PATCH',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name: newName.trim() }),
-        })
-
-        if (!response.ok) {
-          const error = await response.json()
-          throw new Error(error.error || 'Failed to update workspace name')
-        }
-
-        // Update local state immediately after successful API call
-        // Only update activeWorkspace if it's the one being renamed
-        setActiveWorkspace((prev) =>
-          prev && prev.id === workspaceId ? { ...prev, name: newName.trim() } : prev
-        )
-        setWorkspaces((prev) =>
-          prev.map((workspace) =>
-            workspace.id === workspaceId ? { ...workspace, name: newName.trim() } : workspace
-          )
-        )
-
+        await updateWorkspaceNameMutation.mutateAsync({ workspaceId, name: newName })
         logger.info('Successfully updated workspace name to:', newName.trim())
         return true
       } catch (error) {
@@ -174,21 +104,18 @@ export function useWorkspaceManagement({
         return false
       }
     },
-    []
+    [updateWorkspaceNameMutation]
   )
 
   const switchWorkspace = useCallback(
     async (workspace: Workspace) => {
-      // If already on this workspace, return
       if (activeWorkspaceRef.current?.id === workspace.id) {
         return
       }
 
       try {
-        // Switch workspace and update URL
         await switchToWorkspace(workspace.id)
         const currentPath = pathnameRef.current || ''
-        // Preserve templates route if user is on templates or template detail
         const templateDetailMatch = currentPath.match(/^\/workspace\/[^/]+\/templates\/([^/]+)$/)
         if (templateDetailMatch) {
           const templateId = templateDetailMatch[1]
@@ -206,208 +133,122 @@ export function useWorkspaceManagement({
     [switchToWorkspace]
   )
 
-  /**
-   * Handle create workspace
-   */
   const handleCreateWorkspace = useCallback(async () => {
-    if (isCreatingWorkspace) {
+    if (createWorkspaceMutation.isPending) {
       logger.info('Workspace creation already in progress, ignoring request')
       return
     }
 
     try {
-      setIsCreatingWorkspace(true)
       logger.info('Creating new workspace')
-
-      // Generate workspace name using utility function
       const workspaceName = await generateWorkspaceName()
-
       logger.info(`Generated workspace name: ${workspaceName}`)
 
-      const response = await fetch('/api/workspaces', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          name: workspaceName,
-        }),
-      })
-
-      if (!response.ok) {
-        const errorData = await response.json()
-        throw new Error(errorData.error || 'Failed to create workspace')
-      }
-
-      const data = await response.json()
-      const newWorkspace = data.workspace
-
+      const newWorkspace = await createWorkspaceMutation.mutateAsync({ name: workspaceName })
       logger.info('Created new workspace:', newWorkspace)
 
-      // Refresh workspace list (no URL validation needed for creation)
-      await refreshWorkspaceList()
-
-      // Switch to the new workspace
       await switchWorkspace(newWorkspace)
     } catch (error) {
       logger.error('Error creating workspace:', error)
-    } finally {
-      setIsCreatingWorkspace(false)
     }
-  }, [refreshWorkspaceList, switchWorkspace, isCreatingWorkspace])
+  }, [createWorkspaceMutation, switchWorkspace])
 
-  /**
-   * Confirm delete workspace
-   */
   const confirmDeleteWorkspace = useCallback(
     async (workspaceToDelete: Workspace, templateAction?: 'keep' | 'delete') => {
-      setIsDeleting(true)
       try {
         logger.info('Deleting workspace:', workspaceToDelete.id)
 
         const deleteTemplates = templateAction === 'delete'
 
-        const response = await fetch(`/api/workspaces/${workspaceToDelete.id}`, {
-          method: 'DELETE',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({ deleteTemplates }),
+        await deleteWorkspaceMutation.mutateAsync({
+          workspaceId: workspaceToDelete.id,
+          deleteTemplates,
         })
 
-        if (!response.ok) {
-          const errorData = await response.json()
-          throw new Error(errorData.error || 'Failed to delete workspace')
-        }
-
         logger.info('Workspace deleted successfully:', workspaceToDelete.id)
 
-        // Check if we're deleting the current workspace (either active or in URL)
         const isDeletingCurrentWorkspace =
           workspaceIdRef.current === workspaceToDelete.id ||
           activeWorkspaceRef.current?.id === workspaceToDelete.id
 
         if (isDeletingCurrentWorkspace) {
-          // For current workspace deletion, use full fetchWorkspaces with URL validation
           logger.info(
             'Deleting current workspace - using full workspace refresh with URL validation'
           )
-          await fetchWorkspaces()
+          hasValidatedRef.current = false
+          const { data: updatedWorkspaces } = await refetchWorkspaces()
 
-          // If we deleted the active workspace, switch to the first available workspace
-          if (activeWorkspaceRef.current?.id === workspaceToDelete.id) {
-            const remainingWorkspaces = workspaces.filter((w) => w.id !== workspaceToDelete.id)
-            if (remainingWorkspaces.length > 0) {
-              await switchWorkspace(remainingWorkspaces[0])
-            }
+          const remainingWorkspaces = (updatedWorkspaces || []).filter(
+            (w) => w.id !== workspaceToDelete.id
+          )
+          if (remainingWorkspaces.length > 0) {
+            await switchWorkspace(remainingWorkspaces[0])
           }
-        } else {
-          // For non-current workspace deletion, just refresh the list without URL validation
-          logger.info('Deleting non-current workspace - using simple list refresh')
-          await refreshWorkspaceList()
         }
       } catch (error) {
         logger.error('Error deleting workspace:', error)
-      } finally {
-        setIsDeleting(false)
       }
     },
-    [fetchWorkspaces, refreshWorkspaceList, workspaces, switchWorkspace]
+    [deleteWorkspaceMutation, refetchWorkspaces, switchWorkspace]
   )
 
-  /**
-   * Handle leave workspace
-   */
   const handleLeaveWorkspace = useCallback(
     async (workspaceToLeave: Workspace) => {
-      setIsLeaving(true)
-      try {
-        logger.info('Leaving workspace:', workspaceToLeave.id)
-
-        // Use the existing member removal API with current user's ID
-        const response = await fetch(`/api/workspaces/members/${sessionUserId}`, {
-          method: 'DELETE',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            workspaceId: workspaceToLeave.id,
-          }),
-        })
-
-        if (!response.ok) {
-          const errorData = await response.json()
-          throw new Error(errorData.error || 'Failed to leave workspace')
-        }
-
-        logger.info('Left workspace successfully:', workspaceToLeave.id)
-
-        // Check if we're leaving the current workspace (either active or in URL)
-        const isLeavingCurrentWorkspace =
-          workspaceIdRef.current === workspaceToLeave.id ||
-          activeWorkspaceRef.current?.id === workspaceToLeave.id
-
-        if (isLeavingCurrentWorkspace) {
-          // For current workspace leaving, use full fetchWorkspaces with URL validation
-          logger.info(
-            'Leaving current workspace - using full workspace refresh with URL validation'
-          )
-          await fetchWorkspaces()
+      if (!sessionUserId) {
+        logger.error('Cannot leave workspace: no session user ID')
+        return
+      }
 
-          // If we left the active workspace, switch to the first available workspace
-          if (activeWorkspaceRef.current?.id === workspaceToLeave.id) {
-            const remainingWorkspaces = workspaces.filter((w) => w.id !== workspaceToLeave.id)
-            if (remainingWorkspaces.length > 0) {
-              await switchWorkspace(remainingWorkspaces[0])
+      logger.info('Leaving workspace:', workspaceToLeave.id)
+
+      leaveWorkspaceMutation.mutate(
+        { userId: sessionUserId, workspaceId: workspaceToLeave.id },
+        {
+          onSuccess: async () => {
+            logger.info('Left workspace successfully:', workspaceToLeave.id)
+
+            const isLeavingCurrentWorkspace =
+              workspaceIdRef.current === workspaceToLeave.id ||
+              activeWorkspaceRef.current?.id === workspaceToLeave.id
+
+            if (isLeavingCurrentWorkspace) {
+              logger.info(
+                'Leaving current workspace - using full workspace refresh with URL validation'
+              )
+              hasValidatedRef.current = false
+              const { data: updatedWorkspaces } = await refetchWorkspaces()
+
+              const remainingWorkspaces = (updatedWorkspaces || []).filter(
+                (w) => w.id !== workspaceToLeave.id
+              )
+              if (remainingWorkspaces.length > 0) {
+                await switchWorkspace(remainingWorkspaces[0])
+              }
             }
-          }
-        } else {
-          // For non-current workspace leaving, just refresh the list without URL validation
-          logger.info('Leaving non-current workspace - using simple list refresh')
-          await refreshWorkspaceList()
+          },
+          onError: (error) => {
+            logger.error('Error leaving workspace:', error)
+          },
         }
-      } catch (error) {
-        logger.error('Error leaving workspace:', error)
-      } finally {
-        setIsLeaving(false)
-      }
+      )
     },
-    [fetchWorkspaces, refreshWorkspaceList, workspaces, switchWorkspace, sessionUserId]
+    [refetchWorkspaces, switchWorkspace, sessionUserId, leaveWorkspaceMutation]
   )
 
-  /**
-   * Validate workspace exists before making API calls
-   */
-  const isWorkspaceValid = useCallback(async (workspaceId: string) => {
-    try {
-      const response = await fetch(`/api/workspaces/${workspaceId}`)
-      return response.ok
-    } catch {
-      return false
-    }
-  }, [])
-
-  /**
-   * Initialize workspace data on mount (uses full validation with URL handling)
-   * fetchWorkspaces is stable (empty deps array), so it's safe to call without including it
-   */
-  useEffect(() => {
-    if (sessionUserId && !isInitializedRef.current) {
-      isInitializedRef.current = true
-      fetchWorkspaces()
-    }
-  }, [sessionUserId, fetchWorkspaces])
+  const isWorkspaceValid = useCallback(
+    (targetWorkspaceId: string) => {
+      return workspaces.some((w) => w.id === targetWorkspaceId)
+    },
+    [workspaces]
+  )
 
   return {
-    // State
     workspaces,
     activeWorkspace,
     isWorkspacesLoading,
-    isCreatingWorkspace,
-    isDeleting,
-    isLeaving,
-
-    // Operations
+    isCreatingWorkspace: createWorkspaceMutation.isPending,
+    isDeleting: deleteWorkspaceMutation.isPending,
+    isLeaving: leaveWorkspaceMutation.isPending,
     fetchWorkspaces,
     refreshWorkspaceList,
     updateWorkspaceName,
@@ -418,3 +259,5 @@ export function useWorkspaceManagement({
     isWorkspaceValid,
   }
 }
+
+export type { Workspace }
diff --git a/apps/sim/hooks/queries/invitations.ts b/apps/sim/hooks/queries/invitations.ts
new file mode 100644
index 0000000000..d67f33cc4e
--- /dev/null
+++ b/apps/sim/hooks/queries/invitations.ts
@@ -0,0 +1,350 @@
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { workspaceKeys } from './workspace'
+
+/**
+ * Query key factory for invitation-related queries.
+ * Provides hierarchical cache keys for workspace invitations.
+ */
+export const invitationKeys = {
+  all: ['invitations'] as const,
+  lists: () => [...invitationKeys.all, 'list'] as const,
+  list: (workspaceId: string) => [...invitationKeys.lists(), workspaceId] as const,
+}
+
+/** Raw invitation data from the API. */
+export interface PendingInvitation {
+  id: string
+  workspaceId: string
+  email: string
+  permissions: 'admin' | 'write' | 'read'
+  status: string
+  createdAt: string
+}
+
+/** Normalized invitation for display in the UI. */
+export interface WorkspaceInvitation {
+  email: string
+  permissionType: 'admin' | 'write' | 'read'
+  isPendingInvitation: boolean
+  invitationId?: string
+}
+
+async function fetchPendingInvitations(workspaceId: string): Promise<WorkspaceInvitation[]> {
+  const response = await fetch('/api/workspaces/invitations')
+
+  if (!response.ok) {
+    throw new Error('Failed to fetch pending invitations')
+  }
+
+  const data = await response.json()
+
+  return (
+    data.invitations
+      ?.filter(
+        (inv: PendingInvitation) => inv.status === 'pending' && inv.workspaceId === workspaceId
+      )
+      .map((inv: PendingInvitation) => ({
+        email: inv.email,
+        permissionType: inv.permissions,
+        isPendingInvitation: true,
+        invitationId: inv.id,
+      })) || []
+  )
+}
+
+/**
+ * Fetches pending invitations for a workspace.
+ * @param workspaceId - The workspace ID to fetch invitations for
+ */
+export function usePendingInvitations(workspaceId: string | undefined) {
+  return useQuery({
+    queryKey: invitationKeys.list(workspaceId ?? ''),
+    queryFn: () => fetchPendingInvitations(workspaceId as string),
+    enabled: Boolean(workspaceId),
+    staleTime: 30 * 1000,
+    placeholderData: keepPreviousData,
+  })
+}
+
+interface SendInvitationParams {
+  workspaceId: string
+  email: string
+  permission: 'admin' | 'write' | 'read'
+}
+
+/**
+ * Sends a single workspace invitation.
+ * Invalidates the invitation list cache on success.
+ */
+export function useSendWorkspaceInvitation() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ workspaceId, email, permission }: SendInvitationParams) => {
+      const response = await fetch('/api/workspaces/invitations', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          workspaceId,
+          email,
+          role: 'member',
+          permission,
+        }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to send invitation')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: invitationKeys.list(variables.workspaceId),
+      })
+    },
+  })
+}
+
+interface BatchSendInvitationsParams {
+  workspaceId: string
+  invitations: Array<{ email: string; permission: 'admin' | 'write' | 'read' }>
+}
+
+interface BatchInvitationResult {
+  successful: string[]
+  failed: Array<{ email: string; error: string }>
+}
+
+/**
+ * Sends multiple workspace invitations in parallel.
+ * Returns results for each invitation indicating success or failure.
+ */
+export function useBatchSendWorkspaceInvitations() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      workspaceId,
+      invitations,
+    }: BatchSendInvitationsParams): Promise<BatchInvitationResult> => {
+      const results = await Promise.allSettled(
+        invitations.map(async ({ email, permission }) => {
+          const response = await fetch('/api/workspaces/invitations', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              workspaceId,
+              email,
+              role: 'member',
+              permission,
+            }),
+          })
+
+          if (!response.ok) {
+            const error = await response.json()
+            throw new Error(error.error || 'Failed to send invitation')
+          }
+
+          return { email, data: await response.json() }
+        })
+      )
+
+      const successful: string[] = []
+      const failed: Array<{ email: string; error: string }> = []
+
+      results.forEach((result, index) => {
+        const email = invitations[index].email
+        if (result.status === 'fulfilled') {
+          successful.push(email)
+        } else {
+          failed.push({ email, error: result.reason?.message || 'Unknown error' })
+        }
+      })
+
+      return { successful, failed }
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: invitationKeys.list(variables.workspaceId),
+      })
+    },
+  })
+}
+
+interface CancelInvitationParams {
+  invitationId: string
+  workspaceId: string
+}
+
+/**
+ * Cancels a pending workspace invitation.
+ * Invalidates the invitation list cache on success.
+ */
+export function useCancelWorkspaceInvitation() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ invitationId }: CancelInvitationParams) => {
+      const response = await fetch(`/api/workspaces/invitations/${invitationId}`, {
+        method: 'DELETE',
+        headers: { 'Content-Type': 'application/json' },
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to cancel invitation')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: invitationKeys.list(variables.workspaceId),
+      })
+    },
+  })
+}
+
+interface ResendInvitationParams {
+  invitationId: string
+  workspaceId: string
+}
+
+/**
+ * Resends a pending workspace invitation email.
+ * Invalidates the invitation list cache on success.
+ */
+export function useResendWorkspaceInvitation() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ invitationId }: ResendInvitationParams) => {
+      const response = await fetch(`/api/workspaces/invitations/${invitationId}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to resend invitation')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: invitationKeys.list(variables.workspaceId),
+      })
+    },
+  })
+}
+
+interface RemoveMemberParams {
+  userId: string
+  workspaceId: string
+}
+
+/**
+ * Removes a member from a workspace.
+ * Invalidates the workspace permissions cache on success.
+ */
+export function useRemoveWorkspaceMember() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ userId, workspaceId }: RemoveMemberParams) => {
+      const response = await fetch(`/api/workspaces/members/${userId}`, {
+        method: 'DELETE',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ workspaceId }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to remove member')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: workspaceKeys.permissions(variables.workspaceId),
+      })
+    },
+  })
+}
+
+interface LeaveWorkspaceParams {
+  userId: string
+  workspaceId: string
+}
+
+/**
+ * Allows the current user to leave a workspace.
+ * Invalidates both permissions and workspace list caches on success.
+ */
+export function useLeaveWorkspace() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ userId, workspaceId }: LeaveWorkspaceParams) => {
+      const response = await fetch(`/api/workspaces/members/${userId}`, {
+        method: 'DELETE',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ workspaceId }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to leave workspace')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: workspaceKeys.permissions(variables.workspaceId),
+      })
+      queryClient.invalidateQueries({
+        queryKey: workspaceKeys.all,
+      })
+    },
+  })
+}
+
+interface UpdatePermissionsParams {
+  workspaceId: string
+  updates: Array<{ userId: string; permissions: 'admin' | 'write' | 'read' }>
+}
+
+/**
+ * Updates permissions for one or more workspace members.
+ * Invalidates the workspace permissions cache on success.
+ */
+export function useUpdateWorkspacePermissions() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ workspaceId, updates }: UpdatePermissionsParams) => {
+      const response = await fetch(`/api/workspaces/${workspaceId}/permissions`, {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ updates }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to update permissions')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: workspaceKeys.permissions(variables.workspaceId),
+      })
+    },
+  })
+}
diff --git a/apps/sim/hooks/queries/oauth-connections.ts b/apps/sim/hooks/queries/oauth-connections.ts
index 1f4afe9788..d6243f8544 100644
--- a/apps/sim/hooks/queries/oauth-connections.ts
+++ b/apps/sim/hooks/queries/oauth-connections.ts
@@ -6,27 +6,32 @@ import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth'
 const logger = createLogger('OAuthConnectionsQuery')
 
 /**
- * Query key factories for OAuth connections
+ * Query key factory for OAuth connection queries.
+ * Provides hierarchical cache keys for connections and provider-specific accounts.
  */
 export const oauthConnectionsKeys = {
   all: ['oauthConnections'] as const,
   connections: () => [...oauthConnectionsKeys.all, 'connections'] as const,
+  accounts: (provider: string) => [...oauthConnectionsKeys.all, 'accounts', provider] as const,
 }
 
-/**
- * Service info type - extends OAuthServiceConfig with connection status and the service key
- */
+/** OAuth service with connection status and linked accounts. */
 export interface ServiceInfo extends OAuthServiceConfig {
-  /** The service key from OAUTH_PROVIDERS (e.g., 'gmail', 'google-drive') */
   id: string
   isConnected: boolean
   lastConnected?: string
   accounts?: { id: string; name: string }[]
 }
 
-/**
- * Define available services from standardized OAuth providers
- */
+/** OAuth connection data returned from the API. */
+interface OAuthConnectionResponse {
+  provider: string
+  baseProvider?: string
+  accounts?: { id: string; name: string }[]
+  lastConnected?: string
+  scopes?: string[]
+}
+
 function defineServices(): ServiceInfo[] {
   const servicesList: ServiceInfo[] = []
 
@@ -44,9 +49,6 @@ function defineServices(): ServiceInfo[] {
   return servicesList
 }
 
-/**
- * Fetch OAuth connections and merge with service definitions
- */
 async function fetchOAuthConnections(): Promise<ServiceInfo[]> {
   try {
     const serviceDefinitions = defineServices()
@@ -65,7 +67,9 @@ async function fetchOAuthConnections(): Promise<ServiceInfo[]> {
     const connections = data.connections || []
 
     const updatedServices = serviceDefinitions.map((service) => {
-      const connection = connections.find((conn: any) => conn.provider === service.providerId)
+      const connection = connections.find(
+        (conn: OAuthConnectionResponse) => conn.provider === service.providerId
+      )
 
       if (connection) {
         return {
@@ -76,13 +80,14 @@ async function fetchOAuthConnections(): Promise<ServiceInfo[]> {
         }
       }
 
-      const connectionWithScopes = connections.find((conn: any) => {
+      const connectionWithScopes = connections.find((conn: OAuthConnectionResponse) => {
         if (!conn.baseProvider || !service.providerId.startsWith(conn.baseProvider)) {
           return false
         }
 
         if (conn.scopes && service.scopes) {
-          return service.scopes.every((scope) => conn.scopes.includes(scope))
+          const connScopes = conn.scopes
+          return service.scopes.every((scope) => connScopes.includes(scope))
         }
 
         return false
@@ -108,26 +113,28 @@ async function fetchOAuthConnections(): Promise<ServiceInfo[]> {
 }
 
 /**
- * Hook to fetch OAuth connections
+ * Fetches all OAuth service connections with their status.
+ * Returns service definitions merged with connection data.
  */
 export function useOAuthConnections() {
   return useQuery({
     queryKey: oauthConnectionsKeys.connections(),
     queryFn: fetchOAuthConnections,
-    staleTime: 30 * 1000, // 30 seconds - connections don't change often
-    retry: false, // Don't retry on 404
-    placeholderData: keepPreviousData, // Show cached data immediately
+    staleTime: 30 * 1000,
+    retry: false,
+    placeholderData: keepPreviousData,
   })
 }
 
-/**
- * Connect OAuth service mutation
- */
 interface ConnectServiceParams {
   providerId: string
   callbackURL: string
 }
 
+/**
+ * Initiates OAuth connection flow for a service.
+ * Redirects the user to the provider's authorization page.
+ */
 export function useConnectOAuthService() {
   const queryClient = useQueryClient()
 
@@ -138,7 +145,6 @@ export function useConnectOAuthService() {
         return { success: true }
       }
 
-      // Shopify requires a custom OAuth flow with shop domain input
       if (providerId === 'shopify') {
         const returnUrl = encodeURIComponent(callbackURL)
         window.location.href = `/api/auth/shopify/authorize?returnUrl=${returnUrl}`
@@ -161,9 +167,6 @@ export function useConnectOAuthService() {
   })
 }
 
-/**
- * Disconnect OAuth service mutation
- */
 interface DisconnectServiceParams {
   provider: string
   providerId: string
@@ -171,6 +174,10 @@ interface DisconnectServiceParams {
   accountId: string
 }
 
+/**
+ * Disconnects an OAuth service account.
+ * Performs optimistic update and rolls back on failure.
+ */
 export function useDisconnectOAuthService() {
   const queryClient = useQueryClient()
 
@@ -230,3 +237,38 @@ export function useDisconnectOAuthService() {
     },
   })
 }
+
+/** Connected OAuth account for a specific provider. */
+export interface ConnectedAccount {
+  id: string
+  accountId: string
+  providerId: string
+  displayName?: string
+}
+
+async function fetchConnectedAccounts(provider: string): Promise<ConnectedAccount[]> {
+  const response = await fetch(`/api/auth/accounts?provider=${provider}`)
+
+  if (!response.ok) {
+    const data = await response.json().catch(() => ({}))
+    throw new Error(data.error || `Failed to load ${provider} accounts`)
+  }
+
+  const data = await response.json()
+  return data.accounts || []
+}
+
+/**
+ * Fetches connected accounts for a specific OAuth provider.
+ * @param provider - The provider ID (e.g., 'slack', 'google')
+ * @param options - Query options including enabled flag
+ */
+export function useConnectedAccounts(provider: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: oauthConnectionsKeys.accounts(provider),
+    queryFn: () => fetchConnectedAccounts(provider),
+    enabled: options?.enabled ?? true,
+    staleTime: 60 * 1000,
+    placeholderData: keepPreviousData,
+  })
+}
diff --git a/apps/sim/hooks/queries/workspace.ts b/apps/sim/hooks/queries/workspace.ts
index 47978895b2..25f3f27442 100644
--- a/apps/sim/hooks/queries/workspace.ts
+++ b/apps/sim/hooks/queries/workspace.ts
@@ -1,10 +1,13 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 
 /**
- * Query key factories for workspace-related queries
+ * Query key factory for workspace-related queries.
+ * Provides hierarchical cache keys for workspaces, settings, and permissions.
  */
 export const workspaceKeys = {
   all: ['workspace'] as const,
+  lists: () => [...workspaceKeys.all, 'list'] as const,
+  list: () => [...workspaceKeys.lists(), 'user'] as const,
   details: () => [...workspaceKeys.all, 'detail'] as const,
   detail: (id: string) => [...workspaceKeys.details(), id] as const,
   settings: (id: string) => [...workspaceKeys.detail(id), 'settings'] as const,
@@ -13,9 +16,186 @@ export const workspaceKeys = {
   adminList: (userId: string | undefined) => [...workspaceKeys.adminLists(), userId ?? ''] as const,
 }
 
+/** Represents a workspace in the user's workspace list. */
+export interface Workspace {
+  id: string
+  name: string
+  ownerId: string
+  role?: string
+  membershipId?: string
+  permissions?: 'admin' | 'write' | 'read' | null
+}
+
+async function fetchWorkspaces(): Promise<Workspace[]> {
+  const response = await fetch('/api/workspaces')
+
+  if (!response.ok) {
+    throw new Error('Failed to fetch workspaces')
+  }
+
+  const data = await response.json()
+  return data.workspaces || []
+}
+
+/**
+ * Fetches the current user's workspaces.
+ * @param enabled - Whether the query should execute (defaults to true)
+ */
+export function useWorkspacesQuery(enabled = true) {
+  return useQuery({
+    queryKey: workspaceKeys.list(),
+    queryFn: fetchWorkspaces,
+    enabled,
+    staleTime: 30 * 1000,
+    placeholderData: keepPreviousData,
+  })
+}
+
+interface CreateWorkspaceParams {
+  name: string
+}
+
+/**
+ * Creates a new workspace.
+ * Automatically invalidates the workspace list cache on success.
+ */
+export function useCreateWorkspace() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ name }: CreateWorkspaceParams) => {
+      const response = await fetch('/api/workspaces', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ name }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to create workspace')
+      }
+
+      const data = await response.json()
+      return data.workspace as Workspace
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
+    },
+  })
+}
+
+interface DeleteWorkspaceParams {
+  workspaceId: string
+  deleteTemplates?: boolean
+}
+
+/**
+ * Deletes a workspace.
+ * Automatically invalidates the workspace list cache on success.
+ */
+export function useDeleteWorkspace() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ workspaceId, deleteTemplates = false }: DeleteWorkspaceParams) => {
+      const response = await fetch(`/api/workspaces/${workspaceId}`, {
+        method: 'DELETE',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ deleteTemplates }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to delete workspace')
+      }
+
+      return response.json()
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
+    },
+  })
+}
+
+interface UpdateWorkspaceNameParams {
+  workspaceId: string
+  name: string
+}
+
 /**
- * Fetch workspace settings
+ * Updates a workspace's name.
+ * Invalidates both the workspace list and the specific workspace detail cache.
  */
+export function useUpdateWorkspaceName() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ workspaceId, name }: UpdateWorkspaceNameParams) => {
+      const response = await fetch(`/api/workspaces/${workspaceId}`, {
+        method: 'PATCH',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ name: name.trim() }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json()
+        throw new Error(error.error || 'Failed to update workspace name')
+      }
+
+      return response.json()
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.detail(variables.workspaceId) })
+    },
+  })
+}
+
+/** Represents a user with permissions in a workspace. */
+export interface WorkspaceUser {
+  userId: string
+  email: string
+  name: string | null
+  image: string | null
+  permissionType: 'admin' | 'write' | 'read'
+}
+
+/** Workspace permissions data containing all users and their access levels. */
+export interface WorkspacePermissions {
+  users: WorkspaceUser[]
+  total: number
+}
+
+async function fetchWorkspacePermissions(workspaceId: string): Promise<WorkspacePermissions> {
+  const response = await fetch(`/api/workspaces/${workspaceId}/permissions`)
+
+  if (!response.ok) {
+    if (response.status === 404) {
+      throw new Error('Workspace not found or access denied')
+    }
+    if (response.status === 401) {
+      throw new Error('Authentication required')
+    }
+    throw new Error(`Failed to fetch permissions: ${response.statusText}`)
+  }
+
+  return response.json()
+}
+
+/**
+ * Fetches permissions for a specific workspace.
+ * @param workspaceId - The workspace ID to fetch permissions for
+ */
+export function useWorkspacePermissionsQuery(workspaceId: string | null | undefined) {
+  return useQuery({
+    queryKey: workspaceKeys.permissions(workspaceId ?? ''),
+    queryFn: () => fetchWorkspacePermissions(workspaceId as string),
+    enabled: Boolean(workspaceId),
+    staleTime: 30 * 1000,
+    placeholderData: keepPreviousData,
+  })
+}
+
 async function fetchWorkspaceSettings(workspaceId: string) {
   const [settingsResponse, permissionsResponse] = await Promise.all([
     fetch(`/api/workspaces/${workspaceId}`),
@@ -38,7 +218,8 @@ async function fetchWorkspaceSettings(workspaceId: string) {
 }
 
 /**
- * Hook to fetch workspace settings
+ * Fetches workspace settings including permissions.
+ * @param workspaceId - The workspace ID to fetch settings for
  */
 export function useWorkspaceSettings(workspaceId: string) {
   return useQuery({
@@ -50,15 +231,16 @@ export function useWorkspaceSettings(workspaceId: string) {
   })
 }
 
-/**
- * Update workspace settings mutation
- */
 interface UpdateWorkspaceSettingsParams {
   workspaceId: string
   billedAccountUserId?: string
   billingAccountUserEmail?: string
 }
 
+/**
+ * Updates workspace settings (e.g., billing configuration).
+ * Invalidates the workspace settings cache on success.
+ */
 export function useUpdateWorkspaceSettings() {
   const queryClient = useQueryClient()
 
@@ -85,9 +267,7 @@ export function useUpdateWorkspaceSettings() {
   })
 }
 
-/**
- * Workspace type returned by admin workspaces query
- */
+/** Workspace with admin access metadata. */
 export interface AdminWorkspace {
   id: string
   name: string
@@ -96,9 +276,6 @@ export interface AdminWorkspace {
   canInvite: boolean
 }
 
-/**
- * Fetch workspaces where user has admin access
- */
 async function fetchAdminWorkspaces(userId: string | undefined): Promise<AdminWorkspace[]> {
   if (!userId) {
     return []
@@ -121,7 +298,7 @@ async function fetchAdminWorkspaces(userId: string | undefined): Promise<AdminWo
         }
         const permissionData = await permissionResponse.json()
         return { workspace, permissionData }
-      } catch (error) {
+      } catch (_error) {
         return null
       }
     }
@@ -161,14 +338,15 @@ async function fetchAdminWorkspaces(userId: string | undefined): Promise<AdminWo
 }
 
 /**
- * Hook to fetch workspaces where user has admin access
+ * Fetches workspaces where the user has admin access.
+ * @param userId - The user ID to check admin access for
  */
 export function useAdminWorkspaces(userId: string | undefined) {
   return useQuery({
     queryKey: workspaceKeys.adminList(userId),
     queryFn: () => fetchAdminWorkspaces(userId),
     enabled: Boolean(userId),
-    staleTime: 60 * 1000, // Cache for 60 seconds
+    staleTime: 60 * 1000,
     placeholderData: keepPreviousData,
   })
 }
diff --git a/apps/sim/hooks/use-slack-accounts.ts b/apps/sim/hooks/use-slack-accounts.ts
deleted file mode 100644
index 2f690b844a..0000000000
--- a/apps/sim/hooks/use-slack-accounts.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useCallback, useEffect, useState } from 'react'
-
-interface SlackAccount {
-  id: string
-  accountId: string
-  providerId: string
-  displayName?: string
-}
-
-interface UseSlackAccountsResult {
-  accounts: SlackAccount[]
-  isLoading: boolean
-  error: string | null
-  refetch: () => Promise<void>
-}
-
-/**
- * Fetches and manages connected Slack accounts for the current user.
- * @returns Object containing accounts array, loading state, error state, and refetch function
- */
-export function useSlackAccounts(): UseSlackAccountsResult {
-  const [accounts, setAccounts] = useState<SlackAccount[]>([])
-  const [isLoading, setIsLoading] = useState(true)
-  const [error, setError] = useState<string | null>(null)
-
-  const fetchAccounts = useCallback(async () => {
-    try {
-      setIsLoading(true)
-      setError(null)
-      const response = await fetch('/api/auth/accounts?provider=slack')
-      if (response.ok) {
-        const data = await response.json()
-        setAccounts(data.accounts || [])
-      } else {
-        const data = await response.json().catch(() => ({}))
-        setError(data.error || 'Failed to load Slack accounts')
-        setAccounts([])
-      }
-    } catch {
-      setError('Failed to load Slack accounts')
-      setAccounts([])
-    } finally {
-      setIsLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchAccounts()
-  }, [])
-
-  return { accounts, isLoading, error, refetch: fetchAccounts }
-}
diff --git a/apps/sim/hooks/use-user-permissions.ts b/apps/sim/hooks/use-user-permissions.ts
index 2eb9f9bdde..c30a80bc1c 100644
--- a/apps/sim/hooks/use-user-permissions.ts
+++ b/apps/sim/hooks/use-user-permissions.ts
@@ -1,7 +1,9 @@
 import { useMemo } from 'react'
 import { createLogger } from '@sim/logger'
 import { useSession } from '@/lib/auth/auth-client'
-import type { PermissionType, WorkspacePermissions } from '@/hooks/use-workspace-permissions'
+import type { WorkspacePermissions } from '@/hooks/queries/workspace'
+
+export type PermissionType = 'admin' | 'write' | 'read'
 
 const logger = createLogger('useUserPermissions')
 
diff --git a/apps/sim/hooks/use-workspace-permissions.ts b/apps/sim/hooks/use-workspace-permissions.ts
deleted file mode 100644
index ef55011a55..0000000000
--- a/apps/sim/hooks/use-workspace-permissions.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { useCallback, useEffect, useState } from 'react'
-import type { permissionTypeEnum } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { API_ENDPOINTS } from '@/stores/constants'
-
-const logger = createLogger('useWorkspacePermissions')
-
-export type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
-
-export interface WorkspaceUser {
-  userId: string
-  email: string
-  name: string | null
-  image: string | null
-  permissionType: PermissionType
-}
-
-export interface WorkspacePermissions {
-  users: WorkspaceUser[]
-  total: number
-}
-
-interface UseWorkspacePermissionsReturn {
-  permissions: WorkspacePermissions | null
-  loading: boolean
-  error: string | null
-  updatePermissions: (newPermissions: WorkspacePermissions) => void
-  refetch: () => Promise<void>
-}
-
-/**
- * Custom hook to fetch and manage workspace permissions
- *
- * @param workspaceId - The workspace ID to fetch permissions for
- * @returns Object containing permissions data, loading state, error state, and refetch function
- */
-export function useWorkspacePermissions(workspaceId: string | null): UseWorkspacePermissionsReturn {
-  const [permissions, setPermissions] = useState<WorkspacePermissions | null>(null)
-  const [loading, setLoading] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-
-  const fetchPermissions = async (id: string): Promise<void> => {
-    try {
-      setLoading(true)
-      setError(null)
-
-      const response = await fetch(API_ENDPOINTS.WORKSPACE_PERMISSIONS(id))
-
-      if (!response.ok) {
-        if (response.status === 404) {
-          throw new Error('Workspace not found or access denied')
-        }
-        if (response.status === 401) {
-          throw new Error('Authentication required')
-        }
-        throw new Error(`Failed to fetch permissions: ${response.statusText}`)
-      }
-
-      const data: WorkspacePermissions = await response.json()
-      setPermissions(data)
-
-      logger.info('Workspace permissions loaded', {
-        workspaceId: id,
-        userCount: data.total,
-        users: data.users.map((u) => ({ email: u.email, permissions: u.permissionType })),
-      })
-    } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : 'Unknown error occurred'
-      setError(errorMessage)
-      logger.error('Failed to fetch workspace permissions', {
-        workspaceId: id,
-        error: errorMessage,
-      })
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  const updatePermissions = useCallback((newPermissions: WorkspacePermissions): void => {
-    setPermissions(newPermissions)
-  }, [])
-
-  useEffect(() => {
-    if (workspaceId) {
-      fetchPermissions(workspaceId)
-    } else {
-      // Clear state if no workspace ID
-      setPermissions(null)
-      setError(null)
-      setLoading(false)
-    }
-  }, [workspaceId])
-
-  const refetch = useCallback(async () => {
-    if (workspaceId) {
-      await fetchPermissions(workspaceId)
-    }
-  }, [workspaceId])
-
-  return {
-    permissions,
-    loading,
-    error,
-    updatePermissions,
-    refetch,
-  }
-}
diff --git a/apps/sim/tools/a2a/cancel_task.ts b/apps/sim/tools/a2a/cancel_task.ts
index 7f2e1ee280..91e0e8b9de 100644
--- a/apps/sim/tools/a2a/cancel_task.ts
+++ b/apps/sim/tools/a2a/cancel_task.ts
@@ -1,6 +1,6 @@
+import type { A2ACancelTaskParams, A2ACancelTaskResponse } from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2ACancelTaskParams, A2ACancelTaskResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aCancelTaskTool: ToolConfig<A2ACancelTaskParams, A2ACancelTaskResponse> = {
   id: 'a2a_cancel_task',
diff --git a/apps/sim/tools/a2a/delete_push_notification.ts b/apps/sim/tools/a2a/delete_push_notification.ts
index 36e850b9b2..e912454b19 100644
--- a/apps/sim/tools/a2a/delete_push_notification.ts
+++ b/apps/sim/tools/a2a/delete_push_notification.ts
@@ -1,6 +1,9 @@
+import type {
+  A2ADeletePushNotificationParams,
+  A2ADeletePushNotificationResponse,
+} from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2ADeletePushNotificationParams, A2ADeletePushNotificationResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aDeletePushNotificationTool: ToolConfig<
   A2ADeletePushNotificationParams,
diff --git a/apps/sim/tools/a2a/get_agent_card.ts b/apps/sim/tools/a2a/get_agent_card.ts
index 77adad8149..6c7e3a3d4c 100644
--- a/apps/sim/tools/a2a/get_agent_card.ts
+++ b/apps/sim/tools/a2a/get_agent_card.ts
@@ -1,6 +1,6 @@
+import type { A2AGetAgentCardParams, A2AGetAgentCardResponse } from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2AGetAgentCardParams, A2AGetAgentCardResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aGetAgentCardTool: ToolConfig<A2AGetAgentCardParams, A2AGetAgentCardResponse> = {
   id: 'a2a_get_agent_card',
diff --git a/apps/sim/tools/a2a/get_push_notification.ts b/apps/sim/tools/a2a/get_push_notification.ts
index 52baa60e67..ab15245213 100644
--- a/apps/sim/tools/a2a/get_push_notification.ts
+++ b/apps/sim/tools/a2a/get_push_notification.ts
@@ -1,6 +1,9 @@
+import type {
+  A2AGetPushNotificationParams,
+  A2AGetPushNotificationResponse,
+} from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2AGetPushNotificationParams, A2AGetPushNotificationResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aGetPushNotificationTool: ToolConfig<
   A2AGetPushNotificationParams,
diff --git a/apps/sim/tools/a2a/get_task.ts b/apps/sim/tools/a2a/get_task.ts
index f10cd409eb..741e47b318 100644
--- a/apps/sim/tools/a2a/get_task.ts
+++ b/apps/sim/tools/a2a/get_task.ts
@@ -1,6 +1,6 @@
+import type { A2AGetTaskParams, A2AGetTaskResponse } from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2AGetTaskParams, A2AGetTaskResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aGetTaskTool: ToolConfig<A2AGetTaskParams, A2AGetTaskResponse> = {
   id: 'a2a_get_task',
diff --git a/apps/sim/tools/a2a/resubscribe.ts b/apps/sim/tools/a2a/resubscribe.ts
index 92b8a4bb8e..f86938c235 100644
--- a/apps/sim/tools/a2a/resubscribe.ts
+++ b/apps/sim/tools/a2a/resubscribe.ts
@@ -1,6 +1,6 @@
+import type { A2AResubscribeParams, A2AResubscribeResponse } from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2AResubscribeParams, A2AResubscribeResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aResubscribeTool: ToolConfig<A2AResubscribeParams, A2AResubscribeResponse> = {
   id: 'a2a_resubscribe',
diff --git a/apps/sim/tools/a2a/send_message.ts b/apps/sim/tools/a2a/send_message.ts
index 63480fcce7..1e0da1f12e 100644
--- a/apps/sim/tools/a2a/send_message.ts
+++ b/apps/sim/tools/a2a/send_message.ts
@@ -1,6 +1,6 @@
+import type { A2ASendMessageParams, A2ASendMessageResponse } from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2ASendMessageParams, A2ASendMessageResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aSendMessageTool: ToolConfig<A2ASendMessageParams, A2ASendMessageResponse> = {
   id: 'a2a_send_message',
diff --git a/apps/sim/tools/a2a/set_push_notification.ts b/apps/sim/tools/a2a/set_push_notification.ts
index d26ff64c9e..c87cc8ddc1 100644
--- a/apps/sim/tools/a2a/set_push_notification.ts
+++ b/apps/sim/tools/a2a/set_push_notification.ts
@@ -1,6 +1,9 @@
+import type {
+  A2ASetPushNotificationParams,
+  A2ASetPushNotificationResponse,
+} from '@/tools/a2a/types'
+import { A2A_OUTPUT_PROPERTIES } from '@/tools/a2a/types'
 import type { ToolConfig } from '@/tools/types'
-import type { A2ASetPushNotificationParams, A2ASetPushNotificationResponse } from './types'
-import { A2A_OUTPUT_PROPERTIES } from './types'
 
 export const a2aSetPushNotificationTool: ToolConfig<
   A2ASetPushNotificationParams,
diff --git a/apps/sim/tools/apify/run_actor_async.ts b/apps/sim/tools/apify/run_actor_async.ts
index 1c613dcde6..37edbac452 100644
--- a/apps/sim/tools/apify/run_actor_async.ts
+++ b/apps/sim/tools/apify/run_actor_async.ts
@@ -1,5 +1,5 @@
+import type { RunActorParams, RunActorResult } from '@/tools/apify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { RunActorParams, RunActorResult } from './types'
 
 const POLL_INTERVAL_MS = 5000 // 5 seconds between polls
 const MAX_POLL_TIME_MS = 300000 // 5 minutes maximum polling time
diff --git a/apps/sim/tools/apify/run_actor_sync.ts b/apps/sim/tools/apify/run_actor_sync.ts
index f7991cfd0f..046f4c1ccf 100644
--- a/apps/sim/tools/apify/run_actor_sync.ts
+++ b/apps/sim/tools/apify/run_actor_sync.ts
@@ -1,5 +1,5 @@
+import type { RunActorParams, RunActorResult } from '@/tools/apify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { RunActorParams, RunActorResult } from './types'
 
 export const apifyRunActorSyncTool: ToolConfig<RunActorParams, RunActorResult> = {
   id: 'apify_run_actor_sync',
diff --git a/apps/sim/tools/google_groups/add_alias.ts b/apps/sim/tools/google_groups/add_alias.ts
index 6ea8ed30b9..3bb068d60a 100644
--- a/apps/sim/tools/google_groups/add_alias.ts
+++ b/apps/sim/tools/google_groups/add_alias.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsAddAliasParams,
+  GoogleGroupsAddAliasResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsAddAliasParams, GoogleGroupsAddAliasResponse } from './types'
 
 export const addAliasTool: ToolConfig<GoogleGroupsAddAliasParams, GoogleGroupsAddAliasResponse> = {
   id: 'google_groups_add_alias',
diff --git a/apps/sim/tools/google_groups/add_member.ts b/apps/sim/tools/google_groups/add_member.ts
index e2d1e967e6..2bc6a97d53 100644
--- a/apps/sim/tools/google_groups/add_member.ts
+++ b/apps/sim/tools/google_groups/add_member.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsAddMemberParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsAddMemberParams, GoogleGroupsResponse } from './types'
 
 export const addMemberTool: ToolConfig<GoogleGroupsAddMemberParams, GoogleGroupsResponse> = {
   id: 'google_groups_add_member',
diff --git a/apps/sim/tools/google_groups/create_group.ts b/apps/sim/tools/google_groups/create_group.ts
index 015ff2037c..618026bf04 100644
--- a/apps/sim/tools/google_groups/create_group.ts
+++ b/apps/sim/tools/google_groups/create_group.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsCreateParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsCreateParams, GoogleGroupsResponse } from './types'
 
 export const createGroupTool: ToolConfig<GoogleGroupsCreateParams, GoogleGroupsResponse> = {
   id: 'google_groups_create_group',
diff --git a/apps/sim/tools/google_groups/delete_group.ts b/apps/sim/tools/google_groups/delete_group.ts
index 1b4479a4f5..079f904dcb 100644
--- a/apps/sim/tools/google_groups/delete_group.ts
+++ b/apps/sim/tools/google_groups/delete_group.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsDeleteParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsDeleteParams, GoogleGroupsResponse } from './types'
 
 export const deleteGroupTool: ToolConfig<GoogleGroupsDeleteParams, GoogleGroupsResponse> = {
   id: 'google_groups_delete_group',
diff --git a/apps/sim/tools/google_groups/get_group.ts b/apps/sim/tools/google_groups/get_group.ts
index 682ee6a6a3..d42a4cc2c5 100644
--- a/apps/sim/tools/google_groups/get_group.ts
+++ b/apps/sim/tools/google_groups/get_group.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsGetParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsGetParams, GoogleGroupsResponse } from './types'
 
 export const getGroupTool: ToolConfig<GoogleGroupsGetParams, GoogleGroupsResponse> = {
   id: 'google_groups_get_group',
diff --git a/apps/sim/tools/google_groups/get_member.ts b/apps/sim/tools/google_groups/get_member.ts
index 3c1f519c72..e9db3639d7 100644
--- a/apps/sim/tools/google_groups/get_member.ts
+++ b/apps/sim/tools/google_groups/get_member.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsGetMemberParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsGetMemberParams, GoogleGroupsResponse } from './types'
 
 export const getMemberTool: ToolConfig<GoogleGroupsGetMemberParams, GoogleGroupsResponse> = {
   id: 'google_groups_get_member',
diff --git a/apps/sim/tools/google_groups/get_settings.ts b/apps/sim/tools/google_groups/get_settings.ts
index 761ba54148..c326f93306 100644
--- a/apps/sim/tools/google_groups/get_settings.ts
+++ b/apps/sim/tools/google_groups/get_settings.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsGetSettingsParams,
+  GoogleGroupsGetSettingsResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsGetSettingsParams, GoogleGroupsGetSettingsResponse } from './types'
 
 export const getSettingsTool: ToolConfig<
   GoogleGroupsGetSettingsParams,
diff --git a/apps/sim/tools/google_groups/has_member.ts b/apps/sim/tools/google_groups/has_member.ts
index 7008d0c5e4..e43cfe7fe6 100644
--- a/apps/sim/tools/google_groups/has_member.ts
+++ b/apps/sim/tools/google_groups/has_member.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsHasMemberParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsHasMemberParams, GoogleGroupsResponse } from './types'
 
 export const hasMemberTool: ToolConfig<GoogleGroupsHasMemberParams, GoogleGroupsResponse> = {
   id: 'google_groups_has_member',
diff --git a/apps/sim/tools/google_groups/list_aliases.ts b/apps/sim/tools/google_groups/list_aliases.ts
index d207ff6a49..6346187992 100644
--- a/apps/sim/tools/google_groups/list_aliases.ts
+++ b/apps/sim/tools/google_groups/list_aliases.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsListAliasesParams,
+  GoogleGroupsListAliasesResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsListAliasesParams, GoogleGroupsListAliasesResponse } from './types'
 
 export const listAliasesTool: ToolConfig<
   GoogleGroupsListAliasesParams,
diff --git a/apps/sim/tools/google_groups/list_groups.ts b/apps/sim/tools/google_groups/list_groups.ts
index ca02034221..5769663f18 100644
--- a/apps/sim/tools/google_groups/list_groups.ts
+++ b/apps/sim/tools/google_groups/list_groups.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsListParams, GoogleGroupsResponse } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsListParams, GoogleGroupsResponse } from './types'
 
 export const listGroupsTool: ToolConfig<GoogleGroupsListParams, GoogleGroupsResponse> = {
   id: 'google_groups_list_groups',
diff --git a/apps/sim/tools/google_groups/list_members.ts b/apps/sim/tools/google_groups/list_members.ts
index 75e138a9db..7215e22b6e 100644
--- a/apps/sim/tools/google_groups/list_members.ts
+++ b/apps/sim/tools/google_groups/list_members.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsListMembersParams,
+  GoogleGroupsResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsListMembersParams, GoogleGroupsResponse } from './types'
 
 export const listMembersTool: ToolConfig<GoogleGroupsListMembersParams, GoogleGroupsResponse> = {
   id: 'google_groups_list_members',
diff --git a/apps/sim/tools/google_groups/remove_alias.ts b/apps/sim/tools/google_groups/remove_alias.ts
index 46a503a1ba..598f1f4f25 100644
--- a/apps/sim/tools/google_groups/remove_alias.ts
+++ b/apps/sim/tools/google_groups/remove_alias.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsRemoveAliasParams,
+  GoogleGroupsRemoveAliasResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsRemoveAliasParams, GoogleGroupsRemoveAliasResponse } from './types'
 
 export const removeAliasTool: ToolConfig<
   GoogleGroupsRemoveAliasParams,
diff --git a/apps/sim/tools/google_groups/remove_member.ts b/apps/sim/tools/google_groups/remove_member.ts
index e4250b7375..6f410a5c4f 100644
--- a/apps/sim/tools/google_groups/remove_member.ts
+++ b/apps/sim/tools/google_groups/remove_member.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsRemoveMemberParams,
+  GoogleGroupsResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsRemoveMemberParams, GoogleGroupsResponse } from './types'
 
 export const removeMemberTool: ToolConfig<GoogleGroupsRemoveMemberParams, GoogleGroupsResponse> = {
   id: 'google_groups_remove_member',
diff --git a/apps/sim/tools/google_groups/update_group.ts b/apps/sim/tools/google_groups/update_group.ts
index 6275dd033d..b50767dec3 100644
--- a/apps/sim/tools/google_groups/update_group.ts
+++ b/apps/sim/tools/google_groups/update_group.ts
@@ -1,5 +1,5 @@
+import type { GoogleGroupsResponse, GoogleGroupsUpdateParams } from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsResponse, GoogleGroupsUpdateParams } from './types'
 
 export const updateGroupTool: ToolConfig<GoogleGroupsUpdateParams, GoogleGroupsResponse> = {
   id: 'google_groups_update_group',
diff --git a/apps/sim/tools/google_groups/update_member.ts b/apps/sim/tools/google_groups/update_member.ts
index 65ac80eb7b..a1b9aa03a5 100644
--- a/apps/sim/tools/google_groups/update_member.ts
+++ b/apps/sim/tools/google_groups/update_member.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsResponse,
+  GoogleGroupsUpdateMemberParams,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsResponse, GoogleGroupsUpdateMemberParams } from './types'
 
 export const updateMemberTool: ToolConfig<GoogleGroupsUpdateMemberParams, GoogleGroupsResponse> = {
   id: 'google_groups_update_member',
diff --git a/apps/sim/tools/google_groups/update_settings.ts b/apps/sim/tools/google_groups/update_settings.ts
index 143a7d93f7..6f30dd13f2 100644
--- a/apps/sim/tools/google_groups/update_settings.ts
+++ b/apps/sim/tools/google_groups/update_settings.ts
@@ -1,5 +1,8 @@
+import type {
+  GoogleGroupsUpdateSettingsParams,
+  GoogleGroupsUpdateSettingsResponse,
+} from '@/tools/google_groups/types'
 import type { ToolConfig } from '@/tools/types'
-import type { GoogleGroupsUpdateSettingsParams, GoogleGroupsUpdateSettingsResponse } from './types'
 
 export const updateSettingsTool: ToolConfig<
   GoogleGroupsUpdateSettingsParams,
diff --git a/apps/sim/tools/http/webhook_request.ts b/apps/sim/tools/http/webhook_request.ts
index 33d7c5051a..a083885596 100644
--- a/apps/sim/tools/http/webhook_request.ts
+++ b/apps/sim/tools/http/webhook_request.ts
@@ -1,7 +1,7 @@
 import { createHmac } from 'crypto'
 import { v4 as uuidv4 } from 'uuid'
+import type { RequestResponse, WebhookRequestParams } from '@/tools/http/types'
 import type { ToolConfig } from '@/tools/types'
-import type { RequestResponse, WebhookRequestParams } from './types'
 
 /**
  * Generates HMAC-SHA256 signature for webhook payload
diff --git a/apps/sim/tools/incidentio/incident_statuses_list.ts b/apps/sim/tools/incidentio/incident_statuses_list.ts
index 2ef0202eb8..e3461f13d5 100644
--- a/apps/sim/tools/incidentio/incident_statuses_list.ts
+++ b/apps/sim/tools/incidentio/incident_statuses_list.ts
@@ -1,8 +1,8 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   IncidentioIncidentStatusesListParams,
   IncidentioIncidentStatusesListResponse,
-} from './types'
+} from '@/tools/incidentio/types'
+import type { ToolConfig } from '@/tools/types'
 
 export const incidentStatusesListTool: ToolConfig<
   IncidentioIncidentStatusesListParams,
diff --git a/apps/sim/tools/incidentio/incident_types_list.ts b/apps/sim/tools/incidentio/incident_types_list.ts
index 95a697a2e0..a5042eeab6 100644
--- a/apps/sim/tools/incidentio/incident_types_list.ts
+++ b/apps/sim/tools/incidentio/incident_types_list.ts
@@ -1,8 +1,8 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   IncidentioIncidentTypesListParams,
   IncidentioIncidentTypesListResponse,
-} from './types'
+} from '@/tools/incidentio/types'
+import type { ToolConfig } from '@/tools/types'
 
 export const incidentTypesListTool: ToolConfig<
   IncidentioIncidentTypesListParams,
diff --git a/apps/sim/tools/incidentio/severities_list.ts b/apps/sim/tools/incidentio/severities_list.ts
index faeca00844..40667607d2 100644
--- a/apps/sim/tools/incidentio/severities_list.ts
+++ b/apps/sim/tools/incidentio/severities_list.ts
@@ -1,5 +1,8 @@
+import type {
+  IncidentioSeveritiesListParams,
+  IncidentioSeveritiesListResponse,
+} from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { IncidentioSeveritiesListParams, IncidentioSeveritiesListResponse } from './types'
 
 export const severitiesListTool: ToolConfig<
   IncidentioSeveritiesListParams,
diff --git a/apps/sim/tools/incidentio/users_list.ts b/apps/sim/tools/incidentio/users_list.ts
index e8ffb413ea..0f1b74a6c8 100644
--- a/apps/sim/tools/incidentio/users_list.ts
+++ b/apps/sim/tools/incidentio/users_list.ts
@@ -1,5 +1,8 @@
+import type {
+  IncidentioUsersListParams,
+  IncidentioUsersListResponse,
+} from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { IncidentioUsersListParams, IncidentioUsersListResponse } from './types'
 
 export const usersListTool: ToolConfig<IncidentioUsersListParams, IncidentioUsersListResponse> = {
   id: 'incidentio_users_list',
diff --git a/apps/sim/tools/incidentio/users_show.ts b/apps/sim/tools/incidentio/users_show.ts
index 493393137a..d2981e3153 100644
--- a/apps/sim/tools/incidentio/users_show.ts
+++ b/apps/sim/tools/incidentio/users_show.ts
@@ -1,5 +1,8 @@
+import type {
+  IncidentioUsersShowParams,
+  IncidentioUsersShowResponse,
+} from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { IncidentioUsersShowParams, IncidentioUsersShowResponse } from './types'
 
 export const usersShowTool: ToolConfig<IncidentioUsersShowParams, IncidentioUsersShowResponse> = {
   id: 'incidentio_users_show',
diff --git a/apps/sim/tools/incidentio/workflows_create.ts b/apps/sim/tools/incidentio/workflows_create.ts
index cf676d0c4b..99e1f7cc73 100644
--- a/apps/sim/tools/incidentio/workflows_create.ts
+++ b/apps/sim/tools/incidentio/workflows_create.ts
@@ -1,5 +1,5 @@
+import type { WorkflowsCreateParams, WorkflowsCreateResponse } from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { WorkflowsCreateParams, WorkflowsCreateResponse } from './types'
 
 export const workflowsCreateTool: ToolConfig<WorkflowsCreateParams, WorkflowsCreateResponse> = {
   id: 'incidentio_workflows_create',
diff --git a/apps/sim/tools/incidentio/workflows_delete.ts b/apps/sim/tools/incidentio/workflows_delete.ts
index 0b60885c33..7111ed9724 100644
--- a/apps/sim/tools/incidentio/workflows_delete.ts
+++ b/apps/sim/tools/incidentio/workflows_delete.ts
@@ -1,5 +1,5 @@
+import type { WorkflowsDeleteParams, WorkflowsDeleteResponse } from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { WorkflowsDeleteParams, WorkflowsDeleteResponse } from './types'
 
 export const workflowsDeleteTool: ToolConfig<WorkflowsDeleteParams, WorkflowsDeleteResponse> = {
   id: 'incidentio_workflows_delete',
diff --git a/apps/sim/tools/incidentio/workflows_list.ts b/apps/sim/tools/incidentio/workflows_list.ts
index bc78668400..a0f29d430c 100644
--- a/apps/sim/tools/incidentio/workflows_list.ts
+++ b/apps/sim/tools/incidentio/workflows_list.ts
@@ -1,5 +1,5 @@
+import type { WorkflowsListParams, WorkflowsListResponse } from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { WorkflowsListParams, WorkflowsListResponse } from './types'
 
 export const workflowsListTool: ToolConfig<WorkflowsListParams, WorkflowsListResponse> = {
   id: 'incidentio_workflows_list',
diff --git a/apps/sim/tools/incidentio/workflows_show.ts b/apps/sim/tools/incidentio/workflows_show.ts
index ea243e4789..a5f84be61f 100644
--- a/apps/sim/tools/incidentio/workflows_show.ts
+++ b/apps/sim/tools/incidentio/workflows_show.ts
@@ -1,5 +1,5 @@
+import type { WorkflowsShowParams, WorkflowsShowResponse } from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { WorkflowsShowParams, WorkflowsShowResponse } from './types'
 
 export const workflowsShowTool: ToolConfig<WorkflowsShowParams, WorkflowsShowResponse> = {
   id: 'incidentio_workflows_show',
diff --git a/apps/sim/tools/incidentio/workflows_update.ts b/apps/sim/tools/incidentio/workflows_update.ts
index b4441fbd38..4446df4ae7 100644
--- a/apps/sim/tools/incidentio/workflows_update.ts
+++ b/apps/sim/tools/incidentio/workflows_update.ts
@@ -1,5 +1,5 @@
+import type { WorkflowsUpdateParams, WorkflowsUpdateResponse } from '@/tools/incidentio/types'
 import type { ToolConfig } from '@/tools/types'
-import type { WorkflowsUpdateParams, WorkflowsUpdateResponse } from './types'
 
 export const workflowsUpdateTool: ToolConfig<WorkflowsUpdateParams, WorkflowsUpdateResponse> = {
   id: 'incidentio_workflows_update',
diff --git a/apps/sim/tools/intercom/get_company.ts b/apps/sim/tools/intercom/get_company.ts
index 1d2474d027..bf5c9a403f 100644
--- a/apps/sim/tools/intercom/get_company.ts
+++ b/apps/sim/tools/intercom/get_company.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomGetCompany')
-
 export interface IntercomGetCompanyParams {
   accessToken: string
   companyId: string
diff --git a/apps/sim/tools/intercom/get_conversation.ts b/apps/sim/tools/intercom/get_conversation.ts
index 21413b2269..1c8d9056d5 100644
--- a/apps/sim/tools/intercom/get_conversation.ts
+++ b/apps/sim/tools/intercom/get_conversation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomGetConversation')
-
 export interface IntercomGetConversationParams {
   accessToken: string
   conversationId: string
diff --git a/apps/sim/tools/intercom/list_companies.ts b/apps/sim/tools/intercom/list_companies.ts
index 10f95ac10c..84f1f65886 100644
--- a/apps/sim/tools/intercom/list_companies.ts
+++ b/apps/sim/tools/intercom/list_companies.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomListCompanies')
-
 export interface IntercomListCompaniesParams {
   accessToken: string
   per_page?: number
diff --git a/apps/sim/tools/intercom/list_contacts.ts b/apps/sim/tools/intercom/list_contacts.ts
index b3f483788f..7c34eedf58 100644
--- a/apps/sim/tools/intercom/list_contacts.ts
+++ b/apps/sim/tools/intercom/list_contacts.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomListContacts')
-
 export interface IntercomListContactsParams {
   accessToken: string
   per_page?: number
diff --git a/apps/sim/tools/intercom/list_conversations.ts b/apps/sim/tools/intercom/list_conversations.ts
index 92b52060c0..9a9a5c1592 100644
--- a/apps/sim/tools/intercom/list_conversations.ts
+++ b/apps/sim/tools/intercom/list_conversations.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomListConversations')
-
 export interface IntercomListConversationsParams {
   accessToken: string
   per_page?: number
diff --git a/apps/sim/tools/intercom/reply_conversation.ts b/apps/sim/tools/intercom/reply_conversation.ts
index bf6304af89..1662f07f2a 100644
--- a/apps/sim/tools/intercom/reply_conversation.ts
+++ b/apps/sim/tools/intercom/reply_conversation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomReplyConversation')
-
 export interface IntercomReplyConversationParams {
   accessToken: string
   conversationId: string
diff --git a/apps/sim/tools/intercom/search_contacts.ts b/apps/sim/tools/intercom/search_contacts.ts
index 32d314523a..4b4bd4e89d 100644
--- a/apps/sim/tools/intercom/search_contacts.ts
+++ b/apps/sim/tools/intercom/search_contacts.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('IntercomSearchContacts')
-
 export interface IntercomSearchContactsParams {
   accessToken: string
   query: string
diff --git a/apps/sim/tools/kalshi/amend_order.ts b/apps/sim/tools/kalshi/amend_order.ts
index 8c5955eac3..1738489502 100644
--- a/apps/sim/tools/kalshi/amend_order.ts
+++ b/apps/sim/tools/kalshi/amend_order.ts
@@ -1,6 +1,6 @@
+import type { KalshiAuthParams, KalshiOrder } from '@/tools/kalshi/types'
+import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiAuthParams, KalshiOrder } from './types'
-import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiAmendOrderParams extends KalshiAuthParams {
   orderId: string // Order ID to amend (required)
diff --git a/apps/sim/tools/kalshi/cancel_order.ts b/apps/sim/tools/kalshi/cancel_order.ts
index 5d443f1084..58afefd2b6 100644
--- a/apps/sim/tools/kalshi/cancel_order.ts
+++ b/apps/sim/tools/kalshi/cancel_order.ts
@@ -1,6 +1,6 @@
+import type { KalshiAuthParams, KalshiOrder } from '@/tools/kalshi/types'
+import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiAuthParams, KalshiOrder } from './types'
-import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiCancelOrderParams extends KalshiAuthParams {
   orderId: string // Order ID to cancel (required)
diff --git a/apps/sim/tools/kalshi/create_order.ts b/apps/sim/tools/kalshi/create_order.ts
index e0fa1e9f14..c28de3b62a 100644
--- a/apps/sim/tools/kalshi/create_order.ts
+++ b/apps/sim/tools/kalshi/create_order.ts
@@ -1,6 +1,6 @@
+import type { KalshiAuthParams, KalshiOrder } from '@/tools/kalshi/types'
+import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiAuthParams, KalshiOrder } from './types'
-import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiCreateOrderParams extends KalshiAuthParams {
   ticker: string // Market ticker (required)
diff --git a/apps/sim/tools/kalshi/get_balance.ts b/apps/sim/tools/kalshi/get_balance.ts
index 716d9b6fe9..e9e8b3eec1 100644
--- a/apps/sim/tools/kalshi/get_balance.ts
+++ b/apps/sim/tools/kalshi/get_balance.ts
@@ -1,6 +1,6 @@
+import type { KalshiAuthParams } from '@/tools/kalshi/types'
+import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiAuthParams } from './types'
-import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetBalanceParams extends KalshiAuthParams {}
 
diff --git a/apps/sim/tools/kalshi/get_candlesticks.ts b/apps/sim/tools/kalshi/get_candlesticks.ts
index 34428d2a27..ee6fef1db4 100644
--- a/apps/sim/tools/kalshi/get_candlesticks.ts
+++ b/apps/sim/tools/kalshi/get_candlesticks.ts
@@ -1,6 +1,6 @@
+import type { KalshiCandlestick } from '@/tools/kalshi/types'
+import { buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiCandlestick } from './types'
-import { buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetCandlesticksParams {
   seriesTicker: string
diff --git a/apps/sim/tools/kalshi/get_event.ts b/apps/sim/tools/kalshi/get_event.ts
index a0428454a8..5b2fa87a98 100644
--- a/apps/sim/tools/kalshi/get_event.ts
+++ b/apps/sim/tools/kalshi/get_event.ts
@@ -1,6 +1,6 @@
+import type { KalshiEvent } from '@/tools/kalshi/types'
+import { buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiEvent } from './types'
-import { buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetEventParams {
   eventTicker: string // Event ticker
diff --git a/apps/sim/tools/kalshi/get_events.ts b/apps/sim/tools/kalshi/get_events.ts
index 2d3c8e4467..5f457eaf19 100644
--- a/apps/sim/tools/kalshi/get_events.ts
+++ b/apps/sim/tools/kalshi/get_events.ts
@@ -1,6 +1,10 @@
+import type { KalshiEvent, KalshiPaginationParams, KalshiPagingInfo } from '@/tools/kalshi/types'
+import {
+  buildKalshiUrl,
+  handleKalshiError,
+  KALSHI_EVENT_OUTPUT_PROPERTIES,
+} from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiEvent, KalshiPaginationParams, KalshiPagingInfo } from './types'
-import { buildKalshiUrl, handleKalshiError, KALSHI_EVENT_OUTPUT_PROPERTIES } from './types'
 
 export interface KalshiGetEventsParams extends KalshiPaginationParams {
   status?: string // open, closed, settled
diff --git a/apps/sim/tools/kalshi/get_exchange_status.ts b/apps/sim/tools/kalshi/get_exchange_status.ts
index 7348d6b293..20c131bf29 100644
--- a/apps/sim/tools/kalshi/get_exchange_status.ts
+++ b/apps/sim/tools/kalshi/get_exchange_status.ts
@@ -1,6 +1,6 @@
+import type { KalshiExchangeStatus } from '@/tools/kalshi/types'
+import { buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiExchangeStatus } from './types'
-import { buildKalshiUrl, handleKalshiError } from './types'
 
 export type KalshiGetExchangeStatusParams = Record<string, never>
 
diff --git a/apps/sim/tools/kalshi/get_fills.ts b/apps/sim/tools/kalshi/get_fills.ts
index 29146f2937..47587ff4f9 100644
--- a/apps/sim/tools/kalshi/get_fills.ts
+++ b/apps/sim/tools/kalshi/get_fills.ts
@@ -1,16 +1,16 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   KalshiAuthParams,
   KalshiFill,
   KalshiPaginationParams,
   KalshiPagingInfo,
-} from './types'
+} from '@/tools/kalshi/types'
 import {
   buildKalshiAuthHeaders,
   buildKalshiUrl,
   handleKalshiError,
   KALSHI_FILL_OUTPUT_PROPERTIES,
-} from './types'
+} from '@/tools/kalshi/types'
+import type { ToolConfig } from '@/tools/types'
 
 export interface KalshiGetFillsParams extends KalshiAuthParams, KalshiPaginationParams {
   ticker?: string
diff --git a/apps/sim/tools/kalshi/get_market.ts b/apps/sim/tools/kalshi/get_market.ts
index 12d735e502..7e936d0020 100644
--- a/apps/sim/tools/kalshi/get_market.ts
+++ b/apps/sim/tools/kalshi/get_market.ts
@@ -1,6 +1,6 @@
+import type { KalshiMarket } from '@/tools/kalshi/types'
+import { buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiMarket } from './types'
-import { buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetMarketParams {
   ticker: string // Market ticker
diff --git a/apps/sim/tools/kalshi/get_markets.ts b/apps/sim/tools/kalshi/get_markets.ts
index 525850ff85..fc6c18ef69 100644
--- a/apps/sim/tools/kalshi/get_markets.ts
+++ b/apps/sim/tools/kalshi/get_markets.ts
@@ -1,11 +1,11 @@
-import type { ToolConfig } from '@/tools/types'
-import type { KalshiMarket, KalshiPaginationParams, KalshiPagingInfo } from './types'
+import type { KalshiMarket, KalshiPaginationParams, KalshiPagingInfo } from '@/tools/kalshi/types'
 import {
   buildKalshiUrl,
   handleKalshiError,
   KALSHI_MARKET_OUTPUT_PROPERTIES,
   KALSHI_PAGING_OUTPUT_PROPERTIES,
-} from './types'
+} from '@/tools/kalshi/types'
+import type { ToolConfig } from '@/tools/types'
 
 export interface KalshiGetMarketsParams extends KalshiPaginationParams {
   status?: string // unopened, open, closed, settled
diff --git a/apps/sim/tools/kalshi/get_order.ts b/apps/sim/tools/kalshi/get_order.ts
index 12411de6e0..96be895d08 100644
--- a/apps/sim/tools/kalshi/get_order.ts
+++ b/apps/sim/tools/kalshi/get_order.ts
@@ -1,6 +1,6 @@
+import type { KalshiAuthParams, KalshiOrder } from '@/tools/kalshi/types'
+import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiAuthParams, KalshiOrder } from './types'
-import { buildKalshiAuthHeaders, buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetOrderParams extends KalshiAuthParams {
   orderId: string // Order ID to retrieve (required)
diff --git a/apps/sim/tools/kalshi/get_orderbook.ts b/apps/sim/tools/kalshi/get_orderbook.ts
index 642c67f2db..5b5b50b032 100644
--- a/apps/sim/tools/kalshi/get_orderbook.ts
+++ b/apps/sim/tools/kalshi/get_orderbook.ts
@@ -1,6 +1,6 @@
+import type { KalshiOrderbook } from '@/tools/kalshi/types'
+import { buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiOrderbook } from './types'
-import { buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetOrderbookParams {
   ticker: string
diff --git a/apps/sim/tools/kalshi/get_orders.ts b/apps/sim/tools/kalshi/get_orders.ts
index 0732ec2c7a..6e11eaea69 100644
--- a/apps/sim/tools/kalshi/get_orders.ts
+++ b/apps/sim/tools/kalshi/get_orders.ts
@@ -1,16 +1,16 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   KalshiAuthParams,
   KalshiOrder,
   KalshiPaginationParams,
   KalshiPagingInfo,
-} from './types'
+} from '@/tools/kalshi/types'
 import {
   buildKalshiAuthHeaders,
   buildKalshiUrl,
   handleKalshiError,
   KALSHI_ORDER_OUTPUT_PROPERTIES,
-} from './types'
+} from '@/tools/kalshi/types'
+import type { ToolConfig } from '@/tools/types'
 
 export interface KalshiGetOrdersParams extends KalshiAuthParams, KalshiPaginationParams {
   ticker?: string
diff --git a/apps/sim/tools/kalshi/get_positions.ts b/apps/sim/tools/kalshi/get_positions.ts
index 6636362676..2269b72fa5 100644
--- a/apps/sim/tools/kalshi/get_positions.ts
+++ b/apps/sim/tools/kalshi/get_positions.ts
@@ -1,17 +1,17 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   KalshiAuthParams,
   KalshiPaginationParams,
   KalshiPagingInfo,
   KalshiPosition,
-} from './types'
+} from '@/tools/kalshi/types'
 import {
   buildKalshiAuthHeaders,
   buildKalshiUrl,
   handleKalshiError,
   KALSHI_EVENT_POSITION_OUTPUT_PROPERTIES,
   KALSHI_POSITION_OUTPUT_PROPERTIES,
-} from './types'
+} from '@/tools/kalshi/types'
+import type { ToolConfig } from '@/tools/types'
 
 export interface KalshiGetPositionsParams extends KalshiAuthParams, KalshiPaginationParams {
   ticker?: string
diff --git a/apps/sim/tools/kalshi/get_series_by_ticker.ts b/apps/sim/tools/kalshi/get_series_by_ticker.ts
index bbf0703743..acca36e9a1 100644
--- a/apps/sim/tools/kalshi/get_series_by_ticker.ts
+++ b/apps/sim/tools/kalshi/get_series_by_ticker.ts
@@ -1,6 +1,6 @@
+import type { KalshiSeries } from '@/tools/kalshi/types'
+import { buildKalshiUrl, handleKalshiError } from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiSeries } from './types'
-import { buildKalshiUrl, handleKalshiError } from './types'
 
 export interface KalshiGetSeriesByTickerParams {
   seriesTicker: string
diff --git a/apps/sim/tools/kalshi/get_trades.ts b/apps/sim/tools/kalshi/get_trades.ts
index 03773288ee..6edc73592c 100644
--- a/apps/sim/tools/kalshi/get_trades.ts
+++ b/apps/sim/tools/kalshi/get_trades.ts
@@ -1,6 +1,10 @@
+import type { KalshiPaginationParams, KalshiPagingInfo, KalshiTrade } from '@/tools/kalshi/types'
+import {
+  buildKalshiUrl,
+  handleKalshiError,
+  KALSHI_TRADE_OUTPUT_PROPERTIES,
+} from '@/tools/kalshi/types'
 import type { ToolConfig } from '@/tools/types'
-import type { KalshiPaginationParams, KalshiPagingInfo, KalshiTrade } from './types'
-import { buildKalshiUrl, handleKalshiError, KALSHI_TRADE_OUTPUT_PROPERTIES } from './types'
 
 export interface KalshiGetTradesParams extends KalshiPaginationParams {}
 
diff --git a/apps/sim/tools/kalshi/types.ts b/apps/sim/tools/kalshi/types.ts
index 6950f62431..bf18ca6cae 100644
--- a/apps/sim/tools/kalshi/types.ts
+++ b/apps/sim/tools/kalshi/types.ts
@@ -1,9 +1,6 @@
 import crypto from 'crypto'
-import { createLogger } from '@sim/logger'
 import type { OutputProperty } from '@/tools/types'
 
-const logger = createLogger('Kalshi')
-
 // Base URL for Kalshi API
 export const KALSHI_BASE_URL = 'https://api.elections.kalshi.com/trade-api/v2'
 
@@ -598,8 +595,6 @@ export function buildKalshiAuthHeaders(
 
 // Helper function for consistent error handling
 export function handleKalshiError(data: any, status: number, operation: string): never {
-  logger.error(`Kalshi API request failed for ${operation}`, { data, status })
-
   const errorMessage =
     data.error?.message || data.error || data.message || data.detail || 'Unknown error'
   throw new Error(`Kalshi ${operation} failed: ${errorMessage}`)
diff --git a/apps/sim/tools/mailchimp/add_member.ts b/apps/sim/tools/mailchimp/add_member.ts
index de1ab772ea..67796fee09 100644
--- a/apps/sim/tools/mailchimp/add_member.ts
+++ b/apps/sim/tools/mailchimp/add_member.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
 
 const logger = createLogger('MailchimpAddMember')
 
diff --git a/apps/sim/tools/mailchimp/add_member_tags.ts b/apps/sim/tools/mailchimp/add_member_tags.ts
index 936284f7ec..8d053f1f35 100644
--- a/apps/sim/tools/mailchimp/add_member_tags.ts
+++ b/apps/sim/tools/mailchimp/add_member_tags.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpAddMemberTags')
 
diff --git a/apps/sim/tools/mailchimp/add_or_update_member.ts b/apps/sim/tools/mailchimp/add_or_update_member.ts
index 0763c8dd4e..d36128c473 100644
--- a/apps/sim/tools/mailchimp/add_or_update_member.ts
+++ b/apps/sim/tools/mailchimp/add_or_update_member.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
 
 const logger = createLogger('MailchimpAddOrUpdateMember')
 
diff --git a/apps/sim/tools/mailchimp/add_segment_member.ts b/apps/sim/tools/mailchimp/add_segment_member.ts
index b9eaa5d168..4ad004900c 100644
--- a/apps/sim/tools/mailchimp/add_segment_member.ts
+++ b/apps/sim/tools/mailchimp/add_segment_member.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
-
-const logger = createLogger('MailchimpAddSegmentMember')
 
 export interface MailchimpAddSegmentMemberParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts b/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts
index 82bdcbc3b9..4b0241201a 100644
--- a/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts
+++ b/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpMember } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpMember } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpAddSubscriberToAutomation')
 
 export interface MailchimpAddSubscriberToAutomationParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/archive_member.ts b/apps/sim/tools/mailchimp/archive_member.ts
index 2892474d07..fa8bd6ab8c 100644
--- a/apps/sim/tools/mailchimp/archive_member.ts
+++ b/apps/sim/tools/mailchimp/archive_member.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpArchiveMember')
 
 export interface MailchimpArchiveMemberParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/create_audience.ts b/apps/sim/tools/mailchimp/create_audience.ts
index d2131eb7c9..e5af09b613 100644
--- a/apps/sim/tools/mailchimp/create_audience.ts
+++ b/apps/sim/tools/mailchimp/create_audience.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
+import type { MailchimpAudience } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpAudience } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpCreateAudience')
 
diff --git a/apps/sim/tools/mailchimp/create_batch_operation.ts b/apps/sim/tools/mailchimp/create_batch_operation.ts
index bf53c828f4..e441c1984d 100644
--- a/apps/sim/tools/mailchimp/create_batch_operation.ts
+++ b/apps/sim/tools/mailchimp/create_batch_operation.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
+import type { MailchimpBatchOperation } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpBatchOperation } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpCreateBatchOperation')
 
diff --git a/apps/sim/tools/mailchimp/create_campaign.ts b/apps/sim/tools/mailchimp/create_campaign.ts
index ef7b63a1b6..0af8d65fc4 100644
--- a/apps/sim/tools/mailchimp/create_campaign.ts
+++ b/apps/sim/tools/mailchimp/create_campaign.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaign,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaign } from './types'
 
 const logger = createLogger('MailchimpCreateCampaign')
 
diff --git a/apps/sim/tools/mailchimp/create_interest.ts b/apps/sim/tools/mailchimp/create_interest.ts
index 69dc67326c..0068134fdb 100644
--- a/apps/sim/tools/mailchimp/create_interest.ts
+++ b/apps/sim/tools/mailchimp/create_interest.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpInterest } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpInterest } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpCreateInterest')
 
 export interface MailchimpCreateInterestParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/create_interest_category.ts b/apps/sim/tools/mailchimp/create_interest_category.ts
index d164f6ba02..17c39cb0d4 100644
--- a/apps/sim/tools/mailchimp/create_interest_category.ts
+++ b/apps/sim/tools/mailchimp/create_interest_category.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpInterestCategory } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpInterestCategory } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpCreateInterestCategory')
 
 export interface MailchimpCreateInterestCategoryParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/create_landing_page.ts b/apps/sim/tools/mailchimp/create_landing_page.ts
index d674456e53..dd25da09d4 100644
--- a/apps/sim/tools/mailchimp/create_landing_page.ts
+++ b/apps/sim/tools/mailchimp/create_landing_page.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpLandingPage } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpLandingPage } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpCreateLandingPage')
 
 export interface MailchimpCreateLandingPageParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/create_merge_field.ts b/apps/sim/tools/mailchimp/create_merge_field.ts
index 142a3f8449..45bdc126c7 100644
--- a/apps/sim/tools/mailchimp/create_merge_field.ts
+++ b/apps/sim/tools/mailchimp/create_merge_field.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpMergeField } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpMergeField } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpCreateMergeField')
 
 export interface MailchimpCreateMergeFieldParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/create_segment.ts b/apps/sim/tools/mailchimp/create_segment.ts
index abec5bf5c2..9c5eecc29a 100644
--- a/apps/sim/tools/mailchimp/create_segment.ts
+++ b/apps/sim/tools/mailchimp/create_segment.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
+import type { MailchimpSegment } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpSegment } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpCreateSegment')
 
diff --git a/apps/sim/tools/mailchimp/create_template.ts b/apps/sim/tools/mailchimp/create_template.ts
index 6dd2a65746..b1e39a34fa 100644
--- a/apps/sim/tools/mailchimp/create_template.ts
+++ b/apps/sim/tools/mailchimp/create_template.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpCreateTemplate')
 
 export interface MailchimpCreateTemplateParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_audience.ts b/apps/sim/tools/mailchimp/delete_audience.ts
index 64b0ad4f17..9571e9a1da 100644
--- a/apps/sim/tools/mailchimp/delete_audience.ts
+++ b/apps/sim/tools/mailchimp/delete_audience.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteAudience')
 
 export interface MailchimpDeleteAudienceParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_batch_operation.ts b/apps/sim/tools/mailchimp/delete_batch_operation.ts
index ba12ad85bb..c2a2acecd4 100644
--- a/apps/sim/tools/mailchimp/delete_batch_operation.ts
+++ b/apps/sim/tools/mailchimp/delete_batch_operation.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteBatchOperation')
 
 export interface MailchimpDeleteBatchOperationParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_campaign.ts b/apps/sim/tools/mailchimp/delete_campaign.ts
index 077138c151..e40fc71fad 100644
--- a/apps/sim/tools/mailchimp/delete_campaign.ts
+++ b/apps/sim/tools/mailchimp/delete_campaign.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteCampaign')
 
 export interface MailchimpDeleteCampaignParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_interest.ts b/apps/sim/tools/mailchimp/delete_interest.ts
index 9a69d5864e..cd0410fbbf 100644
--- a/apps/sim/tools/mailchimp/delete_interest.ts
+++ b/apps/sim/tools/mailchimp/delete_interest.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteInterest')
 
 export interface MailchimpDeleteInterestParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_interest_category.ts b/apps/sim/tools/mailchimp/delete_interest_category.ts
index f1918a43dd..88e206ef62 100644
--- a/apps/sim/tools/mailchimp/delete_interest_category.ts
+++ b/apps/sim/tools/mailchimp/delete_interest_category.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteInterestCategory')
 
 export interface MailchimpDeleteInterestCategoryParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_landing_page.ts b/apps/sim/tools/mailchimp/delete_landing_page.ts
index c63894f934..f4f88b1734 100644
--- a/apps/sim/tools/mailchimp/delete_landing_page.ts
+++ b/apps/sim/tools/mailchimp/delete_landing_page.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteLandingPage')
 
 export interface MailchimpDeleteLandingPageParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_member.ts b/apps/sim/tools/mailchimp/delete_member.ts
index 72090b5ab7..0a2c531154 100644
--- a/apps/sim/tools/mailchimp/delete_member.ts
+++ b/apps/sim/tools/mailchimp/delete_member.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteMember')
 
 export interface MailchimpDeleteMemberParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_merge_field.ts b/apps/sim/tools/mailchimp/delete_merge_field.ts
index f7a0f5201d..a81c8fe625 100644
--- a/apps/sim/tools/mailchimp/delete_merge_field.ts
+++ b/apps/sim/tools/mailchimp/delete_merge_field.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteMergeField')
 
 export interface MailchimpDeleteMergeFieldParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_segment.ts b/apps/sim/tools/mailchimp/delete_segment.ts
index 4d4f91f880..c46ea5fbc7 100644
--- a/apps/sim/tools/mailchimp/delete_segment.ts
+++ b/apps/sim/tools/mailchimp/delete_segment.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteSegment')
 
 export interface MailchimpDeleteSegmentParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/delete_template.ts b/apps/sim/tools/mailchimp/delete_template.ts
index 33cf01ccca..686a094e1b 100644
--- a/apps/sim/tools/mailchimp/delete_template.ts
+++ b/apps/sim/tools/mailchimp/delete_template.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpDeleteTemplate')
 
 export interface MailchimpDeleteTemplateParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_audience.ts b/apps/sim/tools/mailchimp/get_audience.ts
index 5b9fb183b9..e79ce3da03 100644
--- a/apps/sim/tools/mailchimp/get_audience.ts
+++ b/apps/sim/tools/mailchimp/get_audience.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpAudience } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpAudience } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetAudience')
 
 export interface MailchimpGetAudienceParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_audiences.ts b/apps/sim/tools/mailchimp/get_audiences.ts
index f8ca125fe2..2d7f5e5012 100644
--- a/apps/sim/tools/mailchimp/get_audiences.ts
+++ b/apps/sim/tools/mailchimp/get_audiences.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpAudience } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpAudience } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetAudiences')
 
 export interface MailchimpGetAudiencesParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_automation.ts b/apps/sim/tools/mailchimp/get_automation.ts
index 82062b5e95..3f755619a4 100644
--- a/apps/sim/tools/mailchimp/get_automation.ts
+++ b/apps/sim/tools/mailchimp/get_automation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpAutomation } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpAutomation } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetAutomation')
 
 export interface MailchimpGetAutomationParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_automations.ts b/apps/sim/tools/mailchimp/get_automations.ts
index d2df8aa48d..a30cf4a3b1 100644
--- a/apps/sim/tools/mailchimp/get_automations.ts
+++ b/apps/sim/tools/mailchimp/get_automations.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpAutomation } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpAutomation } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetAutomations')
 
 export interface MailchimpGetAutomationsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_batch_operation.ts b/apps/sim/tools/mailchimp/get_batch_operation.ts
index 1784878aec..427f7772c5 100644
--- a/apps/sim/tools/mailchimp/get_batch_operation.ts
+++ b/apps/sim/tools/mailchimp/get_batch_operation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpBatchOperation } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpBatchOperation } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetBatchOperation')
 
 export interface MailchimpGetBatchOperationParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_batch_operations.ts b/apps/sim/tools/mailchimp/get_batch_operations.ts
index ea5f6b76e7..e78eda3afb 100644
--- a/apps/sim/tools/mailchimp/get_batch_operations.ts
+++ b/apps/sim/tools/mailchimp/get_batch_operations.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpBatchOperation } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpBatchOperation } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetBatchOperations')
 
 export interface MailchimpGetBatchOperationsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_campaign.ts b/apps/sim/tools/mailchimp/get_campaign.ts
index 1562566f6d..e642f62faf 100644
--- a/apps/sim/tools/mailchimp/get_campaign.ts
+++ b/apps/sim/tools/mailchimp/get_campaign.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaign,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaign } from './types'
-
-const logger = createLogger('MailchimpGetCampaign')
 
 export interface MailchimpGetCampaignParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_campaign_content.ts b/apps/sim/tools/mailchimp/get_campaign_content.ts
index 978ffbe415..53b9a66359 100644
--- a/apps/sim/tools/mailchimp/get_campaign_content.ts
+++ b/apps/sim/tools/mailchimp/get_campaign_content.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaignContent,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaignContent } from './types'
-
-const logger = createLogger('MailchimpGetCampaignContent')
 
 export interface MailchimpGetCampaignContentParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_campaign_report.ts b/apps/sim/tools/mailchimp/get_campaign_report.ts
index 2babba6891..274a191cdc 100644
--- a/apps/sim/tools/mailchimp/get_campaign_report.ts
+++ b/apps/sim/tools/mailchimp/get_campaign_report.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaignReport,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaignReport } from './types'
-
-const logger = createLogger('MailchimpGetCampaignReport')
 
 export interface MailchimpGetCampaignReportParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_campaign_reports.ts b/apps/sim/tools/mailchimp/get_campaign_reports.ts
index ee5fe8c297..697a819a92 100644
--- a/apps/sim/tools/mailchimp/get_campaign_reports.ts
+++ b/apps/sim/tools/mailchimp/get_campaign_reports.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaignReport,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaignReport } from './types'
-
-const logger = createLogger('MailchimpGetCampaignReports')
 
 export interface MailchimpGetCampaignReportsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_campaigns.ts b/apps/sim/tools/mailchimp/get_campaigns.ts
index aa9d8dcaa2..f34468b360 100644
--- a/apps/sim/tools/mailchimp/get_campaigns.ts
+++ b/apps/sim/tools/mailchimp/get_campaigns.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaign,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaign } from './types'
-
-const logger = createLogger('MailchimpGetCampaigns')
 
 export interface MailchimpGetCampaignsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_interest.ts b/apps/sim/tools/mailchimp/get_interest.ts
index 53500d1781..6575c52a84 100644
--- a/apps/sim/tools/mailchimp/get_interest.ts
+++ b/apps/sim/tools/mailchimp/get_interest.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpInterest } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpInterest } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetInterest')
 
 export interface MailchimpGetInterestParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_interest_categories.ts b/apps/sim/tools/mailchimp/get_interest_categories.ts
index 9f9f23133f..065a6004bc 100644
--- a/apps/sim/tools/mailchimp/get_interest_categories.ts
+++ b/apps/sim/tools/mailchimp/get_interest_categories.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetInterestCategories')
 
 export interface MailchimpGetInterestCategoriesParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_interest_category.ts b/apps/sim/tools/mailchimp/get_interest_category.ts
index a2277434fa..8f0bb113a2 100644
--- a/apps/sim/tools/mailchimp/get_interest_category.ts
+++ b/apps/sim/tools/mailchimp/get_interest_category.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpInterestCategory } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpInterestCategory } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetInterestCategory')
 
 export interface MailchimpGetInterestCategoryParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_interests.ts b/apps/sim/tools/mailchimp/get_interests.ts
index 7e0f8d5a48..6b7d24e9cb 100644
--- a/apps/sim/tools/mailchimp/get_interests.ts
+++ b/apps/sim/tools/mailchimp/get_interests.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetInterests')
 
 export interface MailchimpGetInterestsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_landing_page.ts b/apps/sim/tools/mailchimp/get_landing_page.ts
index 4b4f3a2ad4..69ccf3ae85 100644
--- a/apps/sim/tools/mailchimp/get_landing_page.ts
+++ b/apps/sim/tools/mailchimp/get_landing_page.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpLandingPage } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpLandingPage } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetLandingPage')
 
 export interface MailchimpGetLandingPageParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_landing_pages.ts b/apps/sim/tools/mailchimp/get_landing_pages.ts
index ccc777bba7..cc78640ebb 100644
--- a/apps/sim/tools/mailchimp/get_landing_pages.ts
+++ b/apps/sim/tools/mailchimp/get_landing_pages.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpLandingPage } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpLandingPage } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetLandingPages')
 
 export interface MailchimpGetLandingPagesParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_member.ts b/apps/sim/tools/mailchimp/get_member.ts
index dd886f6b16..109c919988 100644
--- a/apps/sim/tools/mailchimp/get_member.ts
+++ b/apps/sim/tools/mailchimp/get_member.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
-
-const logger = createLogger('MailchimpGetMember')
 
 export interface MailchimpGetMemberParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_member_tags.ts b/apps/sim/tools/mailchimp/get_member_tags.ts
index 93966daf32..9200dfb8ad 100644
--- a/apps/sim/tools/mailchimp/get_member_tags.ts
+++ b/apps/sim/tools/mailchimp/get_member_tags.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError, type MailchimpTag } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpTag } from './types'
-
-const logger = createLogger('MailchimpGetMemberTags')
 
 export interface MailchimpGetMemberTagsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_members.ts b/apps/sim/tools/mailchimp/get_members.ts
index 259531f416..cca72070a8 100644
--- a/apps/sim/tools/mailchimp/get_members.ts
+++ b/apps/sim/tools/mailchimp/get_members.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
-
-const logger = createLogger('MailchimpGetMembers')
 
 export interface MailchimpGetMembersParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_merge_field.ts b/apps/sim/tools/mailchimp/get_merge_field.ts
index fc4b12dfc7..f9d1cde00e 100644
--- a/apps/sim/tools/mailchimp/get_merge_field.ts
+++ b/apps/sim/tools/mailchimp/get_merge_field.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetMergeField')
 
 export interface MailchimpGetMergeFieldParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_merge_fields.ts b/apps/sim/tools/mailchimp/get_merge_fields.ts
index 479ffd832c..50af837d92 100644
--- a/apps/sim/tools/mailchimp/get_merge_fields.ts
+++ b/apps/sim/tools/mailchimp/get_merge_fields.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpMergeField } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpMergeField } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetMergeFields')
 
 export interface MailchimpGetMergeFieldsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_segment.ts b/apps/sim/tools/mailchimp/get_segment.ts
index 2917da26a7..a1123d491f 100644
--- a/apps/sim/tools/mailchimp/get_segment.ts
+++ b/apps/sim/tools/mailchimp/get_segment.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpSegment } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpSegment } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetSegment')
 
 export interface MailchimpGetSegmentParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_segment_members.ts b/apps/sim/tools/mailchimp/get_segment_members.ts
index ea215401b9..7b8146bf1b 100644
--- a/apps/sim/tools/mailchimp/get_segment_members.ts
+++ b/apps/sim/tools/mailchimp/get_segment_members.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpMember } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpMember } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetSegmentMembers')
 
 export interface MailchimpGetSegmentMembersParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_segments.ts b/apps/sim/tools/mailchimp/get_segments.ts
index d2aef507d8..5288697fdf 100644
--- a/apps/sim/tools/mailchimp/get_segments.ts
+++ b/apps/sim/tools/mailchimp/get_segments.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetSegments')
 
 export interface MailchimpGetSegmentsParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_template.ts b/apps/sim/tools/mailchimp/get_template.ts
index 4a11ee5c37..54bc4f265b 100644
--- a/apps/sim/tools/mailchimp/get_template.ts
+++ b/apps/sim/tools/mailchimp/get_template.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpTemplate } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpTemplate } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetTemplate')
 
 export interface MailchimpGetTemplateParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/get_templates.ts b/apps/sim/tools/mailchimp/get_templates.ts
index 9b23a71ec0..ed4005e79f 100644
--- a/apps/sim/tools/mailchimp/get_templates.ts
+++ b/apps/sim/tools/mailchimp/get_templates.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
+import type { MailchimpTemplate } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpTemplate } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
-
-const logger = createLogger('MailchimpGetTemplates')
 
 export interface MailchimpGetTemplatesParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/pause_automation.ts b/apps/sim/tools/mailchimp/pause_automation.ts
index fb506bf80d..ba45a28ac5 100644
--- a/apps/sim/tools/mailchimp/pause_automation.ts
+++ b/apps/sim/tools/mailchimp/pause_automation.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpPauseAutomationParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/publish_landing_page.ts b/apps/sim/tools/mailchimp/publish_landing_page.ts
index bfb881cb44..5d952f8b43 100644
--- a/apps/sim/tools/mailchimp/publish_landing_page.ts
+++ b/apps/sim/tools/mailchimp/publish_landing_page.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpPublishLandingPageParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/remove_member_tags.ts b/apps/sim/tools/mailchimp/remove_member_tags.ts
index 433cd6aeb0..152baa9f30 100644
--- a/apps/sim/tools/mailchimp/remove_member_tags.ts
+++ b/apps/sim/tools/mailchimp/remove_member_tags.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpRemoveMemberTags')
 
diff --git a/apps/sim/tools/mailchimp/remove_segment_member.ts b/apps/sim/tools/mailchimp/remove_segment_member.ts
index b053be8879..d54cfc78b1 100644
--- a/apps/sim/tools/mailchimp/remove_segment_member.ts
+++ b/apps/sim/tools/mailchimp/remove_segment_member.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpRemoveSegmentMemberParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/replicate_campaign.ts b/apps/sim/tools/mailchimp/replicate_campaign.ts
index 2dd9a95b3e..f03ce4b860 100644
--- a/apps/sim/tools/mailchimp/replicate_campaign.ts
+++ b/apps/sim/tools/mailchimp/replicate_campaign.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpReplicateCampaignParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/schedule_campaign.ts b/apps/sim/tools/mailchimp/schedule_campaign.ts
index 13b5c67501..b2bb8cfc3a 100644
--- a/apps/sim/tools/mailchimp/schedule_campaign.ts
+++ b/apps/sim/tools/mailchimp/schedule_campaign.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpScheduleCampaignParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/send_campaign.ts b/apps/sim/tools/mailchimp/send_campaign.ts
index fdc0a18040..264350ee2c 100644
--- a/apps/sim/tools/mailchimp/send_campaign.ts
+++ b/apps/sim/tools/mailchimp/send_campaign.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpSendCampaignParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/set_campaign_content.ts b/apps/sim/tools/mailchimp/set_campaign_content.ts
index 1c0b4b04ec..2ddde2a03a 100644
--- a/apps/sim/tools/mailchimp/set_campaign_content.ts
+++ b/apps/sim/tools/mailchimp/set_campaign_content.ts
@@ -1,5 +1,9 @@
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaignContent,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaignContent } from './types'
 
 export interface MailchimpSetCampaignContentParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/start_automation.ts b/apps/sim/tools/mailchimp/start_automation.ts
index 8d3226d4c6..dbb8829d45 100644
--- a/apps/sim/tools/mailchimp/start_automation.ts
+++ b/apps/sim/tools/mailchimp/start_automation.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpStartAutomationParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/unarchive_member.ts b/apps/sim/tools/mailchimp/unarchive_member.ts
index 62be61062c..e70ced5801 100644
--- a/apps/sim/tools/mailchimp/unarchive_member.ts
+++ b/apps/sim/tools/mailchimp/unarchive_member.ts
@@ -1,5 +1,9 @@
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
 
 export interface MailchimpUnarchiveMemberParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/unpublish_landing_page.ts b/apps/sim/tools/mailchimp/unpublish_landing_page.ts
index f4f6618d57..15e54ccfff 100644
--- a/apps/sim/tools/mailchimp/unpublish_landing_page.ts
+++ b/apps/sim/tools/mailchimp/unpublish_landing_page.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUnpublishLandingPageParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/unschedule_campaign.ts b/apps/sim/tools/mailchimp/unschedule_campaign.ts
index e305731ede..4a8aea1d51 100644
--- a/apps/sim/tools/mailchimp/unschedule_campaign.ts
+++ b/apps/sim/tools/mailchimp/unschedule_campaign.ts
@@ -1,5 +1,5 @@
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUnscheduleCampaignParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/update_audience.ts b/apps/sim/tools/mailchimp/update_audience.ts
index d14b4ad8eb..bf0ad8874f 100644
--- a/apps/sim/tools/mailchimp/update_audience.ts
+++ b/apps/sim/tools/mailchimp/update_audience.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
+import type { MailchimpAudience } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpAudience } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpUpdateAudience')
 
diff --git a/apps/sim/tools/mailchimp/update_campaign.ts b/apps/sim/tools/mailchimp/update_campaign.ts
index 6bf3835456..714f763793 100644
--- a/apps/sim/tools/mailchimp/update_campaign.ts
+++ b/apps/sim/tools/mailchimp/update_campaign.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpCampaign,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaign } from './types'
 
 const logger = createLogger('MailchimpUpdateCampaign')
 
diff --git a/apps/sim/tools/mailchimp/update_interest.ts b/apps/sim/tools/mailchimp/update_interest.ts
index ea28ea4041..1c1e22ca99 100644
--- a/apps/sim/tools/mailchimp/update_interest.ts
+++ b/apps/sim/tools/mailchimp/update_interest.ts
@@ -1,6 +1,6 @@
+import type { MailchimpInterest } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpInterest } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUpdateInterestParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/update_interest_category.ts b/apps/sim/tools/mailchimp/update_interest_category.ts
index 673b409687..de59041741 100644
--- a/apps/sim/tools/mailchimp/update_interest_category.ts
+++ b/apps/sim/tools/mailchimp/update_interest_category.ts
@@ -1,6 +1,6 @@
+import type { MailchimpInterestCategory } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpInterestCategory } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUpdateInterestCategoryParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/update_landing_page.ts b/apps/sim/tools/mailchimp/update_landing_page.ts
index ceb54f9369..76d4fbd56a 100644
--- a/apps/sim/tools/mailchimp/update_landing_page.ts
+++ b/apps/sim/tools/mailchimp/update_landing_page.ts
@@ -1,6 +1,6 @@
+import type { MailchimpLandingPage } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpLandingPage } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUpdateLandingPageParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/update_member.ts b/apps/sim/tools/mailchimp/update_member.ts
index eba1d493d1..c6f1925f26 100644
--- a/apps/sim/tools/mailchimp/update_member.ts
+++ b/apps/sim/tools/mailchimp/update_member.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
+import {
+  buildMailchimpUrl,
+  handleMailchimpError,
+  type MailchimpMember,
+} from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
 
 const logger = createLogger('MailchimpUpdateMember')
 
diff --git a/apps/sim/tools/mailchimp/update_merge_field.ts b/apps/sim/tools/mailchimp/update_merge_field.ts
index 7a754f071b..c52b3c46bb 100644
--- a/apps/sim/tools/mailchimp/update_merge_field.ts
+++ b/apps/sim/tools/mailchimp/update_merge_field.ts
@@ -1,6 +1,6 @@
+import type { MailchimpMergeField } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpMergeField } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUpdateMergeFieldParams {
   apiKey: string
diff --git a/apps/sim/tools/mailchimp/update_segment.ts b/apps/sim/tools/mailchimp/update_segment.ts
index 04bf671c10..adaecf6d7b 100644
--- a/apps/sim/tools/mailchimp/update_segment.ts
+++ b/apps/sim/tools/mailchimp/update_segment.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
+import type { MailchimpSegment } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpSegment } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 const logger = createLogger('MailchimpUpdateSegment')
 
diff --git a/apps/sim/tools/mailchimp/update_template.ts b/apps/sim/tools/mailchimp/update_template.ts
index 6ccc33a76d..f489ffdd28 100644
--- a/apps/sim/tools/mailchimp/update_template.ts
+++ b/apps/sim/tools/mailchimp/update_template.ts
@@ -1,6 +1,6 @@
+import type { MailchimpTemplate } from '@/tools/mailchimp/types'
+import { buildMailchimpUrl, handleMailchimpError } from '@/tools/mailchimp/types'
 import type { ToolConfig } from '@/tools/types'
-import type { MailchimpTemplate } from './types'
-import { buildMailchimpUrl, handleMailchimpError } from './types'
 
 export interface MailchimpUpdateTemplateParams {
   apiKey: string
diff --git a/apps/sim/tools/search/tool.ts b/apps/sim/tools/search/tool.ts
index 4f6f9e3a54..c57410b46b 100644
--- a/apps/sim/tools/search/tool.ts
+++ b/apps/sim/tools/search/tool.ts
@@ -1,5 +1,5 @@
+import type { SearchParams, SearchResponse } from '@/tools/search/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SearchParams, SearchResponse } from './types'
 
 export const searchTool: ToolConfig<SearchParams, SearchResponse> = {
   id: 'search_tool',
diff --git a/apps/sim/tools/shopify/adjust_inventory.ts b/apps/sim/tools/shopify/adjust_inventory.ts
index 015b0cd07f..a373406ad6 100644
--- a/apps/sim/tools/shopify/adjust_inventory.ts
+++ b/apps/sim/tools/shopify/adjust_inventory.ts
@@ -1,6 +1,6 @@
+import type { ShopifyAdjustInventoryParams, ShopifyInventoryResponse } from '@/tools/shopify/types'
+import { INVENTORY_ADJUSTMENT_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyAdjustInventoryParams, ShopifyInventoryResponse } from './types'
-import { INVENTORY_ADJUSTMENT_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyAdjustInventoryTool: ToolConfig<
   ShopifyAdjustInventoryParams,
diff --git a/apps/sim/tools/shopify/cancel_order.ts b/apps/sim/tools/shopify/cancel_order.ts
index 4da57e2393..775eefe5f4 100644
--- a/apps/sim/tools/shopify/cancel_order.ts
+++ b/apps/sim/tools/shopify/cancel_order.ts
@@ -1,6 +1,6 @@
+import type { ShopifyCancelOrderParams, ShopifyOrderResponse } from '@/tools/shopify/types'
+import { CANCEL_ORDER_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyCancelOrderParams, ShopifyOrderResponse } from './types'
-import { CANCEL_ORDER_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyCancelOrderTool: ToolConfig<ShopifyCancelOrderParams, ShopifyOrderResponse> = {
   id: 'shopify_cancel_order',
diff --git a/apps/sim/tools/shopify/create_customer.ts b/apps/sim/tools/shopify/create_customer.ts
index 063c600e5a..fac5bc1704 100644
--- a/apps/sim/tools/shopify/create_customer.ts
+++ b/apps/sim/tools/shopify/create_customer.ts
@@ -1,6 +1,6 @@
+import type { ShopifyCreateCustomerParams, ShopifyCustomerResponse } from '@/tools/shopify/types'
+import { CUSTOMER_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyCreateCustomerParams, ShopifyCustomerResponse } from './types'
-import { CUSTOMER_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyCreateCustomerTool: ToolConfig<
   ShopifyCreateCustomerParams,
diff --git a/apps/sim/tools/shopify/create_fulfillment.ts b/apps/sim/tools/shopify/create_fulfillment.ts
index 0223ad28fb..d68872c2a5 100644
--- a/apps/sim/tools/shopify/create_fulfillment.ts
+++ b/apps/sim/tools/shopify/create_fulfillment.ts
@@ -1,6 +1,6 @@
+import type { ShopifyBaseParams } from '@/tools/shopify/types'
+import { FULFILLMENT_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import type { ShopifyBaseParams } from './types'
-import { FULFILLMENT_OUTPUT_PROPERTIES } from './types'
 
 interface ShopifyCreateFulfillmentParams extends ShopifyBaseParams {
   fulfillmentOrderId: string
diff --git a/apps/sim/tools/shopify/create_product.ts b/apps/sim/tools/shopify/create_product.ts
index 9b3cbc2a15..a3b5855f53 100644
--- a/apps/sim/tools/shopify/create_product.ts
+++ b/apps/sim/tools/shopify/create_product.ts
@@ -1,6 +1,6 @@
+import type { ShopifyCreateProductParams, ShopifyProductResponse } from '@/tools/shopify/types'
+import { PRODUCT_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyCreateProductParams, ShopifyProductResponse } from './types'
-import { PRODUCT_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyCreateProductTool: ToolConfig<
   ShopifyCreateProductParams,
diff --git a/apps/sim/tools/shopify/delete_customer.ts b/apps/sim/tools/shopify/delete_customer.ts
index 994a26326d..06dfb072c4 100644
--- a/apps/sim/tools/shopify/delete_customer.ts
+++ b/apps/sim/tools/shopify/delete_customer.ts
@@ -1,5 +1,5 @@
+import type { ShopifyDeleteCustomerParams, ShopifyDeleteResponse } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyDeleteCustomerParams, ShopifyDeleteResponse } from './types'
 
 export const shopifyDeleteCustomerTool: ToolConfig<
   ShopifyDeleteCustomerParams,
diff --git a/apps/sim/tools/shopify/delete_product.ts b/apps/sim/tools/shopify/delete_product.ts
index 7b0bfed161..c00f46ab69 100644
--- a/apps/sim/tools/shopify/delete_product.ts
+++ b/apps/sim/tools/shopify/delete_product.ts
@@ -1,5 +1,5 @@
+import type { ShopifyDeleteProductParams, ShopifyDeleteResponse } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyDeleteProductParams, ShopifyDeleteResponse } from './types'
 
 export const shopifyDeleteProductTool: ToolConfig<
   ShopifyDeleteProductParams,
diff --git a/apps/sim/tools/shopify/get_collection.ts b/apps/sim/tools/shopify/get_collection.ts
index b845f587aa..c1e506838e 100644
--- a/apps/sim/tools/shopify/get_collection.ts
+++ b/apps/sim/tools/shopify/get_collection.ts
@@ -1,6 +1,6 @@
+import type { ShopifyBaseParams } from '@/tools/shopify/types'
+import { COLLECTION_WITH_PRODUCTS_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import type { ShopifyBaseParams } from './types'
-import { COLLECTION_WITH_PRODUCTS_OUTPUT_PROPERTIES } from './types'
 
 interface ShopifyGetCollectionParams extends ShopifyBaseParams {
   collectionId: string
diff --git a/apps/sim/tools/shopify/get_customer.ts b/apps/sim/tools/shopify/get_customer.ts
index e9a4ea07c2..ef83449d19 100644
--- a/apps/sim/tools/shopify/get_customer.ts
+++ b/apps/sim/tools/shopify/get_customer.ts
@@ -1,6 +1,6 @@
+import type { ShopifyCustomerResponse, ShopifyGetCustomerParams } from '@/tools/shopify/types'
+import { CUSTOMER_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyCustomerResponse, ShopifyGetCustomerParams } from './types'
-import { CUSTOMER_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyGetCustomerTool: ToolConfig<ShopifyGetCustomerParams, ShopifyCustomerResponse> =
   {
diff --git a/apps/sim/tools/shopify/get_inventory_level.ts b/apps/sim/tools/shopify/get_inventory_level.ts
index c9a8a959be..cf0a7d01e6 100644
--- a/apps/sim/tools/shopify/get_inventory_level.ts
+++ b/apps/sim/tools/shopify/get_inventory_level.ts
@@ -1,6 +1,9 @@
+import type {
+  ShopifyGetInventoryLevelParams,
+  ShopifyInventoryResponse,
+} from '@/tools/shopify/types'
+import { INVENTORY_LEVEL_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyGetInventoryLevelParams, ShopifyInventoryResponse } from './types'
-import { INVENTORY_LEVEL_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyGetInventoryLevelTool: ToolConfig<
   ShopifyGetInventoryLevelParams,
diff --git a/apps/sim/tools/shopify/get_order.ts b/apps/sim/tools/shopify/get_order.ts
index 5925aacbf4..93b552c6b3 100644
--- a/apps/sim/tools/shopify/get_order.ts
+++ b/apps/sim/tools/shopify/get_order.ts
@@ -1,6 +1,6 @@
+import type { ShopifyGetOrderParams, ShopifyOrderResponse } from '@/tools/shopify/types'
+import { ORDER_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyGetOrderParams, ShopifyOrderResponse } from './types'
-import { ORDER_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyGetOrderTool: ToolConfig<ShopifyGetOrderParams, ShopifyOrderResponse> = {
   id: 'shopify_get_order',
diff --git a/apps/sim/tools/shopify/get_product.ts b/apps/sim/tools/shopify/get_product.ts
index 9e19947e89..afe9be4949 100644
--- a/apps/sim/tools/shopify/get_product.ts
+++ b/apps/sim/tools/shopify/get_product.ts
@@ -1,6 +1,6 @@
+import type { ShopifyGetProductParams, ShopifyProductResponse } from '@/tools/shopify/types'
+import { PRODUCT_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyGetProductParams, ShopifyProductResponse } from './types'
-import { PRODUCT_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyGetProductTool: ToolConfig<ShopifyGetProductParams, ShopifyProductResponse> = {
   id: 'shopify_get_product',
diff --git a/apps/sim/tools/shopify/list_collections.ts b/apps/sim/tools/shopify/list_collections.ts
index 266e68bc76..55a791cc50 100644
--- a/apps/sim/tools/shopify/list_collections.ts
+++ b/apps/sim/tools/shopify/list_collections.ts
@@ -1,6 +1,6 @@
+import type { ShopifyBaseParams } from '@/tools/shopify/types'
+import { COLLECTION_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import type { ShopifyBaseParams } from './types'
-import { COLLECTION_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from './types'
 
 interface ShopifyListCollectionsParams extends ShopifyBaseParams {
   first?: number
diff --git a/apps/sim/tools/shopify/list_customers.ts b/apps/sim/tools/shopify/list_customers.ts
index dd252b5ebf..09d160deeb 100644
--- a/apps/sim/tools/shopify/list_customers.ts
+++ b/apps/sim/tools/shopify/list_customers.ts
@@ -1,6 +1,6 @@
+import type { ShopifyCustomersResponse, ShopifyListCustomersParams } from '@/tools/shopify/types'
+import { CUSTOMER_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyCustomersResponse, ShopifyListCustomersParams } from './types'
-import { CUSTOMER_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyListCustomersTool: ToolConfig<
   ShopifyListCustomersParams,
diff --git a/apps/sim/tools/shopify/list_inventory_items.ts b/apps/sim/tools/shopify/list_inventory_items.ts
index 7afa79f71a..9e4a33dc00 100644
--- a/apps/sim/tools/shopify/list_inventory_items.ts
+++ b/apps/sim/tools/shopify/list_inventory_items.ts
@@ -1,6 +1,9 @@
+import type { ShopifyBaseParams } from '@/tools/shopify/types'
+import {
+  INVENTORY_ITEM_OUTPUT_PROPERTIES,
+  PAGE_INFO_OUTPUT_PROPERTIES,
+} from '@/tools/shopify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import type { ShopifyBaseParams } from './types'
-import { INVENTORY_ITEM_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from './types'
 
 interface ShopifyListInventoryItemsParams extends ShopifyBaseParams {
   first?: number
diff --git a/apps/sim/tools/shopify/list_locations.ts b/apps/sim/tools/shopify/list_locations.ts
index edddd7ee3e..dd12e9b3ff 100644
--- a/apps/sim/tools/shopify/list_locations.ts
+++ b/apps/sim/tools/shopify/list_locations.ts
@@ -1,6 +1,6 @@
+import type { ShopifyBaseParams } from '@/tools/shopify/types'
+import { LOCATION_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import type { ShopifyBaseParams } from './types'
-import { LOCATION_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from './types'
 
 interface ShopifyListLocationsParams extends ShopifyBaseParams {
   first?: number
diff --git a/apps/sim/tools/shopify/list_orders.ts b/apps/sim/tools/shopify/list_orders.ts
index f20fe9da0c..1e78c4a7ae 100644
--- a/apps/sim/tools/shopify/list_orders.ts
+++ b/apps/sim/tools/shopify/list_orders.ts
@@ -1,6 +1,6 @@
+import type { ShopifyListOrdersParams, ShopifyOrdersResponse } from '@/tools/shopify/types'
+import { ORDER_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyListOrdersParams, ShopifyOrdersResponse } from './types'
-import { ORDER_OUTPUT_PROPERTIES, PAGE_INFO_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyListOrdersTool: ToolConfig<ShopifyListOrdersParams, ShopifyOrdersResponse> = {
   id: 'shopify_list_orders',
diff --git a/apps/sim/tools/shopify/list_products.ts b/apps/sim/tools/shopify/list_products.ts
index a8f284e076..3903f9df07 100644
--- a/apps/sim/tools/shopify/list_products.ts
+++ b/apps/sim/tools/shopify/list_products.ts
@@ -1,6 +1,6 @@
+import type { ShopifyListProductsParams, ShopifyProductsResponse } from '@/tools/shopify/types'
+import { PAGE_INFO_OUTPUT_PROPERTIES, PRODUCT_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyListProductsParams, ShopifyProductsResponse } from './types'
-import { PAGE_INFO_OUTPUT_PROPERTIES, PRODUCT_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyListProductsTool: ToolConfig<
   ShopifyListProductsParams,
diff --git a/apps/sim/tools/shopify/update_customer.ts b/apps/sim/tools/shopify/update_customer.ts
index 49d0330bdf..e44b2ea7a9 100644
--- a/apps/sim/tools/shopify/update_customer.ts
+++ b/apps/sim/tools/shopify/update_customer.ts
@@ -1,6 +1,6 @@
+import type { ShopifyCustomerResponse, ShopifyUpdateCustomerParams } from '@/tools/shopify/types'
+import { CUSTOMER_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyCustomerResponse, ShopifyUpdateCustomerParams } from './types'
-import { CUSTOMER_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyUpdateCustomerTool: ToolConfig<
   ShopifyUpdateCustomerParams,
diff --git a/apps/sim/tools/shopify/update_order.ts b/apps/sim/tools/shopify/update_order.ts
index 72daee54f4..1d161722e1 100644
--- a/apps/sim/tools/shopify/update_order.ts
+++ b/apps/sim/tools/shopify/update_order.ts
@@ -1,6 +1,6 @@
+import type { ShopifyOrderResponse, ShopifyUpdateOrderParams } from '@/tools/shopify/types'
+import { ORDER_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyOrderResponse, ShopifyUpdateOrderParams } from './types'
-import { ORDER_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyUpdateOrderTool: ToolConfig<ShopifyUpdateOrderParams, ShopifyOrderResponse> = {
   id: 'shopify_update_order',
diff --git a/apps/sim/tools/shopify/update_product.ts b/apps/sim/tools/shopify/update_product.ts
index 07fd3bb23b..8554158bad 100644
--- a/apps/sim/tools/shopify/update_product.ts
+++ b/apps/sim/tools/shopify/update_product.ts
@@ -1,6 +1,6 @@
+import type { ShopifyProductResponse, ShopifyUpdateProductParams } from '@/tools/shopify/types'
+import { PRODUCT_OUTPUT_PROPERTIES } from '@/tools/shopify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ShopifyProductResponse, ShopifyUpdateProductParams } from './types'
-import { PRODUCT_OUTPUT_PROPERTIES } from './types'
 
 export const shopifyUpdateProductTool: ToolConfig<
   ShopifyUpdateProductParams,
diff --git a/apps/sim/tools/similarweb/bounce_rate.ts b/apps/sim/tools/similarweb/bounce_rate.ts
index d31a476d2f..08802ab7f2 100644
--- a/apps/sim/tools/similarweb/bounce_rate.ts
+++ b/apps/sim/tools/similarweb/bounce_rate.ts
@@ -1,5 +1,8 @@
+import type {
+  SimilarwebBounceRateParams,
+  SimilarwebBounceRateResponse,
+} from '@/tools/similarweb/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SimilarwebBounceRateParams, SimilarwebBounceRateResponse } from './types'
 
 export const similarwebBounceRateTool: ToolConfig<
   SimilarwebBounceRateParams,
diff --git a/apps/sim/tools/similarweb/pages_per_visit.ts b/apps/sim/tools/similarweb/pages_per_visit.ts
index c60c292f10..f0abe616e2 100644
--- a/apps/sim/tools/similarweb/pages_per_visit.ts
+++ b/apps/sim/tools/similarweb/pages_per_visit.ts
@@ -1,5 +1,8 @@
+import type {
+  SimilarwebPagesPerVisitParams,
+  SimilarwebPagesPerVisitResponse,
+} from '@/tools/similarweb/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SimilarwebPagesPerVisitParams, SimilarwebPagesPerVisitResponse } from './types'
 
 export const similarwebPagesPerVisitTool: ToolConfig<
   SimilarwebPagesPerVisitParams,
diff --git a/apps/sim/tools/similarweb/traffic_visits.ts b/apps/sim/tools/similarweb/traffic_visits.ts
index a934399df2..6433d333c4 100644
--- a/apps/sim/tools/similarweb/traffic_visits.ts
+++ b/apps/sim/tools/similarweb/traffic_visits.ts
@@ -1,5 +1,8 @@
+import type {
+  SimilarwebTrafficVisitsParams,
+  SimilarwebTrafficVisitsResponse,
+} from '@/tools/similarweb/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SimilarwebTrafficVisitsParams, SimilarwebTrafficVisitsResponse } from './types'
 
 export const similarwebTrafficVisitsTool: ToolConfig<
   SimilarwebTrafficVisitsParams,
diff --git a/apps/sim/tools/similarweb/visit_duration.ts b/apps/sim/tools/similarweb/visit_duration.ts
index 765ff439db..565f5922eb 100644
--- a/apps/sim/tools/similarweb/visit_duration.ts
+++ b/apps/sim/tools/similarweb/visit_duration.ts
@@ -1,5 +1,8 @@
+import type {
+  SimilarwebVisitDurationParams,
+  SimilarwebVisitDurationResponse,
+} from '@/tools/similarweb/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SimilarwebVisitDurationParams, SimilarwebVisitDurationResponse } from './types'
 
 export const similarwebVisitDurationTool: ToolConfig<
   SimilarwebVisitDurationParams,
diff --git a/apps/sim/tools/similarweb/website_overview.ts b/apps/sim/tools/similarweb/website_overview.ts
index 70945928e0..0c81aa4b79 100644
--- a/apps/sim/tools/similarweb/website_overview.ts
+++ b/apps/sim/tools/similarweb/website_overview.ts
@@ -1,5 +1,8 @@
+import type {
+  SimilarwebWebsiteOverviewParams,
+  SimilarwebWebsiteOverviewResponse,
+} from '@/tools/similarweb/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SimilarwebWebsiteOverviewParams, SimilarwebWebsiteOverviewResponse } from './types'
 
 export const similarwebWebsiteOverviewTool: ToolConfig<
   SimilarwebWebsiteOverviewParams,
diff --git a/apps/sim/tools/spotify/add_to_queue.ts b/apps/sim/tools/spotify/add_to_queue.ts
index 7753fe1231..9139830b69 100644
--- a/apps/sim/tools/spotify/add_to_queue.ts
+++ b/apps/sim/tools/spotify/add_to_queue.ts
@@ -1,5 +1,5 @@
+import type { SpotifyAddToQueueParams, SpotifyAddToQueueResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyAddToQueueParams, SpotifyAddToQueueResponse } from './types'
 
 export const spotifyAddToQueueTool: ToolConfig<SpotifyAddToQueueParams, SpotifyAddToQueueResponse> =
   {
diff --git a/apps/sim/tools/spotify/add_tracks_to_playlist.ts b/apps/sim/tools/spotify/add_tracks_to_playlist.ts
index 0fbd2a610f..8d1c9bee66 100644
--- a/apps/sim/tools/spotify/add_tracks_to_playlist.ts
+++ b/apps/sim/tools/spotify/add_tracks_to_playlist.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyAddTracksToPlaylistParams,
+  SpotifyAddTracksToPlaylistResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyAddTracksToPlaylistParams, SpotifyAddTracksToPlaylistResponse } from './types'
 
 export const spotifyAddTracksToPlaylistTool: ToolConfig<
   SpotifyAddTracksToPlaylistParams,
diff --git a/apps/sim/tools/spotify/check_saved_tracks.ts b/apps/sim/tools/spotify/check_saved_tracks.ts
index 0793d6e72a..f2d911a7c4 100644
--- a/apps/sim/tools/spotify/check_saved_tracks.ts
+++ b/apps/sim/tools/spotify/check_saved_tracks.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyCheckSavedTracksParams,
+  SpotifyCheckSavedTracksResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyCheckSavedTracksParams, SpotifyCheckSavedTracksResponse } from './types'
 
 export const spotifyCheckSavedTracksTool: ToolConfig<
   SpotifyCheckSavedTracksParams,
diff --git a/apps/sim/tools/spotify/create_playlist.ts b/apps/sim/tools/spotify/create_playlist.ts
index c28cc0d2ee..6c7a8ee2b3 100644
--- a/apps/sim/tools/spotify/create_playlist.ts
+++ b/apps/sim/tools/spotify/create_playlist.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyCreatePlaylistParams,
+  SpotifyCreatePlaylistResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyCreatePlaylistParams, SpotifyCreatePlaylistResponse } from './types'
 
 export const spotifyCreatePlaylistTool: ToolConfig<
   SpotifyCreatePlaylistParams,
diff --git a/apps/sim/tools/spotify/get_album.ts b/apps/sim/tools/spotify/get_album.ts
index a1cfbc3223..6d68893db7 100644
--- a/apps/sim/tools/spotify/get_album.ts
+++ b/apps/sim/tools/spotify/get_album.ts
@@ -1,9 +1,9 @@
-import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetAlbumParams, SpotifyGetAlbumResponse } from './types'
+import type { SpotifyGetAlbumParams, SpotifyGetAlbumResponse } from '@/tools/spotify/types'
 import {
   SIMPLIFIED_ALBUM_TRACK_OUTPUT_PROPERTIES,
   SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES,
-} from './types'
+} from '@/tools/spotify/types'
+import type { ToolConfig } from '@/tools/types'
 
 export const spotifyGetAlbumTool: ToolConfig<SpotifyGetAlbumParams, SpotifyGetAlbumResponse> = {
   id: 'spotify_get_album',
diff --git a/apps/sim/tools/spotify/get_album_tracks.ts b/apps/sim/tools/spotify/get_album_tracks.ts
index 611c8a2452..ae2cd49c66 100644
--- a/apps/sim/tools/spotify/get_album_tracks.ts
+++ b/apps/sim/tools/spotify/get_album_tracks.ts
@@ -1,5 +1,5 @@
+import { ALBUM_TRACK_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { ALBUM_TRACK_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetAlbumTracksParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_albums.ts b/apps/sim/tools/spotify/get_albums.ts
index 45c10a3713..ee220ef75d 100644
--- a/apps/sim/tools/spotify/get_albums.ts
+++ b/apps/sim/tools/spotify/get_albums.ts
@@ -1,5 +1,5 @@
+import { SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetAlbumsParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_artist.ts b/apps/sim/tools/spotify/get_artist.ts
index d8f223c7eb..b174b8d41f 100644
--- a/apps/sim/tools/spotify/get_artist.ts
+++ b/apps/sim/tools/spotify/get_artist.ts
@@ -1,5 +1,5 @@
+import type { SpotifyGetArtistParams, SpotifyGetArtistResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetArtistParams, SpotifyGetArtistResponse } from './types'
 
 export const spotifyGetArtistTool: ToolConfig<SpotifyGetArtistParams, SpotifyGetArtistResponse> = {
   id: 'spotify_get_artist',
diff --git a/apps/sim/tools/spotify/get_artist_albums.ts b/apps/sim/tools/spotify/get_artist_albums.ts
index 3498bfb957..d0cdc2a585 100644
--- a/apps/sim/tools/spotify/get_artist_albums.ts
+++ b/apps/sim/tools/spotify/get_artist_albums.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyGetArtistAlbumsParams,
+  SpotifyGetArtistAlbumsResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetArtistAlbumsParams, SpotifyGetArtistAlbumsResponse } from './types'
 
 export const spotifyGetArtistAlbumsTool: ToolConfig<
   SpotifyGetArtistAlbumsParams,
diff --git a/apps/sim/tools/spotify/get_artist_top_tracks.ts b/apps/sim/tools/spotify/get_artist_top_tracks.ts
index 56eaca524e..dc77999a03 100644
--- a/apps/sim/tools/spotify/get_artist_top_tracks.ts
+++ b/apps/sim/tools/spotify/get_artist_top_tracks.ts
@@ -1,6 +1,9 @@
+import type {
+  SpotifyGetArtistTopTracksParams,
+  SpotifyGetArtistTopTracksResponse,
+} from '@/tools/spotify/types'
+import { ARTIST_TOP_TRACK_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetArtistTopTracksParams, SpotifyGetArtistTopTracksResponse } from './types'
-import { ARTIST_TOP_TRACK_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetArtistTopTracksTool: ToolConfig<
   SpotifyGetArtistTopTracksParams,
diff --git a/apps/sim/tools/spotify/get_artists.ts b/apps/sim/tools/spotify/get_artists.ts
index cc050593a9..663be79a28 100644
--- a/apps/sim/tools/spotify/get_artists.ts
+++ b/apps/sim/tools/spotify/get_artists.ts
@@ -1,5 +1,5 @@
+import { ARTIST_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { ARTIST_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetArtistsParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_categories.ts b/apps/sim/tools/spotify/get_categories.ts
index 4a153e37a1..062b3c90ec 100644
--- a/apps/sim/tools/spotify/get_categories.ts
+++ b/apps/sim/tools/spotify/get_categories.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyGetCategoriesParams,
+  SpotifyGetCategoriesResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetCategoriesParams, SpotifyGetCategoriesResponse } from './types'
 
 export const spotifyGetCategoriesTool: ToolConfig<
   SpotifyGetCategoriesParams,
diff --git a/apps/sim/tools/spotify/get_current_user.ts b/apps/sim/tools/spotify/get_current_user.ts
index a9d95917fd..542aa3b902 100644
--- a/apps/sim/tools/spotify/get_current_user.ts
+++ b/apps/sim/tools/spotify/get_current_user.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyGetCurrentUserParams,
+  SpotifyGetCurrentUserResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetCurrentUserParams, SpotifyGetCurrentUserResponse } from './types'
 
 export const spotifyGetCurrentUserTool: ToolConfig<
   SpotifyGetCurrentUserParams,
diff --git a/apps/sim/tools/spotify/get_currently_playing.ts b/apps/sim/tools/spotify/get_currently_playing.ts
index 958a08e9b8..b5837be8c7 100644
--- a/apps/sim/tools/spotify/get_currently_playing.ts
+++ b/apps/sim/tools/spotify/get_currently_playing.ts
@@ -1,5 +1,5 @@
+import { CURRENTLY_PLAYING_TRACK_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { CURRENTLY_PLAYING_TRACK_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetCurrentlyPlayingParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_devices.ts b/apps/sim/tools/spotify/get_devices.ts
index ff8048a6d9..8134e56fe0 100644
--- a/apps/sim/tools/spotify/get_devices.ts
+++ b/apps/sim/tools/spotify/get_devices.ts
@@ -1,5 +1,5 @@
+import type { SpotifyGetDevicesParams, SpotifyGetDevicesResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetDevicesParams, SpotifyGetDevicesResponse } from './types'
 
 export const spotifyGetDevicesTool: ToolConfig<SpotifyGetDevicesParams, SpotifyGetDevicesResponse> =
   {
diff --git a/apps/sim/tools/spotify/get_followed_artists.ts b/apps/sim/tools/spotify/get_followed_artists.ts
index a6b6ca2df8..0b480f641d 100644
--- a/apps/sim/tools/spotify/get_followed_artists.ts
+++ b/apps/sim/tools/spotify/get_followed_artists.ts
@@ -1,5 +1,5 @@
+import { ARTIST_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { ARTIST_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetFollowedArtistsParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_new_releases.ts b/apps/sim/tools/spotify/get_new_releases.ts
index 2b4d10b03f..6e3b8e6e9d 100644
--- a/apps/sim/tools/spotify/get_new_releases.ts
+++ b/apps/sim/tools/spotify/get_new_releases.ts
@@ -1,6 +1,9 @@
+import type {
+  SpotifyGetNewReleasesParams,
+  SpotifyGetNewReleasesResponse,
+} from '@/tools/spotify/types'
+import { ALBUM_WITH_ARTISTS_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetNewReleasesParams, SpotifyGetNewReleasesResponse } from './types'
-import { ALBUM_WITH_ARTISTS_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetNewReleasesTool: ToolConfig<
   SpotifyGetNewReleasesParams,
diff --git a/apps/sim/tools/spotify/get_playback_state.ts b/apps/sim/tools/spotify/get_playback_state.ts
index b096e918b6..fe2b7f7719 100644
--- a/apps/sim/tools/spotify/get_playback_state.ts
+++ b/apps/sim/tools/spotify/get_playback_state.ts
@@ -1,6 +1,12 @@
+import type {
+  SpotifyGetPlaybackStateParams,
+  SpotifyGetPlaybackStateResponse,
+} from '@/tools/spotify/types'
+import {
+  PLAYBACK_TRACK_OUTPUT_PROPERTIES,
+  SIMPLIFIED_DEVICE_OUTPUT_PROPERTIES,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetPlaybackStateParams, SpotifyGetPlaybackStateResponse } from './types'
-import { PLAYBACK_TRACK_OUTPUT_PROPERTIES, SIMPLIFIED_DEVICE_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetPlaybackStateTool: ToolConfig<
   SpotifyGetPlaybackStateParams,
diff --git a/apps/sim/tools/spotify/get_playlist.ts b/apps/sim/tools/spotify/get_playlist.ts
index aaf23f42ac..045b80de24 100644
--- a/apps/sim/tools/spotify/get_playlist.ts
+++ b/apps/sim/tools/spotify/get_playlist.ts
@@ -1,6 +1,6 @@
+import type { SpotifyGetPlaylistParams, SpotifyGetPlaylistResponse } from '@/tools/spotify/types'
+import { PLAYLIST_OWNER_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetPlaylistParams, SpotifyGetPlaylistResponse } from './types'
-import { PLAYLIST_OWNER_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetPlaylistTool: ToolConfig<
   SpotifyGetPlaylistParams,
diff --git a/apps/sim/tools/spotify/get_playlist_tracks.ts b/apps/sim/tools/spotify/get_playlist_tracks.ts
index 8a90fb7f79..cad3abeb08 100644
--- a/apps/sim/tools/spotify/get_playlist_tracks.ts
+++ b/apps/sim/tools/spotify/get_playlist_tracks.ts
@@ -1,6 +1,9 @@
+import type {
+  SpotifyGetPlaylistTracksParams,
+  SpotifyGetPlaylistTracksResponse,
+} from '@/tools/spotify/types'
+import { TRACK_LIST_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetPlaylistTracksParams, SpotifyGetPlaylistTracksResponse } from './types'
-import { TRACK_LIST_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetPlaylistTracksTool: ToolConfig<
   SpotifyGetPlaylistTracksParams,
diff --git a/apps/sim/tools/spotify/get_queue.ts b/apps/sim/tools/spotify/get_queue.ts
index e77634e12c..f1ed1f6acb 100644
--- a/apps/sim/tools/spotify/get_queue.ts
+++ b/apps/sim/tools/spotify/get_queue.ts
@@ -1,5 +1,5 @@
+import { PLAYBACK_TRACK_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { PLAYBACK_TRACK_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetQueueParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_recently_played.ts b/apps/sim/tools/spotify/get_recently_played.ts
index 1c721a051c..c0c1cf822f 100644
--- a/apps/sim/tools/spotify/get_recently_played.ts
+++ b/apps/sim/tools/spotify/get_recently_played.ts
@@ -1,6 +1,9 @@
+import type {
+  SpotifyGetRecentlyPlayedParams,
+  SpotifyGetRecentlyPlayedResponse,
+} from '@/tools/spotify/types'
+import { CURRENTLY_PLAYING_TRACK_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetRecentlyPlayedParams, SpotifyGetRecentlyPlayedResponse } from './types'
-import { CURRENTLY_PLAYING_TRACK_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetRecentlyPlayedTool: ToolConfig<
   SpotifyGetRecentlyPlayedParams,
diff --git a/apps/sim/tools/spotify/get_saved_albums.ts b/apps/sim/tools/spotify/get_saved_albums.ts
index f0f694452e..9fa6a24ed1 100644
--- a/apps/sim/tools/spotify/get_saved_albums.ts
+++ b/apps/sim/tools/spotify/get_saved_albums.ts
@@ -1,5 +1,5 @@
+import { SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig, ToolResponse } from '@/tools/types'
-import { SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from './types'
 
 interface SpotifyGetSavedAlbumsParams {
   accessToken: string
diff --git a/apps/sim/tools/spotify/get_saved_tracks.ts b/apps/sim/tools/spotify/get_saved_tracks.ts
index e1a4534501..894a5e5d77 100644
--- a/apps/sim/tools/spotify/get_saved_tracks.ts
+++ b/apps/sim/tools/spotify/get_saved_tracks.ts
@@ -1,6 +1,9 @@
+import type {
+  SpotifyGetSavedTracksParams,
+  SpotifyGetSavedTracksResponse,
+} from '@/tools/spotify/types'
+import { TRACK_LIST_OUTPUT_PROPERTIES } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetSavedTracksParams, SpotifyGetSavedTracksResponse } from './types'
-import { TRACK_LIST_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetSavedTracksTool: ToolConfig<
   SpotifyGetSavedTracksParams,
diff --git a/apps/sim/tools/spotify/get_top_artists.ts b/apps/sim/tools/spotify/get_top_artists.ts
index 7c8d453f64..ce872944e0 100644
--- a/apps/sim/tools/spotify/get_top_artists.ts
+++ b/apps/sim/tools/spotify/get_top_artists.ts
@@ -1,5 +1,5 @@
+import type { SpotifyGetTopArtistsResponse, SpotifyGetTopItemsParams } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetTopArtistsResponse, SpotifyGetTopItemsParams } from './types'
 
 export const spotifyGetTopArtistsTool: ToolConfig<
   SpotifyGetTopItemsParams,
diff --git a/apps/sim/tools/spotify/get_top_tracks.ts b/apps/sim/tools/spotify/get_top_tracks.ts
index 1e35a3260d..1436be6920 100644
--- a/apps/sim/tools/spotify/get_top_tracks.ts
+++ b/apps/sim/tools/spotify/get_top_tracks.ts
@@ -1,6 +1,9 @@
+import type { SpotifyGetTopItemsParams, SpotifyGetTopTracksResponse } from '@/tools/spotify/types'
+import {
+  SIMPLIFIED_ALBUM_OUTPUT_PROPERTIES,
+  SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetTopItemsParams, SpotifyGetTopTracksResponse } from './types'
-import { SIMPLIFIED_ALBUM_OUTPUT_PROPERTIES, SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetTopTracksTool: ToolConfig<
   SpotifyGetTopItemsParams,
diff --git a/apps/sim/tools/spotify/get_track.ts b/apps/sim/tools/spotify/get_track.ts
index 122f59aeeb..3db51ff691 100644
--- a/apps/sim/tools/spotify/get_track.ts
+++ b/apps/sim/tools/spotify/get_track.ts
@@ -1,6 +1,9 @@
+import type { SpotifyGetTrackParams, SpotifyGetTrackResponse } from '@/tools/spotify/types'
+import {
+  SIMPLIFIED_ALBUM_OUTPUT_PROPERTIES,
+  SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetTrackParams, SpotifyGetTrackResponse } from './types'
-import { SIMPLIFIED_ALBUM_OUTPUT_PROPERTIES, SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetTrackTool: ToolConfig<SpotifyGetTrackParams, SpotifyGetTrackResponse> = {
   id: 'spotify_get_track',
diff --git a/apps/sim/tools/spotify/get_tracks.ts b/apps/sim/tools/spotify/get_tracks.ts
index 3a45c21956..8f73f28ddd 100644
--- a/apps/sim/tools/spotify/get_tracks.ts
+++ b/apps/sim/tools/spotify/get_tracks.ts
@@ -1,6 +1,9 @@
+import type { SpotifyGetTracksParams, SpotifyGetTracksResponse } from '@/tools/spotify/types'
+import {
+  SIMPLIFIED_ALBUM_OUTPUT_PROPERTIES,
+  SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetTracksParams, SpotifyGetTracksResponse } from './types'
-import { SIMPLIFIED_ALBUM_OUTPUT_PROPERTIES, SIMPLIFIED_ARTIST_OUTPUT_PROPERTIES } from './types'
 
 export const spotifyGetTracksTool: ToolConfig<SpotifyGetTracksParams, SpotifyGetTracksResponse> = {
   id: 'spotify_get_tracks',
diff --git a/apps/sim/tools/spotify/get_user_playlists.ts b/apps/sim/tools/spotify/get_user_playlists.ts
index f799e45077..4bba6d6845 100644
--- a/apps/sim/tools/spotify/get_user_playlists.ts
+++ b/apps/sim/tools/spotify/get_user_playlists.ts
@@ -1,5 +1,8 @@
+import type {
+  SpotifyGetUserPlaylistsParams,
+  SpotifyGetUserPlaylistsResponse,
+} from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyGetUserPlaylistsParams, SpotifyGetUserPlaylistsResponse } from './types'
 
 export const spotifyGetUserPlaylistsTool: ToolConfig<
   SpotifyGetUserPlaylistsParams,
diff --git a/apps/sim/tools/spotify/pause.ts b/apps/sim/tools/spotify/pause.ts
index 7bac7d5bb3..db82e950e4 100644
--- a/apps/sim/tools/spotify/pause.ts
+++ b/apps/sim/tools/spotify/pause.ts
@@ -1,5 +1,5 @@
+import type { SpotifyPauseParams, SpotifyPauseResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyPauseParams, SpotifyPauseResponse } from './types'
 
 export const spotifyPauseTool: ToolConfig<SpotifyPauseParams, SpotifyPauseResponse> = {
   id: 'spotify_pause',
diff --git a/apps/sim/tools/spotify/play.ts b/apps/sim/tools/spotify/play.ts
index 1b304be6a2..c693c9454d 100644
--- a/apps/sim/tools/spotify/play.ts
+++ b/apps/sim/tools/spotify/play.ts
@@ -1,5 +1,5 @@
+import type { SpotifyPlayParams, SpotifyPlayResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifyPlayParams, SpotifyPlayResponse } from './types'
 
 export const spotifyPlayTool: ToolConfig<SpotifyPlayParams, SpotifyPlayResponse> = {
   id: 'spotify_play',
diff --git a/apps/sim/tools/spotify/remove_tracks_from_playlist.ts b/apps/sim/tools/spotify/remove_tracks_from_playlist.ts
index 222413f59a..5454d03920 100644
--- a/apps/sim/tools/spotify/remove_tracks_from_playlist.ts
+++ b/apps/sim/tools/spotify/remove_tracks_from_playlist.ts
@@ -1,8 +1,8 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   SpotifyRemoveTracksFromPlaylistParams,
   SpotifyRemoveTracksFromPlaylistResponse,
-} from './types'
+} from '@/tools/spotify/types'
+import type { ToolConfig } from '@/tools/types'
 
 export const spotifyRemoveTracksFromPlaylistTool: ToolConfig<
   SpotifyRemoveTracksFromPlaylistParams,
diff --git a/apps/sim/tools/spotify/save_tracks.ts b/apps/sim/tools/spotify/save_tracks.ts
index f639720d2c..c7e0d64190 100644
--- a/apps/sim/tools/spotify/save_tracks.ts
+++ b/apps/sim/tools/spotify/save_tracks.ts
@@ -1,5 +1,5 @@
+import type { SpotifySaveTracksParams, SpotifySaveTracksResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifySaveTracksParams, SpotifySaveTracksResponse } from './types'
 
 export const spotifySaveTracksTool: ToolConfig<SpotifySaveTracksParams, SpotifySaveTracksResponse> =
   {
diff --git a/apps/sim/tools/spotify/search.ts b/apps/sim/tools/spotify/search.ts
index 56531dad3a..177c04dcae 100644
--- a/apps/sim/tools/spotify/search.ts
+++ b/apps/sim/tools/spotify/search.ts
@@ -1,11 +1,11 @@
-import type { ToolConfig } from '@/tools/types'
-import type { SpotifySearchParams, SpotifySearchResponse } from './types'
+import type { SpotifySearchParams, SpotifySearchResponse } from '@/tools/spotify/types'
 import {
   SEARCH_ALBUM_OUTPUT_PROPERTIES,
   SEARCH_ARTIST_OUTPUT_PROPERTIES,
   SEARCH_PLAYLIST_OUTPUT_PROPERTIES,
   SEARCH_TRACK_OUTPUT_PROPERTIES,
-} from './types'
+} from '@/tools/spotify/types'
+import type { ToolConfig } from '@/tools/types'
 
 export const spotifySearchTool: ToolConfig<SpotifySearchParams, SpotifySearchResponse> = {
   id: 'spotify_search',
diff --git a/apps/sim/tools/spotify/set_volume.ts b/apps/sim/tools/spotify/set_volume.ts
index 045426e5f8..dd82d8d915 100644
--- a/apps/sim/tools/spotify/set_volume.ts
+++ b/apps/sim/tools/spotify/set_volume.ts
@@ -1,5 +1,5 @@
+import type { SpotifySetVolumeParams, SpotifySetVolumeResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifySetVolumeParams, SpotifySetVolumeResponse } from './types'
 
 export const spotifySetVolumeTool: ToolConfig<SpotifySetVolumeParams, SpotifySetVolumeResponse> = {
   id: 'spotify_set_volume',
diff --git a/apps/sim/tools/spotify/skip_next.ts b/apps/sim/tools/spotify/skip_next.ts
index 21e4a7d3a0..1bdfa78ece 100644
--- a/apps/sim/tools/spotify/skip_next.ts
+++ b/apps/sim/tools/spotify/skip_next.ts
@@ -1,5 +1,5 @@
+import type { SpotifySkipNextParams, SpotifySkipNextResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifySkipNextParams, SpotifySkipNextResponse } from './types'
 
 export const spotifySkipNextTool: ToolConfig<SpotifySkipNextParams, SpotifySkipNextResponse> = {
   id: 'spotify_skip_next',
diff --git a/apps/sim/tools/spotify/skip_previous.ts b/apps/sim/tools/spotify/skip_previous.ts
index 4246765016..e4768a9e86 100644
--- a/apps/sim/tools/spotify/skip_previous.ts
+++ b/apps/sim/tools/spotify/skip_previous.ts
@@ -1,5 +1,5 @@
+import type { SpotifySkipPreviousParams, SpotifySkipPreviousResponse } from '@/tools/spotify/types'
 import type { ToolConfig } from '@/tools/types'
-import type { SpotifySkipPreviousParams, SpotifySkipPreviousResponse } from './types'
 
 export const spotifySkipPreviousTool: ToolConfig<
   SpotifySkipPreviousParams,
diff --git a/apps/sim/tools/stagehand/extract.ts b/apps/sim/tools/stagehand/extract.ts
index 9dca1c63b9..e31556bfba 100644
--- a/apps/sim/tools/stagehand/extract.ts
+++ b/apps/sim/tools/stagehand/extract.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { StagehandExtractParams, StagehandExtractResponse } from '@/tools/stagehand/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('StagehandExtractTool')
-
 export const extractTool: ToolConfig<StagehandExtractParams, StagehandExtractResponse> = {
   id: 'stagehand_extract',
   name: 'Stagehand Extract',
diff --git a/apps/sim/tools/typeform/insights.ts b/apps/sim/tools/typeform/insights.ts
index 288f7047b4..f5ea77249f 100644
--- a/apps/sim/tools/typeform/insights.ts
+++ b/apps/sim/tools/typeform/insights.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { TypeformInsightsParams, TypeformInsightsResponse } from '@/tools/typeform/types'
 import type { ToolConfig } from '@/tools/types'
 
-const logger = createLogger('TypeformInsightsTool')
-
 export const insightsTool: ToolConfig<TypeformInsightsParams, TypeformInsightsResponse> = {
   id: 'typeform_insights',
   name: 'Typeform Insights',
diff --git a/apps/sim/tools/wealthbox/read_contact.ts b/apps/sim/tools/wealthbox/read_contact.ts
index 7c25c8a121..60c62b1137 100644
--- a/apps/sim/tools/wealthbox/read_contact.ts
+++ b/apps/sim/tools/wealthbox/read_contact.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { WealthboxReadParams, WealthboxReadResponse } from '@/tools/wealthbox/types'
 
-const logger = createLogger('WealthboxReadContact')
-
 export const wealthboxReadContactTool: ToolConfig<WealthboxReadParams, WealthboxReadResponse> = {
   id: 'wealthbox_read_contact',
   name: 'Read Wealthbox Contact',
diff --git a/apps/sim/tools/wealthbox/read_note.ts b/apps/sim/tools/wealthbox/read_note.ts
index 49cc820035..8d97fb51c3 100644
--- a/apps/sim/tools/wealthbox/read_note.ts
+++ b/apps/sim/tools/wealthbox/read_note.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { WealthboxReadParams, WealthboxReadResponse } from '@/tools/wealthbox/types'
 
-const logger = createLogger('WealthboxReadNote')
-
 export const wealthboxReadNoteTool: ToolConfig<WealthboxReadParams, WealthboxReadResponse> = {
   id: 'wealthbox_read_note',
   name: 'Read Wealthbox Note',
diff --git a/apps/sim/tools/wordpress/create_category.ts b/apps/sim/tools/wordpress/create_category.ts
index ca8687a637..440223e7cd 100644
--- a/apps/sim/tools/wordpress/create_category.ts
+++ b/apps/sim/tools/wordpress/create_category.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressCreateCategoryParams,
   type WordPressCreateCategoryResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const createCategoryTool: ToolConfig<
   WordPressCreateCategoryParams,
diff --git a/apps/sim/tools/wordpress/create_comment.ts b/apps/sim/tools/wordpress/create_comment.ts
index 0c3bcd2a17..863c4ff410 100644
--- a/apps/sim/tools/wordpress/create_comment.ts
+++ b/apps/sim/tools/wordpress/create_comment.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressCreateCommentParams,
   type WordPressCreateCommentResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const createCommentTool: ToolConfig<
   WordPressCreateCommentParams,
diff --git a/apps/sim/tools/wordpress/create_page.ts b/apps/sim/tools/wordpress/create_page.ts
index 461d91e3b6..ff47df3114 100644
--- a/apps/sim/tools/wordpress/create_page.ts
+++ b/apps/sim/tools/wordpress/create_page.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressCreatePageParams,
   type WordPressCreatePageResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const createPageTool: ToolConfig<WordPressCreatePageParams, WordPressCreatePageResponse> = {
   id: 'wordpress_create_page',
diff --git a/apps/sim/tools/wordpress/create_post.ts b/apps/sim/tools/wordpress/create_post.ts
index 53f71f9252..293b1ed49c 100644
--- a/apps/sim/tools/wordpress/create_post.ts
+++ b/apps/sim/tools/wordpress/create_post.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressCreatePostParams,
   type WordPressCreatePostResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const createPostTool: ToolConfig<WordPressCreatePostParams, WordPressCreatePostResponse> = {
   id: 'wordpress_create_post',
diff --git a/apps/sim/tools/wordpress/create_tag.ts b/apps/sim/tools/wordpress/create_tag.ts
index 80c920d67f..de9a92a044 100644
--- a/apps/sim/tools/wordpress/create_tag.ts
+++ b/apps/sim/tools/wordpress/create_tag.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressCreateTagParams,
   type WordPressCreateTagResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const createTagTool: ToolConfig<WordPressCreateTagParams, WordPressCreateTagResponse> = {
   id: 'wordpress_create_tag',
diff --git a/apps/sim/tools/wordpress/delete_comment.ts b/apps/sim/tools/wordpress/delete_comment.ts
index 3cdc2a7664..fecbcd93c2 100644
--- a/apps/sim/tools/wordpress/delete_comment.ts
+++ b/apps/sim/tools/wordpress/delete_comment.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressDeleteCommentParams,
   type WordPressDeleteCommentResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const deleteCommentTool: ToolConfig<
   WordPressDeleteCommentParams,
diff --git a/apps/sim/tools/wordpress/delete_media.ts b/apps/sim/tools/wordpress/delete_media.ts
index cbb8afd84d..4b864bfed8 100644
--- a/apps/sim/tools/wordpress/delete_media.ts
+++ b/apps/sim/tools/wordpress/delete_media.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressDeleteMediaParams,
   type WordPressDeleteMediaResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const deleteMediaTool: ToolConfig<WordPressDeleteMediaParams, WordPressDeleteMediaResponse> =
   {
diff --git a/apps/sim/tools/wordpress/delete_page.ts b/apps/sim/tools/wordpress/delete_page.ts
index 9bba210512..a270a7f8aa 100644
--- a/apps/sim/tools/wordpress/delete_page.ts
+++ b/apps/sim/tools/wordpress/delete_page.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressDeletePageParams,
   type WordPressDeletePageResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const deletePageTool: ToolConfig<WordPressDeletePageParams, WordPressDeletePageResponse> = {
   id: 'wordpress_delete_page',
diff --git a/apps/sim/tools/wordpress/delete_post.ts b/apps/sim/tools/wordpress/delete_post.ts
index e31a8bdd2d..50c1d889ca 100644
--- a/apps/sim/tools/wordpress/delete_post.ts
+++ b/apps/sim/tools/wordpress/delete_post.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressDeletePostParams,
   type WordPressDeletePostResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const deletePostTool: ToolConfig<WordPressDeletePostParams, WordPressDeletePostResponse> = {
   id: 'wordpress_delete_post',
diff --git a/apps/sim/tools/wordpress/get_current_user.ts b/apps/sim/tools/wordpress/get_current_user.ts
index 3ff1bb0b03..9a71fb0f95 100644
--- a/apps/sim/tools/wordpress/get_current_user.ts
+++ b/apps/sim/tools/wordpress/get_current_user.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressGetCurrentUserParams,
   type WordPressGetCurrentUserResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const getCurrentUserTool: ToolConfig<
   WordPressGetCurrentUserParams,
diff --git a/apps/sim/tools/wordpress/get_media.ts b/apps/sim/tools/wordpress/get_media.ts
index 2da7af424e..363616e7a0 100644
--- a/apps/sim/tools/wordpress/get_media.ts
+++ b/apps/sim/tools/wordpress/get_media.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressGetMediaParams,
   type WordPressGetMediaResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const getMediaTool: ToolConfig<WordPressGetMediaParams, WordPressGetMediaResponse> = {
   id: 'wordpress_get_media',
diff --git a/apps/sim/tools/wordpress/get_page.ts b/apps/sim/tools/wordpress/get_page.ts
index 48e4d84b14..90102bd86b 100644
--- a/apps/sim/tools/wordpress/get_page.ts
+++ b/apps/sim/tools/wordpress/get_page.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressGetPageParams,
   type WordPressGetPageResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const getPageTool: ToolConfig<WordPressGetPageParams, WordPressGetPageResponse> = {
   id: 'wordpress_get_page',
diff --git a/apps/sim/tools/wordpress/get_post.ts b/apps/sim/tools/wordpress/get_post.ts
index 2f12c6eeb7..9b5ac58f08 100644
--- a/apps/sim/tools/wordpress/get_post.ts
+++ b/apps/sim/tools/wordpress/get_post.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressGetPostParams,
   type WordPressGetPostResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const getPostTool: ToolConfig<WordPressGetPostParams, WordPressGetPostResponse> = {
   id: 'wordpress_get_post',
diff --git a/apps/sim/tools/wordpress/get_user.ts b/apps/sim/tools/wordpress/get_user.ts
index f733bfb132..6adc38d827 100644
--- a/apps/sim/tools/wordpress/get_user.ts
+++ b/apps/sim/tools/wordpress/get_user.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressGetUserParams,
   type WordPressGetUserResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const getUserTool: ToolConfig<WordPressGetUserParams, WordPressGetUserResponse> = {
   id: 'wordpress_get_user',
diff --git a/apps/sim/tools/wordpress/list_categories.ts b/apps/sim/tools/wordpress/list_categories.ts
index 3cd76d8713..b01317aba8 100644
--- a/apps/sim/tools/wordpress/list_categories.ts
+++ b/apps/sim/tools/wordpress/list_categories.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListCategoriesParams,
   type WordPressListCategoriesResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listCategoriesTool: ToolConfig<
   WordPressListCategoriesParams,
diff --git a/apps/sim/tools/wordpress/list_comments.ts b/apps/sim/tools/wordpress/list_comments.ts
index efbef5b83b..8807b2dcc2 100644
--- a/apps/sim/tools/wordpress/list_comments.ts
+++ b/apps/sim/tools/wordpress/list_comments.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListCommentsParams,
   type WordPressListCommentsResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listCommentsTool: ToolConfig<
   WordPressListCommentsParams,
diff --git a/apps/sim/tools/wordpress/list_media.ts b/apps/sim/tools/wordpress/list_media.ts
index d794ee9fbd..5d42049133 100644
--- a/apps/sim/tools/wordpress/list_media.ts
+++ b/apps/sim/tools/wordpress/list_media.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListMediaParams,
   type WordPressListMediaResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listMediaTool: ToolConfig<WordPressListMediaParams, WordPressListMediaResponse> = {
   id: 'wordpress_list_media',
diff --git a/apps/sim/tools/wordpress/list_pages.ts b/apps/sim/tools/wordpress/list_pages.ts
index 09bc8da275..a9f866348f 100644
--- a/apps/sim/tools/wordpress/list_pages.ts
+++ b/apps/sim/tools/wordpress/list_pages.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListPagesParams,
   type WordPressListPagesResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listPagesTool: ToolConfig<WordPressListPagesParams, WordPressListPagesResponse> = {
   id: 'wordpress_list_pages',
diff --git a/apps/sim/tools/wordpress/list_posts.ts b/apps/sim/tools/wordpress/list_posts.ts
index ac02eca896..c0535b5bce 100644
--- a/apps/sim/tools/wordpress/list_posts.ts
+++ b/apps/sim/tools/wordpress/list_posts.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListPostsParams,
   type WordPressListPostsResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listPostsTool: ToolConfig<WordPressListPostsParams, WordPressListPostsResponse> = {
   id: 'wordpress_list_posts',
diff --git a/apps/sim/tools/wordpress/list_tags.ts b/apps/sim/tools/wordpress/list_tags.ts
index 91ba9717e2..8f1387f812 100644
--- a/apps/sim/tools/wordpress/list_tags.ts
+++ b/apps/sim/tools/wordpress/list_tags.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListTagsParams,
   type WordPressListTagsResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listTagsTool: ToolConfig<WordPressListTagsParams, WordPressListTagsResponse> = {
   id: 'wordpress_list_tags',
diff --git a/apps/sim/tools/wordpress/list_users.ts b/apps/sim/tools/wordpress/list_users.ts
index 982c86fe04..b4a2edd3b1 100644
--- a/apps/sim/tools/wordpress/list_users.ts
+++ b/apps/sim/tools/wordpress/list_users.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressListUsersParams,
   type WordPressListUsersResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const listUsersTool: ToolConfig<WordPressListUsersParams, WordPressListUsersResponse> = {
   id: 'wordpress_list_users',
diff --git a/apps/sim/tools/wordpress/search_content.ts b/apps/sim/tools/wordpress/search_content.ts
index f26d779097..31d4ce3645 100644
--- a/apps/sim/tools/wordpress/search_content.ts
+++ b/apps/sim/tools/wordpress/search_content.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressSearchContentParams,
   type WordPressSearchContentResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const searchContentTool: ToolConfig<
   WordPressSearchContentParams,
diff --git a/apps/sim/tools/wordpress/update_comment.ts b/apps/sim/tools/wordpress/update_comment.ts
index bda66c92ff..ab70496a7d 100644
--- a/apps/sim/tools/wordpress/update_comment.ts
+++ b/apps/sim/tools/wordpress/update_comment.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressUpdateCommentParams,
   type WordPressUpdateCommentResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const updateCommentTool: ToolConfig<
   WordPressUpdateCommentParams,
diff --git a/apps/sim/tools/wordpress/update_page.ts b/apps/sim/tools/wordpress/update_page.ts
index 48f3390f65..3bef7dcc15 100644
--- a/apps/sim/tools/wordpress/update_page.ts
+++ b/apps/sim/tools/wordpress/update_page.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressUpdatePageParams,
   type WordPressUpdatePageResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const updatePageTool: ToolConfig<WordPressUpdatePageParams, WordPressUpdatePageResponse> = {
   id: 'wordpress_update_page',
diff --git a/apps/sim/tools/wordpress/update_post.ts b/apps/sim/tools/wordpress/update_post.ts
index 050caf1036..28f69e09ce 100644
--- a/apps/sim/tools/wordpress/update_post.ts
+++ b/apps/sim/tools/wordpress/update_post.ts
@@ -3,7 +3,7 @@ import {
   WORDPRESS_COM_API_BASE,
   type WordPressUpdatePostParams,
   type WordPressUpdatePostResponse,
-} from './types'
+} from '@/tools/wordpress/types'
 
 export const updatePostTool: ToolConfig<WordPressUpdatePostParams, WordPressUpdatePostResponse> = {
   id: 'wordpress_update_post',
diff --git a/apps/sim/tools/wordpress/upload_media.ts b/apps/sim/tools/wordpress/upload_media.ts
index 92ee6972d8..bb67009b9a 100644
--- a/apps/sim/tools/wordpress/upload_media.ts
+++ b/apps/sim/tools/wordpress/upload_media.ts
@@ -1,8 +1,8 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import type { WordPressUploadMediaParams, WordPressUploadMediaResponse } from './types'
-
-const logger = createLogger('WordPressUploadMediaTool')
+import type {
+  WordPressUploadMediaParams,
+  WordPressUploadMediaResponse,
+} from '@/tools/wordpress/types'
 
 export const uploadMediaTool: ToolConfig<WordPressUploadMediaParams, WordPressUploadMediaResponse> =
   {
@@ -84,9 +84,6 @@ export const uploadMediaTool: ToolConfig<WordPressUploadMediaParams, WordPressUp
       const data = await response.json()
 
       if (!data.success) {
-        logger.error('Failed to upload media via custom API route', {
-          error: data.error,
-        })
         throw new Error(data.error || 'Failed to upload media to WordPress')
       }
 
diff --git a/apps/sim/tools/zendesk/autocomplete_organizations.ts b/apps/sim/tools/zendesk/autocomplete_organizations.ts
index 453df35a17..eb3983448b 100644
--- a/apps/sim/tools/zendesk/autocomplete_organizations.ts
+++ b/apps/sim/tools/zendesk/autocomplete_organizations.ts
@@ -1,4 +1,3 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import {
   buildZendeskUrl,
@@ -6,9 +5,7 @@ import {
   METADATA_OUTPUT,
   ORGANIZATIONS_ARRAY_OUTPUT,
   PAGING_OUTPUT,
-} from './types'
-
-const logger = createLogger('ZendeskAutocompleteOrganizations')
+} from '@/tools/zendesk/types'
 
 export interface ZendeskAutocompleteOrganizationsParams {
   email: string
diff --git a/apps/sim/tools/zendesk/create_organization.ts b/apps/sim/tools/zendesk/create_organization.ts
index b7efd6b995..2e425f1e28 100644
--- a/apps/sim/tools/zendesk/create_organization.ts
+++ b/apps/sim/tools/zendesk/create_organization.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, ORGANIZATION_OUTPUT_PROPERTIES } from './types'
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  ORGANIZATION_OUTPUT_PROPERTIES,
+} from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskCreateOrganization')
 
diff --git a/apps/sim/tools/zendesk/create_organizations_bulk.ts b/apps/sim/tools/zendesk/create_organizations_bulk.ts
index 683366300d..c7b203e0f3 100644
--- a/apps/sim/tools/zendesk/create_organizations_bulk.ts
+++ b/apps/sim/tools/zendesk/create_organizations_bulk.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from './types'
+import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskCreateOrganizationsBulk')
 
diff --git a/apps/sim/tools/zendesk/create_ticket.ts b/apps/sim/tools/zendesk/create_ticket.ts
index 96bc74ccb0..00c51d3a0d 100644
--- a/apps/sim/tools/zendesk/create_ticket.ts
+++ b/apps/sim/tools/zendesk/create_ticket.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, TICKET_OUTPUT_PROPERTIES } from './types'
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  TICKET_OUTPUT_PROPERTIES,
+} from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskCreateTicket')
 
diff --git a/apps/sim/tools/zendesk/create_tickets_bulk.ts b/apps/sim/tools/zendesk/create_tickets_bulk.ts
index df32885774..c9017eea1f 100644
--- a/apps/sim/tools/zendesk/create_tickets_bulk.ts
+++ b/apps/sim/tools/zendesk/create_tickets_bulk.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from './types'
+import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskCreateTicketsBulk')
 
diff --git a/apps/sim/tools/zendesk/create_user.ts b/apps/sim/tools/zendesk/create_user.ts
index f2d3a469c9..511666cf0b 100644
--- a/apps/sim/tools/zendesk/create_user.ts
+++ b/apps/sim/tools/zendesk/create_user.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from './types'
+import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskCreateUser')
 
diff --git a/apps/sim/tools/zendesk/create_users_bulk.ts b/apps/sim/tools/zendesk/create_users_bulk.ts
index 1c21aaf92c..fc92226e16 100644
--- a/apps/sim/tools/zendesk/create_users_bulk.ts
+++ b/apps/sim/tools/zendesk/create_users_bulk.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from './types'
+import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskCreateUsersBulk')
 
diff --git a/apps/sim/tools/zendesk/delete_organization.ts b/apps/sim/tools/zendesk/delete_organization.ts
index e48e347f6d..e274e697e5 100644
--- a/apps/sim/tools/zendesk/delete_organization.ts
+++ b/apps/sim/tools/zendesk/delete_organization.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError } from './types'
-
-const logger = createLogger('ZendeskDeleteOrganization')
+import { buildZendeskUrl, handleZendeskError } from '@/tools/zendesk/types'
 
 export interface ZendeskDeleteOrganizationParams {
   email: string
diff --git a/apps/sim/tools/zendesk/delete_ticket.ts b/apps/sim/tools/zendesk/delete_ticket.ts
index 9b20d39547..3d108dfd57 100644
--- a/apps/sim/tools/zendesk/delete_ticket.ts
+++ b/apps/sim/tools/zendesk/delete_ticket.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError } from './types'
-
-const logger = createLogger('ZendeskDeleteTicket')
+import { buildZendeskUrl, handleZendeskError } from '@/tools/zendesk/types'
 
 export interface ZendeskDeleteTicketParams {
   email: string
diff --git a/apps/sim/tools/zendesk/delete_user.ts b/apps/sim/tools/zendesk/delete_user.ts
index 51d53f34a8..679fb3c284 100644
--- a/apps/sim/tools/zendesk/delete_user.ts
+++ b/apps/sim/tools/zendesk/delete_user.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError } from './types'
-
-const logger = createLogger('ZendeskDeleteUser')
+import { buildZendeskUrl, handleZendeskError } from '@/tools/zendesk/types'
 
 export interface ZendeskDeleteUserParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_current_user.ts b/apps/sim/tools/zendesk/get_current_user.ts
index fbca863be7..c94fc4ecb1 100644
--- a/apps/sim/tools/zendesk/get_current_user.ts
+++ b/apps/sim/tools/zendesk/get_current_user.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from './types'
-
-const logger = createLogger('ZendeskGetCurrentUser')
+import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from '@/tools/zendesk/types'
 
 export interface ZendeskGetCurrentUserParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_organization.ts b/apps/sim/tools/zendesk/get_organization.ts
index 1f36f992b6..496cf50ad1 100644
--- a/apps/sim/tools/zendesk/get_organization.ts
+++ b/apps/sim/tools/zendesk/get_organization.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, ORGANIZATION_OUTPUT_PROPERTIES } from './types'
-
-const logger = createLogger('ZendeskGetOrganization')
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  ORGANIZATION_OUTPUT_PROPERTIES,
+} from '@/tools/zendesk/types'
 
 export interface ZendeskGetOrganizationParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_organizations.ts b/apps/sim/tools/zendesk/get_organizations.ts
index 33868b319d..8e83ce503a 100644
--- a/apps/sim/tools/zendesk/get_organizations.ts
+++ b/apps/sim/tools/zendesk/get_organizations.ts
@@ -1,4 +1,3 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import {
   buildZendeskUrl,
@@ -6,9 +5,7 @@ import {
   METADATA_OUTPUT,
   ORGANIZATIONS_ARRAY_OUTPUT,
   PAGING_OUTPUT,
-} from './types'
-
-const logger = createLogger('ZendeskGetOrganizations')
+} from '@/tools/zendesk/types'
 
 export interface ZendeskGetOrganizationsParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_ticket.ts b/apps/sim/tools/zendesk/get_ticket.ts
index 16cf90706d..689d42976c 100644
--- a/apps/sim/tools/zendesk/get_ticket.ts
+++ b/apps/sim/tools/zendesk/get_ticket.ts
@@ -1,8 +1,9 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, TICKET_OUTPUT_PROPERTIES } from './types'
-
-const logger = createLogger('ZendeskGetTicket')
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  TICKET_OUTPUT_PROPERTIES,
+} from '@/tools/zendesk/types'
 
 export interface ZendeskGetTicketParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_tickets.ts b/apps/sim/tools/zendesk/get_tickets.ts
index a9409c1e38..94a5e2680e 100644
--- a/apps/sim/tools/zendesk/get_tickets.ts
+++ b/apps/sim/tools/zendesk/get_tickets.ts
@@ -1,4 +1,3 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import {
   buildZendeskUrl,
@@ -6,9 +5,7 @@ import {
   METADATA_OUTPUT,
   PAGING_OUTPUT,
   TICKETS_ARRAY_OUTPUT,
-} from './types'
-
-const logger = createLogger('ZendeskGetTickets')
+} from '@/tools/zendesk/types'
 
 export interface ZendeskGetTicketsParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_user.ts b/apps/sim/tools/zendesk/get_user.ts
index 280142e35d..0fda3d0ed8 100644
--- a/apps/sim/tools/zendesk/get_user.ts
+++ b/apps/sim/tools/zendesk/get_user.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from './types'
-
-const logger = createLogger('ZendeskGetUser')
+import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from '@/tools/zendesk/types'
 
 export interface ZendeskGetUserParams {
   email: string
diff --git a/apps/sim/tools/zendesk/get_users.ts b/apps/sim/tools/zendesk/get_users.ts
index 5caab52e0a..adb876b15c 100644
--- a/apps/sim/tools/zendesk/get_users.ts
+++ b/apps/sim/tools/zendesk/get_users.ts
@@ -1,4 +1,3 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import {
   buildZendeskUrl,
@@ -6,9 +5,7 @@ import {
   METADATA_OUTPUT,
   PAGING_OUTPUT,
   USERS_ARRAY_OUTPUT,
-} from './types'
-
-const logger = createLogger('ZendeskGetUsers')
+} from '@/tools/zendesk/types'
 
 export interface ZendeskGetUsersParams {
   email: string
diff --git a/apps/sim/tools/zendesk/merge_tickets.ts b/apps/sim/tools/zendesk/merge_tickets.ts
index 8483c08ce0..1f0eaf7ebf 100644
--- a/apps/sim/tools/zendesk/merge_tickets.ts
+++ b/apps/sim/tools/zendesk/merge_tickets.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from './types'
-
-const logger = createLogger('ZendeskMergeTickets')
+import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from '@/tools/zendesk/types'
 
 export interface ZendeskMergeTicketsParams {
   email: string
diff --git a/apps/sim/tools/zendesk/search.ts b/apps/sim/tools/zendesk/search.ts
index cbb93d0298..f1ce635097 100644
--- a/apps/sim/tools/zendesk/search.ts
+++ b/apps/sim/tools/zendesk/search.ts
@@ -1,8 +1,10 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, METADATA_OUTPUT, PAGING_OUTPUT } from './types'
-
-const logger = createLogger('ZendeskSearch')
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  METADATA_OUTPUT,
+  PAGING_OUTPUT,
+} from '@/tools/zendesk/types'
 
 export interface ZendeskSearchParams {
   email: string
diff --git a/apps/sim/tools/zendesk/search_count.ts b/apps/sim/tools/zendesk/search_count.ts
index 14d16c3299..ca7e5005f4 100644
--- a/apps/sim/tools/zendesk/search_count.ts
+++ b/apps/sim/tools/zendesk/search_count.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError } from './types'
-
-const logger = createLogger('ZendeskSearchCount')
+import { buildZendeskUrl, handleZendeskError } from '@/tools/zendesk/types'
 
 export interface ZendeskSearchCountParams {
   email: string
diff --git a/apps/sim/tools/zendesk/search_users.ts b/apps/sim/tools/zendesk/search_users.ts
index 9b4aea2de8..423c9c5a82 100644
--- a/apps/sim/tools/zendesk/search_users.ts
+++ b/apps/sim/tools/zendesk/search_users.ts
@@ -1,4 +1,3 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import {
   buildZendeskUrl,
@@ -6,9 +5,7 @@ import {
   METADATA_OUTPUT,
   PAGING_OUTPUT,
   USERS_ARRAY_OUTPUT,
-} from './types'
-
-const logger = createLogger('ZendeskSearchUsers')
+} from '@/tools/zendesk/types'
 
 export interface ZendeskSearchUsersParams {
   email: string
diff --git a/apps/sim/tools/zendesk/update_organization.ts b/apps/sim/tools/zendesk/update_organization.ts
index 792d540ab6..a054795386 100644
--- a/apps/sim/tools/zendesk/update_organization.ts
+++ b/apps/sim/tools/zendesk/update_organization.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, ORGANIZATION_OUTPUT_PROPERTIES } from './types'
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  ORGANIZATION_OUTPUT_PROPERTIES,
+} from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskUpdateOrganization')
 
diff --git a/apps/sim/tools/zendesk/update_ticket.ts b/apps/sim/tools/zendesk/update_ticket.ts
index eaafdf3cfe..6768c8d243 100644
--- a/apps/sim/tools/zendesk/update_ticket.ts
+++ b/apps/sim/tools/zendesk/update_ticket.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, TICKET_OUTPUT_PROPERTIES } from './types'
+import {
+  buildZendeskUrl,
+  handleZendeskError,
+  TICKET_OUTPUT_PROPERTIES,
+} from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskUpdateTicket')
 
diff --git a/apps/sim/tools/zendesk/update_tickets_bulk.ts b/apps/sim/tools/zendesk/update_tickets_bulk.ts
index 36d30ecbbb..39a1b02e79 100644
--- a/apps/sim/tools/zendesk/update_tickets_bulk.ts
+++ b/apps/sim/tools/zendesk/update_tickets_bulk.ts
@@ -1,8 +1,5 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from './types'
-
-const logger = createLogger('ZendeskUpdateTicketsBulk')
+import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from '@/tools/zendesk/types'
 
 export interface ZendeskUpdateTicketsBulkParams {
   email: string
diff --git a/apps/sim/tools/zendesk/update_user.ts b/apps/sim/tools/zendesk/update_user.ts
index 4bbef9f2ee..a8c3d021ac 100644
--- a/apps/sim/tools/zendesk/update_user.ts
+++ b/apps/sim/tools/zendesk/update_user.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from './types'
+import { buildZendeskUrl, handleZendeskError, USER_OUTPUT_PROPERTIES } from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskUpdateUser')
 
diff --git a/apps/sim/tools/zendesk/update_users_bulk.ts b/apps/sim/tools/zendesk/update_users_bulk.ts
index c1dd18d2ff..295be2c821 100644
--- a/apps/sim/tools/zendesk/update_users_bulk.ts
+++ b/apps/sim/tools/zendesk/update_users_bulk.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
-import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from './types'
+import { buildZendeskUrl, handleZendeskError, JOB_STATUS_OUTPUT } from '@/tools/zendesk/types'
 
 const logger = createLogger('ZendeskUpdateUsersBulk')
 
diff --git a/biome.json b/biome.json
index 8ded99137c..154625b78c 100644
--- a/biome.json
+++ b/biome.json
@@ -38,32 +38,7 @@
     "lineEnding": "lf",
     "lineWidth": 100,
     "attributePosition": "auto",
-    "bracketSpacing": true,
-    "includes": [
-      "**",
-      "!**/.next",
-      "!**/out",
-      "!**/dist",
-      "!**/build",
-      "!**/node_modules",
-      "!**/.bun",
-      "!**/.cache",
-      "!**/.turbo",
-      "!**/.DS_Store",
-      "!**/*.pem",
-      "!**/bun-debug.log*",
-      "!**/.env*.local",
-      "!**/.env",
-      "!**/.vercel",
-      "!**/coverage",
-      "!**/public/sw.js",
-      "!**/public/workbox-*.js",
-      "!**/public/worker-*.js",
-      "!**/public/fallback-*.js",
-      "!**/apps/docs/.source/**",
-      "!**/venv/**",
-      "!**/.venv/**"
-    ]
+    "bracketSpacing": true
   },
   "assist": {
     "actions": {

From c9e0498147fbcb269857fa6320cdbfbde8642598 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 30 Jan 2026 17:07:33 -0800
Subject: [PATCH 2/4] ack PR comments

---
 .../components/permissions-table-skeleton.tsx | 23 --------
 .../components/permissions-table.tsx          | 21 ++++++-
 .../components/invite-modal/invite-modal.tsx  | 22 +++++--
 .../sidebar/hooks/use-workspace-management.ts | 58 +++++++++----------
 4 files changed, 65 insertions(+), 59 deletions(-)
 delete mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table-skeleton.tsx

diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table-skeleton.tsx
deleted file mode 100644
index 0e48939bde..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table-skeleton.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react'
-import { Skeleton } from '@/components/ui/skeleton'
-
-export const PermissionsTableSkeleton = React.memo(() => (
-  <div className='scrollbar-hide max-h-[300px] overflow-y-auto'>
-    <div className='flex items-center justify-between gap-[8px] py-[8px]'>
-      <div className='min-w-0 flex-1'>
-        <div className='flex items-center gap-[8px]'>
-          <Skeleton className='h-[14px] w-40 rounded-[4px]' />
-        </div>
-      </div>
-      <div className='flex flex-shrink-0 items-center'>
-        <div className='inline-flex gap-[2px]'>
-          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
-          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
-          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
-        </div>
-      </div>
-    </div>
-  </div>
-))
-
-PermissionsTableSkeleton.displayName = 'PermissionsTableSkeleton'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx
index 92f0b9cafb..9b313c266f 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/components/permissions-table.tsx
@@ -1,14 +1,33 @@
 import { useEffect, useMemo, useState } from 'react'
 import { Loader2, RotateCw, X } from 'lucide-react'
 import { Badge, Button, Tooltip } from '@/components/emcn'
+import { Skeleton } from '@/components/ui/skeleton'
 import { useSession } from '@/lib/auth/auth-client'
 import type { PermissionType } from '@/lib/workspaces/permissions/utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import type { WorkspacePermissions } from '@/hooks/queries/workspace'
 import { PermissionSelector } from './permission-selector'
-import { PermissionsTableSkeleton } from './permissions-table-skeleton'
 import type { UserPermissions } from './types'
 
+const PermissionsTableSkeleton = () => (
+  <div className='scrollbar-hide max-h-[300px] overflow-y-auto'>
+    <div className='flex items-center justify-between gap-[8px] py-[8px]'>
+      <div className='min-w-0 flex-1'>
+        <div className='flex items-center gap-[8px]'>
+          <Skeleton className='h-[14px] w-40 rounded-[4px]' />
+        </div>
+      </div>
+      <div className='flex flex-shrink-0 items-center'>
+        <div className='inline-flex gap-[2px]'>
+          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
+          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
+          <Skeleton className='h-[28px] w-[44px] rounded-[5px]' />
+        </div>
+      </div>
+    </div>
+  </div>
+)
+
 export interface PermissionsTableProps {
   userPermissions: UserPermissions[]
   onPermissionChange: (userId: string, permissionType: PermissionType) => void
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
index 76b4442d64..06a96d5209 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
@@ -55,6 +55,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
   } | null>(null)
   const [resendCooldowns, setResendCooldowns] = useState<Record<string, number>>({})
   const [resentInvitationIds, setResentInvitationIds] = useState<Record<string, boolean>>({})
+  const [resendingInvitationIds, setResendingInvitationIds] = useState<Record<string, boolean>>({})
   const params = useParams()
   const workspaceId = params.workspaceId as string
 
@@ -329,12 +330,20 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
       const secondsLeft = resendCooldowns[invitationId]
       if (secondsLeft && secondsLeft > 0) return
 
+      if (resendingInvitationIds[invitationId]) return
+
       setErrorMessage(null)
+      setResendingInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
 
       resendInvitation.mutate(
         { invitationId, workspaceId },
         {
           onSuccess: () => {
+            setResendingInvitationIds((prev) => {
+              const next = { ...prev }
+              delete next[invitationId]
+              return next
+            })
             setResentInvitationIds((prev) => ({ ...prev, [invitationId]: true }))
             setTimeout(() => {
               setResentInvitationIds((prev) => {
@@ -369,20 +378,20 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
             cooldownIntervalsRef.current.set(invitationId, interval)
           },
           onError: (error) => {
+            setResendingInvitationIds((prev) => {
+              const next = { ...prev }
+              delete next[invitationId]
+              return next
+            })
             logger.error('Error resending invitation:', error)
             setErrorMessage(error.message || 'Failed to resend invitation. Please try again.')
           },
         }
       )
     },
-    [workspaceId, userPerms.canAdmin, resendCooldowns, resendInvitation]
+    [workspaceId, userPerms.canAdmin, resendCooldowns, resendingInvitationIds, resendInvitation]
   )
 
-  const resendingInvitationIds = useMemo(() => {
-    if (!resendInvitation.isPending || !resendInvitation.variables) return {}
-    return { [resendInvitation.variables.invitationId]: true }
-  }, [resendInvitation.isPending, resendInvitation.variables])
-
   const handleSubmit = useCallback(
     (e: React.FormEvent) => {
       e.preventDefault()
@@ -435,6 +444,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
     setInvitationToRemove(null)
     setResendCooldowns({})
     setResentInvitationIds({})
+    setResendingInvitationIds({})
 
     cooldownIntervalsRef.current.forEach((interval) => clearInterval(interval))
     cooldownIntervalsRef.current.clear()
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
index c9ca75f867..2735c48e14 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
@@ -201,36 +201,36 @@ export function useWorkspaceManagement({
 
       logger.info('Leaving workspace:', workspaceToLeave.id)
 
-      leaveWorkspaceMutation.mutate(
-        { userId: sessionUserId, workspaceId: workspaceToLeave.id },
-        {
-          onSuccess: async () => {
-            logger.info('Left workspace successfully:', workspaceToLeave.id)
-
-            const isLeavingCurrentWorkspace =
-              workspaceIdRef.current === workspaceToLeave.id ||
-              activeWorkspaceRef.current?.id === workspaceToLeave.id
-
-            if (isLeavingCurrentWorkspace) {
-              logger.info(
-                'Leaving current workspace - using full workspace refresh with URL validation'
-              )
-              hasValidatedRef.current = false
-              const { data: updatedWorkspaces } = await refetchWorkspaces()
-
-              const remainingWorkspaces = (updatedWorkspaces || []).filter(
-                (w) => w.id !== workspaceToLeave.id
-              )
-              if (remainingWorkspaces.length > 0) {
-                await switchWorkspace(remainingWorkspaces[0])
-              }
-            }
-          },
-          onError: (error) => {
-            logger.error('Error leaving workspace:', error)
-          },
+      try {
+        await leaveWorkspaceMutation.mutateAsync({
+          userId: sessionUserId,
+          workspaceId: workspaceToLeave.id,
+        })
+
+        logger.info('Left workspace successfully:', workspaceToLeave.id)
+
+        const isLeavingCurrentWorkspace =
+          workspaceIdRef.current === workspaceToLeave.id ||
+          activeWorkspaceRef.current?.id === workspaceToLeave.id
+
+        if (isLeavingCurrentWorkspace) {
+          logger.info(
+            'Leaving current workspace - using full workspace refresh with URL validation'
+          )
+          hasValidatedRef.current = false
+          const { data: updatedWorkspaces } = await refetchWorkspaces()
+
+          const remainingWorkspaces = (updatedWorkspaces || []).filter(
+            (w) => w.id !== workspaceToLeave.id
+          )
+          if (remainingWorkspaces.length > 0) {
+            await switchWorkspace(remainingWorkspaces[0])
+          }
         }
-      )
+      } catch (error) {
+        logger.error('Error leaving workspace:', error)
+        throw error
+      }
     },
     [refetchWorkspaces, switchWorkspace, sessionUserId, leaveWorkspaceMutation]
   )

From 10c7db5bcb71a7b51683356f86c99e9a71b84cf8 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 30 Jan 2026 17:10:59 -0800
Subject: [PATCH 3/4] remove dead import

---
 .../components/workspace-header/components/invite-modal/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/index.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/index.ts
index e4888a0769..91f467fbd5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/index.ts
@@ -1,5 +1,4 @@
 export { PermissionSelector } from './components/permission-selector'
 export { PermissionsTable } from './components/permissions-table'
-export { PermissionsTableSkeleton } from './components/permissions-table-skeleton'
 export type { PermissionType, UserPermissions } from './components/types'
 export { InviteModal } from './invite-modal'

From fbb5e41ec0deefdced5cc9a44d655304219dbb90 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 30 Jan 2026 17:39:44 -0800
Subject: [PATCH 4/4] remove unused hook

---
 apps/sim/hooks/queries/invitations.ts | 41 ---------------------------
 1 file changed, 41 deletions(-)

diff --git a/apps/sim/hooks/queries/invitations.ts b/apps/sim/hooks/queries/invitations.ts
index d67f33cc4e..342ca7cd90 100644
--- a/apps/sim/hooks/queries/invitations.ts
+++ b/apps/sim/hooks/queries/invitations.ts
@@ -66,47 +66,6 @@ export function usePendingInvitations(workspaceId: string | undefined) {
   })
 }
 
-interface SendInvitationParams {
-  workspaceId: string
-  email: string
-  permission: 'admin' | 'write' | 'read'
-}
-
-/**
- * Sends a single workspace invitation.
- * Invalidates the invitation list cache on success.
- */
-export function useSendWorkspaceInvitation() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async ({ workspaceId, email, permission }: SendInvitationParams) => {
-      const response = await fetch('/api/workspaces/invitations', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          workspaceId,
-          email,
-          role: 'member',
-          permission,
-        }),
-      })
-
-      if (!response.ok) {
-        const error = await response.json()
-        throw new Error(error.error || 'Failed to send invitation')
-      }
-
-      return response.json()
-    },
-    onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries({
-        queryKey: invitationKeys.list(variables.workspaceId),
-      })
-    },
-  })
-}
-
 interface BatchSendInvitationsParams {
   workspaceId: string
   invitations: Array<{ email: string; permission: 'admin' | 'write' | 'read' }>