{children}
+
+
)
}
export function SidebarSeparator({ item }: { item: Separator }) {
return (
-
+
+ {hasChildren && (
+
+ {item.index ? (
{item.name}
+ ) : (
+ )}
+ {hasChildren && (
+
-
- ) : (
-
- {item.name}
-
)}
- {children}
+ {/* Desktop: styled with border */}
+ -
+ {children}
+
-
-
+ -
- {children}
-
+
{item.name}
) diff --git a/apps/docs/components/icons.tsx b/apps/docs/components/icons.tsx index d6dc0ae4d2..06fd3443e4 100644 --- a/apps/docs/components/icons.tsx +++ b/apps/docs/components/icons.tsx @@ -4089,3 +4089,43 @@ export function PolymarketIcon(props: SVGProps
diff --git a/apps/docs/components/ui/icon-mapping.ts b/apps/docs/components/ui/icon-mapping.ts
index a5267e9eb8..fb56fb1dbf 100644
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -15,6 +15,7 @@ import {
CalendlyIcon,
ClayIcon,
ConfluenceIcon,
+ CursorIcon,
DatadogIcon,
DiscordIcon,
DocumentIcon,
@@ -32,6 +33,7 @@ import {
GoogleDocsIcon,
GoogleDriveIcon,
GoogleFormsIcon,
+ GoogleGroupsIcon,
GoogleIcon,
GoogleSheetsIcon,
GoogleSlidesIcon,
@@ -195,6 +197,7 @@ export const blockTypeToIconMap: Record = {
google_vault: GoogleVaultIcon,
google_slides: GoogleSlidesIcon,
google_sheets: GoogleSheetsIcon,
+ google_groups: GoogleGroupsIcon,
google_forms: GoogleFormsIcon,
google_drive: GoogleDriveIcon,
google_docs: GoogleDocsIcon,
@@ -212,6 +215,7 @@ export const blockTypeToIconMap: Record = {
dropbox: DropboxIcon,
discord: DiscordIcon,
datadog: DatadogIcon,
+ cursor: CursorIcon,
confluence: ConfluenceIcon,
clay: ClayIcon,
calendly: CalendlyIcon,
diff --git a/apps/docs/content/docs/de/blocks/condition.mdx b/apps/docs/content/docs/de/blocks/condition.mdx
index 176c026ffe..5d8687e81d 100644
--- a/apps/docs/content/docs/de/blocks/condition.mdx
+++ b/apps/docs/content/docs/de/blocks/condition.mdx
@@ -143,7 +143,7 @@ Function (Process) → Condition (account_type === 'enterprise') → Advanced or
## Bewährte Praktiken
- **Bedingungen korrekt anordnen**: Platzieren Sie spezifischere Bedingungen vor allgemeinen, um sicherzustellen, dass spezifische Logik Vorrang vor Fallbacks hat
-- **Eine Standardbedingung einfügen**: Fügen Sie eine Auffangbedingung (`true`) als letzte Bedingung hinzu, um nicht übereinstimmende Fälle zu behandeln und zu verhindern, dass die Workflow-Ausführung stecken bleibt
-- **Ausdrücke einfach halten**: Verwenden Sie klare, unkomplizierte boolesche Ausdrücke für bessere Lesbarkeit und einfachere Fehlersuche
+- **Verwenden Sie den Else-Zweig bei Bedarf**: Wenn keine Bedingungen übereinstimmen und der Else-Zweig nicht verbunden ist, endet der Workflow-Zweig ordnungsgemäß. Verbinden Sie den Else-Zweig, wenn Sie einen Fallback-Pfad für nicht übereinstimmende Fälle benötigen
+- **Halten Sie Ausdrücke einfach**: Verwenden Sie klare, unkomplizierte boolesche Ausdrücke für bessere Lesbarkeit und einfachere Fehlersuche
- **Dokumentieren Sie Ihre Bedingungen**: Fügen Sie Beschreibungen hinzu, um den Zweck jeder Bedingung für bessere Teamzusammenarbeit und Wartung zu erklären
-- **Grenzfälle testen**: Überprüfen Sie, ob Bedingungen Grenzwerte korrekt behandeln, indem Sie mit Werten an den Grenzen Ihrer Bedingungsbereiche testen
+- **Testen Sie Grenzfälle**: Überprüfen Sie, ob Bedingungen Grenzwerte korrekt behandeln, indem Sie mit Werten an den Grenzen Ihrer Bedingungsbereiche testen
diff --git a/apps/docs/content/docs/de/introduction/index.mdx b/apps/docs/content/docs/de/introduction/index.mdx
index 5cc6003211..277562dd39 100644
--- a/apps/docs/content/docs/de/introduction/index.mdx
+++ b/apps/docs/content/docs/de/introduction/index.mdx
@@ -72,7 +72,7 @@ Für benutzerdefinierte Integrationen nutzen Sie unsere [MCP (Model Context Prot
-## KI-gesteuerter Copilot
+## Copilot
**Fragen stellen & Anleitung erhalten**
Der Copilot beantwortet Fragen zu Sim, erklärt Ihre Workflows und gibt Verbesserungsvorschläge. Verwenden Sie das `@` Symbol, um auf Workflows, Blöcke, Dokumentation, Wissen und Protokolle für kontextbezogene Unterstützung zu verweisen.
diff --git a/apps/docs/content/docs/de/knowledgebase/index.mdx b/apps/docs/content/docs/de/knowledgebase/index.mdx
index ad1f61d802..b6ce546fbd 100644
--- a/apps/docs/content/docs/de/knowledgebase/index.mdx
+++ b/apps/docs/content/docs/de/knowledgebase/index.mdx
@@ -1,5 +1,7 @@
---
-title: Wissensdatenbank
+title: Übersicht
+description: Laden Sie Ihre Dokumente hoch, verarbeiten und durchsuchen Sie sie
+ mit intelligenter Vektorsuche und Chunking
---
import { Video } from '@/components/ui/video'
diff --git a/apps/docs/content/docs/de/self-hosting/docker.mdx b/apps/docs/content/docs/de/self-hosting/docker.mdx
new file mode 100644
index 0000000000..6623e7aabd
--- /dev/null
+++ b/apps/docs/content/docs/de/self-hosting/docker.mdx
@@ -0,0 +1,155 @@
+---
+title: Docker
+description: Sim Studio mit Docker Compose bereitstellen
+---
+
+import { Tab, Tabs } from 'fumadocs-ui/components/tabs'
+import { Callout } from 'fumadocs-ui/components/callout'
+
+## Schnellstart
+
+```bash
+# Clone and start
+git clone https://github.com/simstudioai/sim.git && cd sim
+docker compose -f docker-compose.prod.yml up -d
+```
+
+Öffnen Sie [http://localhost:3000](http://localhost:3000)
+
+## Produktionseinrichtung
+
+### 1. Umgebung konfigurieren
+
+```bash
+# Generate secrets
+cat > .env << EOF
+DATABASE_URL=postgresql://postgres:postgres@db:5432/simstudio
+BETTER_AUTH_SECRET=$(openssl rand -hex 32)
+ENCRYPTION_KEY=$(openssl rand -hex 32)
+INTERNAL_API_SECRET=$(openssl rand -hex 32)
+NEXT_PUBLIC_APP_URL=https://sim.yourdomain.com
+BETTER_AUTH_URL=https://sim.yourdomain.com
+NEXT_PUBLIC_SOCKET_URL=https://sim.yourdomain.com
+EOF
+```
+
+### 2. Dienste starten
+
+```bash
+docker compose -f docker-compose.prod.yml up -d
+```
+
+### 3. SSL einrichten
+
+
-
- {children}
-
+
+
+
+
+ {children}
+ {children}
+ return (
+
+
+ Account frozen. Please contact support to resolve this issue.
+
+ {onContactSupport && (
+
+ )}
+
+ )}
+
+ {isBlocked && blockedReason !== 'dispute' && !blockedByOrgOwner && (
Payment failed. Please update your payment method.
@@ -131,6 +154,22 @@ export function UsageHeader({
)}
+ {isBlocked && blockedByOrgOwner && blockedReason !== 'dispute' && (
+
+
+ Organization billing issue. Please contact your organization owner.
+
+
+ )}
+
+ {isBlocked && blockedByOrgOwner && blockedReason === 'dispute' && (
+
+
+ Organization account frozen. Please contact support.
+
+
+ )}
+
{!isBlocked && status === 'exceeded' && (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/credit-balance/credit-balance.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/credit-balance/credit-balance.tsx
new file mode 100644
index 0000000000..337df1f68d
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/credit-balance/credit-balance.tsx
@@ -0,0 +1,186 @@
+'use client'
+
+import { useState } from 'react'
+import {
+ Button,
+ Input,
+ Modal,
+ ModalClose,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ ModalTrigger,
+} from '@/components/emcn'
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('CreditBalance')
+
+interface CreditBalanceProps {
+ balance: number
+ canPurchase: boolean
+ entityType: 'user' | 'organization'
+ isLoading?: boolean
+ onPurchaseComplete?: () => void
+}
+
+export function CreditBalance({
+ balance,
+ canPurchase,
+ entityType,
+ isLoading,
+ onPurchaseComplete,
+}: CreditBalanceProps) {
+ const [isOpen, setIsOpen] = useState(false)
+ const [amount, setAmount] = useState('')
+ const [isPurchasing, setIsPurchasing] = useState(false)
+ const [error, setError] = useState(null)
+ const [success, setSuccess] = useState(false)
+ const [requestId, setRequestId] = useState(null)
+
+ const handleAmountChange = (value: string) => {
+ const numericValue = value.replace(/[^0-9]/g, '')
+ setAmount(numericValue)
+ setError(null)
+ }
+
+ const handlePurchase = async () => {
+ if (!requestId || isPurchasing) return
+
+ const numAmount = Number.parseInt(amount, 10)
+
+ if (Number.isNaN(numAmount) || numAmount < 10) {
+ setError('Minimum purchase is $10')
+ return
+ }
+
+ if (numAmount > 1000) {
+ setError('Maximum purchase is $1,000')
+ return
+ }
+
+ setIsPurchasing(true)
+ setError(null)
+
+ try {
+ const response = await fetch('/api/billing/credits', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ amount: numAmount, requestId }),
+ })
+
+ const data = await response.json()
+
+ if (!response.ok) {
+ throw new Error(data.error || 'Failed to purchase credits')
+ }
+
+ setSuccess(true)
+ setTimeout(() => {
+ setIsOpen(false)
+ onPurchaseComplete?.()
+ }, 1500)
+ } catch (err) {
+ logger.error('Credit purchase failed', { error: err })
+ setError(err instanceof Error ? err.message : 'Failed to purchase credits')
+ } finally {
+ setIsPurchasing(false)
+ }
+ }
+
+ const handleOpenChange = (open: boolean) => {
+ setIsOpen(open)
+ if (open) {
+ // Generate new requestId when modal opens - same ID used for entire session
+ setRequestId(crypto.randomUUID())
+ } else {
+ setAmount('')
+ setError(null)
+ setSuccess(false)
+ setRequestId(null)
+ }
+ }
+
+ return (
+
)}
- {/* Cost Breakdown */}
- {/* TODO: Re-enable CostBreakdown component in the next billing period
- once sufficient copilot cost data has been collected for accurate display.
- Currently hidden to avoid confusion with initial zero values.
- */}
- {/*
- {subscriptionData?.usage && typeof subscriptionData.usage.copilotCost === 'number' && (
-
+
+
+
+
+
+ Add Credits
+
+
+
+
+
+
+ )}
+
+
+ )}
+
+ )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/credit-balance/index.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/credit-balance/index.ts
new file mode 100644
index 0000000000..0b11de6a16
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/credit-balance/index.ts
@@ -0,0 +1 @@
+export { CreditBalance } from './credit-balance'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/index.ts
index ab9d7604fb..064e4ae7ef 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/index.ts
@@ -1,5 +1,6 @@
export { CancelSubscription } from './cancel-subscription'
export { CostBreakdown } from './cost-breakdown'
+export { CreditBalance } from './credit-balance'
export { PlanCard, type PlanCardProps, type PlanFeature } from './plan-card'
export type { UsageLimitRef } from './usage-limit'
export { UsageLimit } from './usage-limit'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
index 1d8d4afe94..6a627db950 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/subscription.tsx
@@ -22,6 +22,7 @@ import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/provide
import { UsageHeader } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/shared/usage-header'
import {
CancelSubscription,
+ CreditBalance,
PlanCard,
UsageLimit,
type UsageLimitRef,
@@ -49,17 +50,8 @@ const CONSTANTS = {
INITIAL_TEAM_SEATS: 1,
} as const
-const STYLES = {
- GRADIENT_BADGE:
- 'gradient-text h-[1.125rem] rounded-[6px] border-gradient-primary/20 bg-gradient-to-b from-gradient-primary via-gradient-secondary to-gradient-primary px-2 py-0 font-medium text-xs cursor-pointer',
-} as const
-
type TargetPlan = 'pro' | 'team'
-interface SubscriptionProps {
- onOpenChange: (open: boolean) => void
-}
-
/**
* Skeleton component for subscription loading state.
*/
@@ -159,7 +151,7 @@ const formatPlanName = (plan: string): string => plan.charAt(0).toUpperCase() +
* Subscription management component
* Handles plan display, upgrades, and billing management
*/
-export function Subscription({ onOpenChange }: SubscriptionProps) {
+export function Subscription() {
const { data: session } = useSession()
const { handleUpgrade } = useSubscriptionUpgrade()
const params = useParams()
@@ -168,7 +160,11 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
const canManageWorkspaceKeys = userPermissions.canAdmin
const logger = createLogger('Subscription')
- const { data: subscriptionData, isLoading: isSubscriptionLoading } = useSubscriptionData()
+ const {
+ data: subscriptionData,
+ isLoading: isSubscriptionLoading,
+ refetch: refetchSubscription,
+ } = useSubscriptionData()
const { data: usageLimitResponse, isLoading: isUsageLimitLoading } = useUsageLimitData()
const { data: workspaceData, isLoading: isWorkspaceLoading } = useWorkspaceSettings(workspaceId)
const updateWorkspaceMutation = useUpdateWorkspaceSettings()
@@ -392,6 +388,8 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
: usage.limit
}
isBlocked={Boolean(subscriptionData?.data?.billingBlocked)}
+ blockedReason={subscriptionData?.data?.billingBlockedReason}
+ blockedByOrgOwner={Boolean(subscriptionData?.data?.blockedByOrgOwner)}
status={billingStatus}
percentUsed={
subscription.isEnterprise || subscription.isTeam
@@ -404,6 +402,9 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
: usage.percentUsed
: usage.percentUsed
}
+ onContactSupport={() => {
+ window.dispatchEvent(new CustomEvent('open-help-modal'))
+ }}
onResolvePayment={async () => {
try {
const res = await fetch('/api/billing/portal', {
@@ -463,22 +464,6 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
+ Credit Balance
+ {isLoading ? '...' : `$${balance.toFixed(2)}`}
+
+
+ {canPurchase && (
+
+
+
+ {success ? (
+ + Credits are used before overage charges. Min $10, max $1,000. +
+
+
+ ) : (
+ + Credits added successfully! +
+
+
+ )}
+
+ {!success && (
+
+
+
+
+
+
+ $
+
+ handleAmountChange(e.target.value)}
+ placeholder='50'
+ className='pl-7'
+ disabled={isPurchasing}
+ />
+
+ {error && {error}}
+
+
+ + Credits are non-refundable and don't expire. They'll be applied automatically to + your {entityType === 'organization' ? 'team' : ''} usage. +
+
-
- )}
- */}
-
{/* Team Member Notice */}
{permissions.showTeamMemberView && (
@@ -535,9 +520,20 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
)}
+ {/* Credit Balance */}
+ {subscription.isPaid && (
+
+
Next Billing Date
{new Date(subscriptionData.data.periodEnd).toLocaleDateString()}
@@ -617,7 +613,7 @@ function BillingUsageNotificationsToggle() {
const isLoading = updateSetting.isPending
return (
-
+
Usage notifications
Email me when I reach 80% usage
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/settings-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/settings-modal.tsx
index 05456870dd..e51b202f12 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/settings-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/settings-modal.tsx
@@ -434,9 +434,7 @@ export function SettingsModal({ open, onOpenChange }: SettingsModalProps) {
)}
{activeSection === 'apikeys' &&
{isBlocked ? (
- <>
- Payment
- Required
-
+ isDispute ? (
+ <>
+ Account
+ Frozen
+
+ ) : (
+ <>
+ Payment
+ Required
+
+ )
) : (
<>
@@ -292,7 +316,9 @@ export function UsageIndicator({ onClick }: UsageIndicatorProps) {
}`}
onClick={handleClick}
>
- {isBlocked ? 'Fix Now' : 'Upgrade'}
+
+ {isBlocked ? (isDispute ? 'Get Help' : 'Fix Now') : 'Upgrade'}
+
)}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx
index cc03c815b4..7cf58d4119 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx
@@ -60,11 +60,15 @@ export function SidebarNew() {
// Session data
const { data: sessionData, isPending: sessionLoading } = useSession()
- // Sidebar state
- const isCollapsed = useSidebarStore((state) => state.isCollapsed)
+ // Sidebar state - use store's hydration tracking to prevent SSR mismatch
+ const hasHydrated = useSidebarStore((state) => state._hasHydrated)
+ const isCollapsedStore = useSidebarStore((state) => state.isCollapsed)
const setIsCollapsed = useSidebarStore((state) => state.setIsCollapsed)
const setSidebarWidth = useSidebarStore((state) => state.setSidebarWidth)
+ // Use default (expanded) state until hydrated to prevent hydration mismatch
+ const isCollapsed = hasHydrated ? isCollapsedStore : false
+
// Determine if we're on a workflow page (only workflow pages allow collapse and resize)
const isOnWorkflowPage = !!workflowId
diff --git a/apps/sim/app/workspace/[workspaceId]/w/page.tsx b/apps/sim/app/workspace/[workspaceId]/w/page.tsx
index 9cf0382ca8..61b067f125 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/page.tsx
@@ -46,12 +46,14 @@ export default function WorkflowsPage() {
// Always show loading state until redirect happens
// There should always be a default workflow, so we never show "no workflows found"
return (
-
-
- = {
+ type: 'cursor',
+ name: 'Cursor',
+ description: 'Launch and manage Cursor cloud agents to work on GitHub repositories',
+ longDescription:
+ 'Interact with Cursor Cloud Agents API to launch AI agents that can work on your GitHub repositories. Supports launching agents, adding follow-up instructions, checking status, viewing conversations, and managing agent lifecycle.',
+ docsLink: 'https://cursor.com/docs/cloud-agent/api/endpoints',
+ category: 'tools',
+ bgColor: '#1E1E1E',
+ icon: CursorIcon,
+ authMode: AuthMode.ApiKey,
+ subBlocks: [
+ {
+ id: 'operation',
+ title: 'Operation',
+ type: 'dropdown',
+ options: [
+ { label: 'Launch Agent', id: 'cursor_launch_agent' },
+ { label: 'Add Follow-up', id: 'cursor_add_followup' },
+ { label: 'Get Agent Status', id: 'cursor_get_agent' },
+ { label: 'Get Conversation', id: 'cursor_get_conversation' },
+ { label: 'List Agents', id: 'cursor_list_agents' },
+ { label: 'Stop Agent', id: 'cursor_stop_agent' },
+ { label: 'Delete Agent', id: 'cursor_delete_agent' },
+ ],
+ value: () => 'cursor_launch_agent',
+ },
+ {
+ id: 'repository',
+ title: 'Repository URL',
+ type: 'short-input',
+ placeholder: 'https://github.com/your-org/your-repo',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ required: true,
+ },
+ {
+ id: 'ref',
+ title: 'Branch/Ref',
+ type: 'short-input',
+ placeholder: 'main (optional)',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ },
+ {
+ id: 'promptText',
+ title: 'Prompt',
+ type: 'long-input',
+ placeholder: 'Describe the task for the agent...',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ required: true,
+ },
+ {
+ id: 'model',
+ title: 'Model',
+ type: 'short-input',
+ placeholder: 'Auto-selection by default',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ },
+ {
+ id: 'branchName',
+ title: 'Branch Name',
+ type: 'short-input',
+ placeholder: 'Custom branch name (optional)',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ },
+ {
+ id: 'autoCreatePr',
+ title: 'Auto Create PR',
+ type: 'switch',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ },
+ {
+ id: 'openAsCursorGithubApp',
+ title: 'Open as Cursor GitHub App',
+ type: 'switch',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ },
+ {
+ id: 'skipReviewerRequest',
+ title: 'Skip Reviewer Request',
+ type: 'switch',
+ condition: { field: 'operation', value: 'cursor_launch_agent' },
+ },
+ {
+ id: 'agentId',
+ title: 'Agent ID',
+ type: 'short-input',
+ placeholder: 'e.g., bc_abc123',
+ condition: {
+ field: 'operation',
+ value: [
+ 'cursor_get_agent',
+ 'cursor_get_conversation',
+ 'cursor_add_followup',
+ 'cursor_stop_agent',
+ 'cursor_delete_agent',
+ ],
+ },
+ required: true,
+ },
+ {
+ id: 'followupPromptText',
+ title: 'Follow-up Prompt',
+ type: 'long-input',
+ placeholder: 'Additional instructions for the agent...',
+ condition: { field: 'operation', value: 'cursor_add_followup' },
+ required: true,
+ },
+ {
+ id: 'limit',
+ title: 'Limit',
+ type: 'short-input',
+ placeholder: '20 (default, max 100)',
+ condition: { field: 'operation', value: 'cursor_list_agents' },
+ },
+ {
+ id: 'cursor',
+ title: 'Pagination Cursor',
+ type: 'short-input',
+ placeholder: 'Cursor from previous response',
+ condition: { field: 'operation', value: 'cursor_list_agents' },
+ },
+ {
+ id: 'apiKey',
+ title: 'API Key',
+ type: 'short-input',
+ placeholder: 'Enter Cursor API Key',
+ password: true,
+ required: true,
+ },
+ ],
+ tools: {
+ access: [
+ 'cursor_list_agents',
+ 'cursor_get_agent',
+ 'cursor_get_conversation',
+ 'cursor_launch_agent',
+ 'cursor_add_followup',
+ 'cursor_stop_agent',
+ 'cursor_delete_agent',
+ ],
+ config: {
+ tool: (params) => params.operation || 'cursor_launch_agent',
+ },
+ },
+ inputs: {
+ operation: { type: 'string', description: 'Operation to perform' },
+ repository: { type: 'string', description: 'GitHub repository URL' },
+ ref: { type: 'string', description: 'Branch, tag, or commit reference' },
+ promptText: { type: 'string', description: 'Instruction text for the agent' },
+ followupPromptText: { type: 'string', description: 'Follow-up instruction text for the agent' },
+ promptImages: { type: 'string', description: 'JSON array of image objects' },
+ model: { type: 'string', description: 'Model to use (empty for auto-selection)' },
+ branchName: { type: 'string', description: 'Custom branch name' },
+ autoCreatePr: { type: 'boolean', description: 'Auto-create PR when done' },
+ openAsCursorGithubApp: { type: 'boolean', description: 'Open PR as Cursor GitHub App' },
+ skipReviewerRequest: { type: 'boolean', description: 'Skip reviewer request' },
+ agentId: { type: 'string', description: 'Agent identifier' },
+ limit: { type: 'number', description: 'Number of results to return' },
+ cursor: { type: 'string', description: 'Pagination cursor' },
+ apiKey: { type: 'string', description: 'Cursor API key' },
+ },
+ outputs: {
+ content: { type: 'string', description: 'Human-readable response content' },
+ metadata: { type: 'json', description: 'Response metadata' },
+ },
+}
diff --git a/apps/sim/blocks/blocks/google_groups.ts b/apps/sim/blocks/blocks/google_groups.ts
new file mode 100644
index 0000000000..658d66be74
--- /dev/null
+++ b/apps/sim/blocks/blocks/google_groups.ts
@@ -0,0 +1,317 @@
+import { GoogleGroupsIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import { AuthMode } from '@/blocks/types'
+
+export const GoogleGroupsBlock: BlockConfig = {
+ type: 'google_groups',
+ name: 'Google Groups',
+ description: 'Manage Google Workspace Groups and their members',
+ authMode: AuthMode.OAuth,
+ longDescription:
+ 'Connect to Google Workspace to create, update, and manage groups and their members using the Admin SDK Directory API.',
+ docsLink: 'https://developers.google.com/admin-sdk/directory/v1/guides/manage-groups',
+ category: 'tools',
+ bgColor: '#E8F0FE',
+ icon: GoogleGroupsIcon,
+ subBlocks: [
+ {
+ id: 'operation',
+ title: 'Operation',
+ type: 'dropdown',
+ options: [
+ { label: 'List Groups', id: 'list_groups' },
+ { label: 'Get Group', id: 'get_group' },
+ { label: 'Create Group', id: 'create_group' },
+ { label: 'Update Group', id: 'update_group' },
+ { label: 'Delete Group', id: 'delete_group' },
+ { label: 'List Members', id: 'list_members' },
+ { label: 'Get Member', id: 'get_member' },
+ { label: 'Add Member', id: 'add_member' },
+ { label: 'Update Member Role', id: 'update_member' },
+ { label: 'Remove Member', id: 'remove_member' },
+ { label: 'Check Membership', id: 'has_member' },
+ ],
+ value: () => 'list_groups',
+ },
+ {
+ id: 'credential',
+ title: 'Google Groups Account',
+ type: 'oauth-input',
+ required: true,
+ serviceId: 'google-groups',
+ requiredScopes: [
+ 'https://www.googleapis.com/auth/admin.directory.group',
+ 'https://www.googleapis.com/auth/admin.directory.group.member',
+ ],
+ placeholder: 'Select Google Workspace account',
+ },
+
+ {
+ id: 'customer',
+ title: 'Customer ID',
+ type: 'short-input',
+ placeholder: 'my_customer (default)',
+ condition: { field: 'operation', value: 'list_groups' },
+ },
+ {
+ id: 'domain',
+ title: 'Domain',
+ type: 'short-input',
+ placeholder: 'Filter by domain (e.g., example.com)',
+ condition: { field: 'operation', value: 'list_groups' },
+ },
+ {
+ id: 'query',
+ title: 'Search Query',
+ type: 'short-input',
+ placeholder: 'Filter query (e.g., email:admin*)',
+ condition: { field: 'operation', value: 'list_groups' },
+ },
+ {
+ id: 'maxResults',
+ title: 'Max Results',
+ type: 'short-input',
+ placeholder: 'Maximum results (1-200)',
+ condition: {
+ field: 'operation',
+ value: ['list_groups', 'list_members'],
+ },
+ },
+
+ {
+ id: 'groupKey',
+ title: 'Group Email or ID',
+ type: 'short-input',
+ placeholder: 'group@example.com or group ID',
+ required: true,
+ condition: {
+ field: 'operation',
+ value: [
+ 'get_group',
+ 'update_group',
+ 'delete_group',
+ 'list_members',
+ 'get_member',
+ 'add_member',
+ 'update_member',
+ 'remove_member',
+ 'has_member',
+ ],
+ },
+ },
+
+ {
+ id: 'email',
+ title: 'Group Email',
+ type: 'short-input',
+ placeholder: 'newgroup@example.com',
+ required: true,
+ condition: { field: 'operation', value: 'create_group' },
+ },
+ {
+ id: 'name',
+ title: 'Group Name',
+ type: 'short-input',
+ placeholder: 'Display name for the group',
+ required: true,
+ condition: { field: 'operation', value: 'create_group' },
+ },
+ {
+ id: 'description',
+ title: 'Description',
+ type: 'long-input',
+ placeholder: 'Optional description for the group',
+ condition: { field: 'operation', value: ['create_group', 'update_group'] },
+ },
+
+ {
+ id: 'newName',
+ title: 'New Name',
+ type: 'short-input',
+ placeholder: 'New display name',
+ condition: { field: 'operation', value: 'update_group' },
+ },
+ {
+ id: 'newEmail',
+ title: 'New Email',
+ type: 'short-input',
+ placeholder: 'New email address',
+ condition: { field: 'operation', value: 'update_group' },
+ },
+
+ {
+ id: 'memberKey',
+ title: 'Member Email or ID',
+ type: 'short-input',
+ placeholder: 'user@example.com or member ID',
+ required: true,
+ condition: {
+ field: 'operation',
+ value: ['get_member', 'update_member', 'remove_member', 'has_member'],
+ },
+ },
+ {
+ id: 'memberEmail',
+ title: 'Member Email',
+ type: 'short-input',
+ placeholder: 'user@example.com',
+ required: true,
+ condition: { field: 'operation', value: 'add_member' },
+ },
+ {
+ id: 'role',
+ title: 'Member Role',
+ type: 'dropdown',
+ options: [
+ { id: 'MEMBER', label: 'Member' },
+ { id: 'MANAGER', label: 'Manager' },
+ { id: 'OWNER', label: 'Owner' },
+ ],
+ condition: { field: 'operation', value: ['add_member', 'update_member'] },
+ },
+ {
+ id: 'roles',
+ title: 'Filter by Roles',
+ type: 'short-input',
+ placeholder: 'OWNER,MANAGER,MEMBER',
+ condition: { field: 'operation', value: 'list_members' },
+ },
+ ],
+ tools: {
+ access: [
+ 'google_groups_list_groups',
+ 'google_groups_get_group',
+ 'google_groups_create_group',
+ 'google_groups_update_group',
+ 'google_groups_delete_group',
+ 'google_groups_list_members',
+ 'google_groups_get_member',
+ 'google_groups_add_member',
+ 'google_groups_remove_member',
+ 'google_groups_update_member',
+ 'google_groups_has_member',
+ ],
+ config: {
+ tool: (params) => {
+ switch (params.operation) {
+ case 'list_groups':
+ return 'google_groups_list_groups'
+ case 'get_group':
+ return 'google_groups_get_group'
+ case 'create_group':
+ return 'google_groups_create_group'
+ case 'update_group':
+ return 'google_groups_update_group'
+ case 'delete_group':
+ return 'google_groups_delete_group'
+ case 'list_members':
+ return 'google_groups_list_members'
+ case 'get_member':
+ return 'google_groups_get_member'
+ case 'add_member':
+ return 'google_groups_add_member'
+ case 'update_member':
+ return 'google_groups_update_member'
+ case 'remove_member':
+ return 'google_groups_remove_member'
+ case 'has_member':
+ return 'google_groups_has_member'
+ default:
+ throw new Error(`Invalid Google Groups operation: ${params.operation}`)
+ }
+ },
+ params: (params) => {
+ const { credential, operation, ...rest } = params
+
+ switch (operation) {
+ case 'list_groups':
+ return {
+ credential,
+ customer: rest.customer,
+ domain: rest.domain,
+ query: rest.query,
+ maxResults: rest.maxResults ? Number(rest.maxResults) : undefined,
+ }
+ case 'get_group':
+ case 'delete_group':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ }
+ case 'create_group':
+ return {
+ credential,
+ email: rest.email,
+ name: rest.name,
+ description: rest.description,
+ }
+ case 'update_group':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ name: rest.newName,
+ email: rest.newEmail,
+ description: rest.description,
+ }
+ case 'list_members':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ maxResults: rest.maxResults ? Number(rest.maxResults) : undefined,
+ roles: rest.roles,
+ }
+ case 'get_member':
+ case 'remove_member':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ memberKey: rest.memberKey,
+ }
+ case 'add_member':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ email: rest.memberEmail,
+ role: rest.role,
+ }
+ case 'update_member':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ memberKey: rest.memberKey,
+ role: rest.role,
+ }
+ case 'has_member':
+ return {
+ credential,
+ groupKey: rest.groupKey,
+ memberKey: rest.memberKey,
+ }
+ default:
+ return { credential, ...rest }
+ }
+ },
+ },
+ },
+ inputs: {
+ operation: { type: 'string', description: 'Operation to perform' },
+ credential: { type: 'string', description: 'Google Workspace OAuth credential' },
+ customer: { type: 'string', description: 'Customer ID for listing groups' },
+ domain: { type: 'string', description: 'Domain filter for listing groups' },
+ query: { type: 'string', description: 'Search query for filtering groups' },
+ maxResults: { type: 'number', description: 'Maximum results to return' },
+ groupKey: { type: 'string', description: 'Group email address or ID' },
+ email: { type: 'string', description: 'Email address for new group' },
+ name: { type: 'string', description: 'Display name for group' },
+ description: { type: 'string', description: 'Group description' },
+ newName: { type: 'string', description: 'New display name for update' },
+ newEmail: { type: 'string', description: 'New email for update' },
+ memberKey: { type: 'string', description: 'Member email or ID' },
+ memberEmail: { type: 'string', description: 'Email of member to add' },
+ role: { type: 'string', description: 'Member role (MEMBER, MANAGER, OWNER)' },
+ roles: { type: 'string', description: 'Filter by roles for list members' },
+ },
+ outputs: {
+ output: { type: 'json', description: 'Google Groups API response data' },
+ },
+}
diff --git a/apps/sim/blocks/blocks/salesforce.ts b/apps/sim/blocks/blocks/salesforce.ts
index 3843777ddf..b6c9a01826 100644
--- a/apps/sim/blocks/blocks/salesforce.ts
+++ b/apps/sim/blocks/blocks/salesforce.ts
@@ -44,6 +44,17 @@ export const SalesforceBlock: BlockConfig = {
{ label: 'Create Task', id: 'create_task' },
{ label: 'Update Task', id: 'update_task' },
{ label: 'Delete Task', id: 'delete_task' },
+ { label: 'List Reports', id: 'list_reports' },
+ { label: 'Get Report', id: 'get_report' },
+ { label: 'Run Report', id: 'run_report' },
+ { label: 'List Report Types', id: 'list_report_types' },
+ { label: 'List Dashboards', id: 'list_dashboards' },
+ { label: 'Get Dashboard', id: 'get_dashboard' },
+ { label: 'Refresh Dashboard', id: 'refresh_dashboard' },
+ { label: 'Run SOQL Query', id: 'query' },
+ { label: 'Get More Query Results', id: 'query_more' },
+ { label: 'Describe Object', id: 'describe_object' },
+ { label: 'List Objects', id: 'list_objects' },
],
value: () => 'get_accounts',
},
@@ -52,7 +63,7 @@ export const SalesforceBlock: BlockConfig = {
title: 'Salesforce Account',
type: 'oauth-input',
serviceId: 'salesforce',
- requiredScopes: ['api', 'refresh_token', 'openid'],
+ requiredScopes: ['api', 'refresh_token', 'openid', 'offline_access'],
placeholder: 'Select Salesforce account',
required: true,
},
@@ -367,6 +378,77 @@ export const SalesforceBlock: BlockConfig = {
placeholder: 'Account or Opportunity ID',
condition: { field: 'operation', value: ['create_task'] },
},
+ // Report fields
+ {
+ id: 'reportId',
+ title: 'Report ID',
+ type: 'short-input',
+ placeholder: 'Report ID',
+ condition: { field: 'operation', value: ['get_report', 'run_report'] },
+ required: true,
+ },
+ {
+ id: 'folderName',
+ title: 'Folder Name',
+ type: 'short-input',
+ placeholder: 'Filter by folder name',
+ condition: { field: 'operation', value: ['list_reports', 'list_dashboards'] },
+ },
+ {
+ id: 'searchTerm',
+ title: 'Search Term',
+ type: 'short-input',
+ placeholder: 'Search reports by name',
+ condition: { field: 'operation', value: ['list_reports'] },
+ },
+ {
+ id: 'includeDetails',
+ title: 'Include Details',
+ type: 'short-input',
+ placeholder: 'Include detail rows (true/false)',
+ condition: { field: 'operation', value: ['run_report'] },
+ },
+ {
+ id: 'filters',
+ title: 'Report Filters',
+ type: 'long-input',
+ placeholder: 'JSON array of report filters',
+ condition: { field: 'operation', value: ['run_report'] },
+ },
+ // Dashboard fields
+ {
+ id: 'dashboardId',
+ title: 'Dashboard ID',
+ type: 'short-input',
+ placeholder: 'Dashboard ID',
+ condition: { field: 'operation', value: ['get_dashboard', 'refresh_dashboard'] },
+ required: true,
+ },
+ // Query fields
+ {
+ id: 'query',
+ title: 'SOQL Query',
+ type: 'long-input',
+ placeholder: 'SELECT Id, Name FROM Account LIMIT 10',
+ condition: { field: 'operation', value: ['query'] },
+ required: true,
+ },
+ {
+ id: 'nextRecordsUrl',
+ title: 'Next Records URL',
+ type: 'short-input',
+ placeholder: 'URL from previous query response',
+ condition: { field: 'operation', value: ['query_more'] },
+ required: true,
+ },
+ {
+ id: 'objectName',
+ title: 'Object Name',
+ type: 'short-input',
+ placeholder: 'API name (e.g., Account, Lead, Custom_Object__c)',
+ condition: { field: 'operation', value: ['describe_object'] },
+ required: true,
+ },
// Long-input fields at the bottom
{
id: 'description',
@@ -418,6 +500,17 @@ export const SalesforceBlock: BlockConfig = {
'salesforce_create_task',
'salesforce_update_task',
'salesforce_delete_task',
+ 'salesforce_list_reports',
+ 'salesforce_get_report',
+ 'salesforce_run_report',
+ 'salesforce_list_report_types',
+ 'salesforce_list_dashboards',
+ 'salesforce_get_dashboard',
+ 'salesforce_refresh_dashboard',
+ 'salesforce_query',
+ 'salesforce_query_more',
+ 'salesforce_describe_object',
+ 'salesforce_list_objects',
],
config: {
tool: (params) => {
@@ -470,6 +563,28 @@ export const SalesforceBlock: BlockConfig = {
return 'salesforce_update_task'
case 'delete_task':
return 'salesforce_delete_task'
+ case 'list_reports':
+ return 'salesforce_list_reports'
+ case 'get_report':
+ return 'salesforce_get_report'
+ case 'run_report':
+ return 'salesforce_run_report'
+ case 'list_report_types':
+ return 'salesforce_list_report_types'
+ case 'list_dashboards':
+ return 'salesforce_list_dashboards'
+ case 'get_dashboard':
+ return 'salesforce_get_dashboard'
+ case 'refresh_dashboard':
+ return 'salesforce_refresh_dashboard'
+ case 'query':
+ return 'salesforce_query'
+ case 'query_more':
+ return 'salesforce_query_more'
+ case 'describe_object':
+ return 'salesforce_describe_object'
+ case 'list_objects':
+ return 'salesforce_list_objects'
default:
throw new Error(`Unknown operation: ${params.operation}`)
}
diff --git a/apps/sim/blocks/registry.ts b/apps/sim/blocks/registry.ts
index 40b5ad6aad..bd76a05109 100644
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -14,6 +14,7 @@ import { ChatTriggerBlock } from '@/blocks/blocks/chat_trigger'
import { ClayBlock } from '@/blocks/blocks/clay'
import { ConditionBlock } from '@/blocks/blocks/condition'
import { ConfluenceBlock } from '@/blocks/blocks/confluence'
+import { CursorBlock } from '@/blocks/blocks/cursor'
import { DatadogBlock } from '@/blocks/blocks/datadog'
import { DiscordBlock } from '@/blocks/blocks/discord'
import { DropboxBlock } from '@/blocks/blocks/dropbox'
@@ -34,6 +35,7 @@ import { GoogleCalendarBlock } from '@/blocks/blocks/google_calendar'
import { GoogleDocsBlock } from '@/blocks/blocks/google_docs'
import { GoogleDriveBlock } from '@/blocks/blocks/google_drive'
import { GoogleFormsBlock } from '@/blocks/blocks/google_form'
+import { GoogleGroupsBlock } from '@/blocks/blocks/google_groups'
import { GoogleSheetsBlock } from '@/blocks/blocks/google_sheets'
import { GoogleSlidesBlock } from '@/blocks/blocks/google_slides'
import { GoogleVaultBlock } from '@/blocks/blocks/google_vault'
@@ -151,6 +153,7 @@ export const registry: Record = {
clay: ClayBlock,
condition: ConditionBlock,
confluence: ConfluenceBlock,
+ cursor: CursorBlock,
datadog: DatadogBlock,
discord: DiscordBlock,
dropbox: DropboxBlock,
@@ -175,6 +178,7 @@ export const registry: Record = {
google_sheets: GoogleSheetsBlock,
google_slides: GoogleSlidesBlock,
google_vault: GoogleVaultBlock,
+ google_groups: GoogleGroupsBlock,
hubspot: HubSpotBlock,
huggingface: HuggingFaceBlock,
human_in_the_loop: HumanInTheLoopBlock,
diff --git a/apps/sim/components/emails/billing/credit-purchase-email.tsx b/apps/sim/components/emails/billing/credit-purchase-email.tsx
new file mode 100644
index 0000000000..8668ef9f44
--- /dev/null
+++ b/apps/sim/components/emails/billing/credit-purchase-email.tsx
@@ -0,0 +1,125 @@
+import {
+ Body,
+ Column,
+ Container,
+ Head,
+ Hr,
+ Html,
+ Img,
+ Link,
+ Preview,
+ Row,
+ Section,
+ Text,
+} from '@react-email/components'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
+import { getBrandConfig } from '@/lib/branding/branding'
+import { getBaseUrl } from '@/lib/core/utils/urls'
+
+interface CreditPurchaseEmailProps {
+ userName?: string
+ amount: number
+ newBalance: number
+ purchaseDate?: Date
+}
+
+export function CreditPurchaseEmail({
+ userName,
+ amount,
+ newBalance,
+ purchaseDate = new Date(),
+}: CreditPurchaseEmailProps) {
+ const brand = getBrandConfig()
+ const baseUrl = getBaseUrl()
+
+ const previewText = `${brand.name}: $${amount.toFixed(2)} in credits added to your account`
+
+ return (
+
+
+ {previewText}
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ {userName ? `Hi ${userName},` : 'Hi,'}
+
+
+ Your credit purchase of ${amount.toFixed(2)} has been confirmed.
+
+
+
+ Amount Added
+
+ ${amount.toFixed(2)}
+
+ New Balance
+
+ ${newBalance.toFixed(2)}
+
+
+
+
+ These credits will be applied automatically to your workflow executions. Credits are
+ consumed before any overage charges apply.
+
+
+
+ View Dashboard
+
+
+
+ +
+ You can view your credit balance and purchase history in Settings → Subscription.
+
+
+
+ Best regards,
+
+ The Sim Team +
+
+
+ Purchased on {purchaseDate.toLocaleDateString()}
+
+
+
+ {
+ return await render(
+ CreditPurchaseEmail({
+ userName: params.userName,
+ amount: params.amount,
+ newBalance: params.newBalance,
+ purchaseDate: new Date(),
+ })
+ )
+}
diff --git a/apps/sim/components/emcn/components/code/code-optimized.tsx b/apps/sim/components/emcn/components/code/code-optimized.tsx
deleted file mode 100644
index ca76fcea8e..0000000000
--- a/apps/sim/components/emcn/components/code/code-optimized.tsx
+++ /dev/null
@@ -1,303 +0,0 @@
-'use client'
-
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { highlight, languages } from 'prismjs'
-import { List, type RowComponentProps, useDynamicRowHeight, useListRef } from 'react-window'
-import 'prismjs/components/prism-javascript'
-import 'prismjs/components/prism-python'
-import 'prismjs/components/prism-json'
-import { cn } from '@/lib/core/utils/cn'
-import { CODE_LINE_HEIGHT_PX, calculateGutterWidth } from './code'
-
-/**
- * Virtualized code viewer for large outputs.
- * Uses react-window to render only visible lines, keeping DOM minimal.
- * Supports Prism syntax highlighting, line numbers, text wrapping, and search.
- *
- * @example
- * ```tsx
- *
-}
-
-interface HighlightedLine {
- lineNumber: number
- html: string
-}
-
-interface CodeRowProps {
- lines: HighlightedLine[]
- gutterWidth: number
- showGutter: boolean
- gutterStyle?: React.CSSProperties
- leftOffset: number
- wrapText: boolean
-}
-
-function escapeRegex(str: string): string {
- return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-function countSearchMatches(code: string, searchQuery: string): number {
- if (!searchQuery.trim()) return 0
- const escaped = escapeRegex(searchQuery)
- const regex = new RegExp(escaped, 'gi')
- const matches = code.match(regex)
- return matches?.length ?? 0
-}
-
-function applySearchHighlightingToLine(
- html: string,
- searchQuery: string,
- currentMatchIndex: number,
- globalMatchOffset: number
-): { html: string; matchesInLine: number } {
- if (!searchQuery.trim()) return { html, matchesInLine: 0 }
-
- const escaped = escapeRegex(searchQuery)
- const regex = new RegExp(`(${escaped})`, 'gi')
- const parts = html.split(/(<[^>]+>)/g)
- let matchesInLine = 0
-
- const result = parts
- .map((part) => {
- if (part.startsWith('<') && part.endsWith('>')) {
- return part
- }
- return part.replace(regex, (match) => {
- const globalIndex = globalMatchOffset + matchesInLine
- const isCurrentMatch = globalIndex === currentMatchIndex
- matchesInLine++
-
- const bgClass = isCurrentMatch
- ? 'bg-[#F6AD55] text-[#1a1a1a] dark:bg-[#F6AD55] dark:text-[#1a1a1a]'
- : 'bg-[#FCD34D]/40 dark:bg-[#FCD34D]/30'
-
- return `${match}`
- })
- })
- .join('')
-
- return { html: result, matchesInLine }
-}
-
-function CodeRow({ index, style, ...props }: RowComponentProps) {
- const { lines, gutterWidth, showGutter, gutterStyle, leftOffset, wrapText } = props
- const line = lines[index]
-
- return (
- (null)
- const listRef = useListRef(null)
- const [containerHeight, setContainerHeight] = useState(400)
-
- const dynamicRowHeight = useDynamicRowHeight({
- defaultRowHeight: CODE_LINE_HEIGHT_PX,
- key: wrapText ? 'wrap' : 'nowrap',
- })
-
- const matchCount = useMemo(() => countSearchMatches(code, searchQuery || ''), [code, searchQuery])
-
- useEffect(() => {
- onMatchCountChange?.(matchCount)
- }, [matchCount, onMatchCountChange])
-
- const lines = useMemo(() => code.split('\n'), [code])
- const lineCount = lines.length
- const gutterWidth = useMemo(() => calculateGutterWidth(lineCount), [lineCount])
-
- const highlightedLines = useMemo(() => {
- const lang = languages[language] || languages.javascript
- return lines.map((line, idx) => ({
- lineNumber: idx + 1,
- html: highlight(line, lang, language),
- }))
- }, [lines, language])
-
- const matchOffsets = useMemo(() => {
- if (!searchQuery?.trim()) return []
- const offsets: number[] = []
- let cumulative = 0
- const escaped = escapeRegex(searchQuery)
- const regex = new RegExp(escaped, 'gi')
-
- for (const line of lines) {
- offsets.push(cumulative)
- const matches = line.match(regex)
- cumulative += matches?.length ?? 0
- }
- return offsets
- }, [lines, searchQuery])
-
- const linesWithSearch = useMemo(() => {
- if (!searchQuery?.trim()) return highlightedLines
-
- return highlightedLines.map((line, idx) => {
- const { html } = applySearchHighlightingToLine(
- line.html,
- searchQuery,
- currentMatchIndex,
- matchOffsets[idx]
- )
- return { ...line, html }
- })
- }, [highlightedLines, searchQuery, currentMatchIndex, matchOffsets])
-
- useEffect(() => {
- if (!searchQuery?.trim() || matchCount === 0 || !listRef.current) return
-
- let accumulated = 0
- for (let i = 0; i < matchOffsets.length; i++) {
- const matchesInThisLine = (matchOffsets[i + 1] ?? matchCount) - matchOffsets[i]
- if (currentMatchIndex >= accumulated && currentMatchIndex < accumulated + matchesInThisLine) {
- listRef.current.scrollToRow({ index: i, align: 'center' })
- break
- }
- accumulated += matchesInThisLine
- }
- }, [currentMatchIndex, searchQuery, matchCount, matchOffsets, listRef])
-
- useEffect(() => {
- const container = containerRef.current
- if (!container) return
-
- const parent = container.parentElement
- if (!parent) return
-
- const updateHeight = () => {
- setContainerHeight(parent.clientHeight)
- }
-
- updateHeight()
-
- const resizeObserver = new ResizeObserver(updateHeight)
- resizeObserver.observe(parent)
-
- return () => resizeObserver.disconnect()
- }, [])
-
- useEffect(() => {
- if (!wrapText) return
-
- const container = containerRef.current
- if (!container) return
-
- const rows = container.querySelectorAll('[data-row-index]')
- if (rows.length === 0) return
-
- return dynamicRowHeight.observeRowElements(rows)
- }, [wrapText, dynamicRowHeight, linesWithSearch])
-
- const setRefs = useCallback(
- (el: HTMLDivElement | null) => {
- containerRef.current = el
- if (contentRef && 'current' in contentRef) {
- contentRef.current = el
- }
- },
- [contentRef]
- )
-
- const rowProps = useMemo(
- () => ({
- lines: linesWithSearch,
- gutterWidth,
- showGutter,
- gutterStyle,
- leftOffset: paddingLeft,
- wrapText,
- }),
- [linesWithSearch, gutterWidth, showGutter, gutterStyle, paddingLeft, wrapText]
- )
-
- return (
- ) {
+ const { lines, gutterWidth, showGutter, gutterStyle, leftOffset, wrapText } = props
+ const line = lines[index]
+
+ return (
+
+ /** Enable virtualized rendering for large outputs (uses react-window) */
+ virtualized?: boolean
}
/**
@@ -353,6 +450,187 @@ function countSearchMatches(code: string, searchQuery: string): number {
return matches?.length ?? 0
}
+/**
+ * Props for inner viewer components (with defaults already applied).
+ */
+type ViewerInnerProps = {
+ code: string
+ showGutter: boolean
+ language: 'javascript' | 'json' | 'python'
+ className?: string
+ paddingLeft: number
+ gutterStyle?: React.CSSProperties
+ wrapText: boolean
+ searchQuery?: string
+ currentMatchIndex: number
+ onMatchCountChange?: (count: number) => void
+ contentRef?: React.RefObject
+}
+
+/**
+ * Virtualized code viewer implementation using react-window.
+ */
+const VirtualizedViewerInner = memo(function VirtualizedViewerInner({
+ code,
+ showGutter,
+ language,
+ className,
+ paddingLeft,
+ gutterStyle,
+ wrapText,
+ searchQuery,
+ currentMatchIndex,
+ onMatchCountChange,
+ contentRef,
+}: ViewerInnerProps) {
+ const containerRef = useRef(null)
+ const listRef = useListRef(null)
+ const [containerHeight, setContainerHeight] = useState(400)
+
+ const dynamicRowHeight = useDynamicRowHeight({
+ defaultRowHeight: CODE_LINE_HEIGHT_PX,
+ key: wrapText ? 'wrap' : 'nowrap',
+ })
+
+ const matchCount = useMemo(() => countSearchMatches(code, searchQuery || ''), [code, searchQuery])
+
+ useEffect(() => {
+ onMatchCountChange?.(matchCount)
+ }, [matchCount, onMatchCountChange])
+
+ const lines = useMemo(() => code.split('\n'), [code])
+ const lineCount = lines.length
+ const gutterWidth = useMemo(() => calculateGutterWidth(lineCount), [lineCount])
+
+ const highlightedLines = useMemo(() => {
+ const lang = languages[language] || languages.javascript
+ return lines.map((line, idx) => ({
+ lineNumber: idx + 1,
+ html: highlight(line, lang, language),
+ }))
+ }, [lines, language])
+
+ const matchOffsets = useMemo(() => {
+ if (!searchQuery?.trim()) return []
+ const offsets: number[] = []
+ let cumulative = 0
+ const escaped = escapeRegex(searchQuery)
+ const regex = new RegExp(escaped, 'gi')
+
+ for (const line of lines) {
+ offsets.push(cumulative)
+ const matches = line.match(regex)
+ cumulative += matches?.length ?? 0
+ }
+ return offsets
+ }, [lines, searchQuery])
+
+ const linesWithSearch = useMemo(() => {
+ if (!searchQuery?.trim()) return highlightedLines
+
+ return highlightedLines.map((line, idx) => {
+ const { html } = applySearchHighlightingToLine(
+ line.html,
+ searchQuery,
+ currentMatchIndex,
+ matchOffsets[idx]
+ )
+ return { ...line, html }
+ })
+ }, [highlightedLines, searchQuery, currentMatchIndex, matchOffsets])
+
+ useEffect(() => {
+ if (!searchQuery?.trim() || matchCount === 0 || !listRef.current) return
+
+ let accumulated = 0
+ for (let i = 0; i < matchOffsets.length; i++) {
+ const matchesInThisLine = (matchOffsets[i + 1] ?? matchCount) - matchOffsets[i]
+ if (currentMatchIndex >= accumulated && currentMatchIndex < accumulated + matchesInThisLine) {
+ listRef.current.scrollToRow({ index: i, align: 'center' })
+ break
+ }
+ accumulated += matchesInThisLine
+ }
+ }, [currentMatchIndex, searchQuery, matchCount, matchOffsets, listRef])
+
+ useEffect(() => {
+ const container = containerRef.current
+ if (!container) return
+
+ const parent = container.parentElement
+ if (!parent) return
+
+ const updateHeight = () => {
+ setContainerHeight(parent.clientHeight)
+ }
+
+ updateHeight()
+
+ const resizeObserver = new ResizeObserver(updateHeight)
+ resizeObserver.observe(parent)
+
+ return () => resizeObserver.disconnect()
+ }, [])
+
+ useEffect(() => {
+ if (!wrapText) return
+
+ const container = containerRef.current
+ if (!container) return
+
+ const rows = container.querySelectorAll('[data-row-index]')
+ if (rows.length === 0) return
+
+ return dynamicRowHeight.observeRowElements(rows)
+ }, [wrapText, dynamicRowHeight, linesWithSearch])
+
+ const setRefs = useCallback(
+ (el: HTMLDivElement | null) => {
+ containerRef.current = el
+ if (contentRef && 'current' in contentRef) {
+ contentRef.current = el
+ }
+ },
+ [contentRef]
+ )
+
+ const rowProps = useMemo(
+ () => ({
+ lines: linesWithSearch,
+ gutterWidth,
+ showGutter,
+ gutterStyle,
+ leftOffset: paddingLeft,
+ wrapText,
+ }),
+ [linesWithSearch, gutterWidth, showGutter, gutterStyle, paddingLeft, wrapText]
+ )
+
+ return (
+ ) {
)
}
+
+export function GoogleGroupsIcon(props: SVGProps) {
+ return (
+
+ )
+}
+
+export function CursorIcon(props: SVGProps) {
+ return (
+
+ )
+}
diff --git a/apps/sim/executor/consts.ts b/apps/sim/executor/constants.ts
similarity index 100%
rename from apps/sim/executor/consts.ts
rename to apps/sim/executor/constants.ts
diff --git a/apps/sim/executor/dag/builder.pause-resume.test.ts b/apps/sim/executor/dag/builder.test.ts
similarity index 97%
rename from apps/sim/executor/dag/builder.pause-resume.test.ts
rename to apps/sim/executor/dag/builder.test.ts
index bd2e60f0c4..27440aadb3 100644
--- a/apps/sim/executor/dag/builder.pause-resume.test.ts
+++ b/apps/sim/executor/dag/builder.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from 'vitest'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { DAGBuilder } from '@/executor/dag/builder'
import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'
diff --git a/apps/sim/executor/dag/construction/edges.ts b/apps/sim/executor/dag/construction/edges.ts
index 7d442b0078..821fc29523 100644
--- a/apps/sim/executor/dag/construction/edges.ts
+++ b/apps/sim/executor/dag/construction/edges.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { EDGE, isConditionBlockType, isRouterBlockType } from '@/executor/consts'
+import { EDGE, isConditionBlockType, isRouterBlockType } from '@/executor/constants'
import type { DAG } from '@/executor/dag/builder'
import {
buildBranchNodeId,
diff --git a/apps/sim/executor/dag/construction/loops.ts b/apps/sim/executor/dag/construction/loops.ts
index ad1069083c..75cf6a739d 100644
--- a/apps/sim/executor/dag/construction/loops.ts
+++ b/apps/sim/executor/dag/construction/loops.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { BlockType, LOOP, type SentinelType } from '@/executor/consts'
+import { BlockType, LOOP, type SentinelType } from '@/executor/constants'
import type { DAG, DAGNode } from '@/executor/dag/builder'
import { buildSentinelEndId, buildSentinelStartId } from '@/executor/utils/subflow-utils'
diff --git a/apps/sim/executor/dag/construction/nodes.ts b/apps/sim/executor/dag/construction/nodes.ts
index ee5fd1cf49..b4ceeb1ae5 100644
--- a/apps/sim/executor/dag/construction/nodes.ts
+++ b/apps/sim/executor/dag/construction/nodes.ts
@@ -1,4 +1,4 @@
-import { BlockType, isMetadataOnlyBlockType } from '@/executor/consts'
+import { BlockType, isMetadataOnlyBlockType } from '@/executor/constants'
import type { DAG, DAGNode } from '@/executor/dag/builder'
import {
buildBranchNodeId,
diff --git a/apps/sim/executor/dag/construction/paths.ts b/apps/sim/executor/dag/construction/paths.ts
index ec7ea48836..1d41436c7b 100644
--- a/apps/sim/executor/dag/construction/paths.ts
+++ b/apps/sim/executor/dag/construction/paths.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { isMetadataOnlyBlockType, isTriggerBlockType } from '@/executor/consts'
+import { isMetadataOnlyBlockType, isTriggerBlockType } from '@/executor/constants'
import { extractBaseBlockId } from '@/executor/utils/subflow-utils'
import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'
diff --git a/apps/sim/executor/execution/block-executor.ts b/apps/sim/executor/execution/block-executor.ts
index 5949b41cf4..977b55cb44 100644
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -7,7 +7,7 @@ import {
DEFAULTS,
EDGE,
isSentinelBlockType,
-} from '@/executor/consts'
+} from '@/executor/constants'
import type { DAGNode } from '@/executor/dag/builder'
import type { BlockStateWriter, ContextExtensions } from '@/executor/execution/types'
import {
diff --git a/apps/sim/executor/execution/edge-manager.ts b/apps/sim/executor/execution/edge-manager.ts
index 7457be8cb5..0b707dacd2 100644
--- a/apps/sim/executor/execution/edge-manager.ts
+++ b/apps/sim/executor/execution/edge-manager.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { EDGE } from '@/executor/consts'
+import { EDGE } from '@/executor/constants'
import type { DAG, DAGNode } from '@/executor/dag/builder'
import type { DAGEdge } from '@/executor/dag/types'
import type { NormalizedBlockOutput } from '@/executor/types'
diff --git a/apps/sim/executor/execution/engine.ts b/apps/sim/executor/execution/engine.ts
index 9deab28cc1..68c471d8cb 100644
--- a/apps/sim/executor/execution/engine.ts
+++ b/apps/sim/executor/execution/engine.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import type { DAG } from '@/executor/dag/builder'
import type { EdgeManager } from '@/executor/execution/edge-manager'
import { serializePauseSnapshot } from '@/executor/execution/snapshot-serializer'
diff --git a/apps/sim/executor/handlers/agent/agent-handler.test.ts b/apps/sim/executor/handlers/agent/agent-handler.test.ts
index 72df94c722..1a4becfc75 100644
--- a/apps/sim/executor/handlers/agent/agent-handler.test.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.test.ts
@@ -1,7 +1,7 @@
import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
import { isHosted } from '@/lib/core/config/environment'
import { getAllBlocks } from '@/blocks'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { AgentBlockHandler } from '@/executor/handlers/agent/agent-handler'
import type { ExecutionContext, StreamingExecution } from '@/executor/types'
import { executeProviderRequest } from '@/providers'
diff --git a/apps/sim/executor/handlers/agent/agent-handler.ts b/apps/sim/executor/handlers/agent/agent-handler.ts
index 32fd0a5aab..ae561ee3a2 100644
--- a/apps/sim/executor/handlers/agent/agent-handler.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@/lib/logs/console/logger'
import { createMcpToolId } from '@/lib/mcp/utils'
import { getAllBlocks } from '@/blocks'
import type { BlockOutput } from '@/blocks/types'
-import { AGENT, BlockType, DEFAULTS, HTTP } from '@/executor/consts'
+import { AGENT, BlockType, DEFAULTS, HTTP } from '@/executor/constants'
import { memoryService } from '@/executor/handlers/agent/memory'
import type {
AgentInputs,
diff --git a/apps/sim/executor/handlers/api/api-handler.test.ts b/apps/sim/executor/handlers/api/api-handler.test.ts
index 8cec4c6e25..2a5303b9a5 100644
--- a/apps/sim/executor/handlers/api/api-handler.test.ts
+++ b/apps/sim/executor/handlers/api/api-handler.test.ts
@@ -1,7 +1,7 @@
import '@/executor/__test-utils__/mock-dependencies'
import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { ApiBlockHandler } from '@/executor/handlers/api/api-handler'
import type { ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/api/api-handler.ts b/apps/sim/executor/handlers/api/api-handler.ts
index d2f0aed22e..8bfbdbcd8c 100644
--- a/apps/sim/executor/handlers/api/api-handler.ts
+++ b/apps/sim/executor/handlers/api/api-handler.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { BlockType, HTTP } from '@/executor/consts'
+import { BlockType, HTTP } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
import { executeTool } from '@/tools'
diff --git a/apps/sim/executor/handlers/condition/condition-handler.test.ts b/apps/sim/executor/handlers/condition/condition-handler.test.ts
index b82d909d4c..07805b7517 100644
--- a/apps/sim/executor/handlers/condition/condition-handler.test.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.test.ts
@@ -1,7 +1,7 @@
import '@/executor/__test-utils__/mock-dependencies'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { ConditionBlockHandler } from '@/executor/handlers/condition/condition-handler'
import type { BlockState, ExecutionContext } from '@/executor/types'
import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'
@@ -365,7 +365,7 @@ describe('ConditionBlockHandler', () => {
)
})
- it('should throw error if no condition matches and no else exists', async () => {
+ it('should return no-match result if no condition matches and no else exists', async () => {
const conditions = [
{ id: 'cond1', title: 'if', value: 'false' },
{ id: 'cond2', title: 'else if', value: 'context.value === 99' },
@@ -392,9 +392,15 @@ describe('ConditionBlockHandler', () => {
.mockReturnValueOnce('false')
.mockReturnValueOnce('context.value === 99')
- await expect(handler.execute(mockContext, mockBlock, inputs)).rejects.toThrow(
- `No matching path found for condition block "${mockBlock.metadata?.name}", and no 'else' block exists.`
- )
+ const result = await handler.execute(mockContext, mockBlock, inputs)
+
+ // Should return success with no path selected (branch ends gracefully)
+ expect((result as any).conditionResult).toBe(false)
+ expect((result as any).selectedPath).toBeNull()
+ expect((result as any).selectedConditionId).toBeNull()
+ expect((result as any).selectedOption).toBeNull()
+ // Decision should not be set when no condition matches
+ expect(mockContext.decisions.condition.has(mockBlock.id)).toBe(false)
})
it('falls back to else path when loop context data is unavailable', async () => {
diff --git a/apps/sim/executor/handlers/condition/condition-handler.ts b/apps/sim/executor/handlers/condition/condition-handler.ts
index 902c684985..c6cc0db62c 100644
--- a/apps/sim/executor/handlers/condition/condition-handler.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.ts
@@ -1,6 +1,6 @@
import { createLogger } from '@/lib/logs/console/logger'
import type { BlockOutput } from '@/blocks/types'
-import { BlockType, CONDITION, DEFAULTS, EDGE } from '@/executor/consts'
+import { BlockType, CONDITION, DEFAULTS, EDGE } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
@@ -87,6 +87,17 @@ export class ConditionBlockHandler implements BlockHandler {
block
)
+ // Handle case where no condition matched and no else exists - branch ends gracefully
+ if (!selectedConnection || !selectedCondition) {
+ return {
+ ...((sourceOutput as any) || {}),
+ conditionResult: false,
+ selectedPath: null,
+ selectedConditionId: null,
+ selectedOption: null,
+ }
+ }
+
const targetBlock = ctx.workflow?.blocks.find((b) => b.id === selectedConnection?.target)
if (!targetBlock) {
throw new Error(`Target block ${selectedConnection?.target} not found`)
@@ -145,8 +156,8 @@ export class ConditionBlockHandler implements BlockHandler {
ctx: ExecutionContext,
block: SerializedBlock
): Promise<{
- selectedConnection: { target: string; sourceHandle?: string }
- selectedCondition: { id: string; title: string; value: string }
+ selectedConnection: { target: string; sourceHandle?: string } | null
+ selectedCondition: { id: string; title: string; value: string } | null
}> {
for (const condition of conditions) {
if (condition.title === CONDITION.ELSE_TITLE) {
@@ -185,14 +196,16 @@ export class ConditionBlockHandler implements BlockHandler {
if (elseConnection) {
return { selectedConnection: elseConnection, selectedCondition: elseCondition }
}
- throw new Error(
- `No path found for condition block "${block.metadata?.name}", and 'else' connection missing.`
- )
+ // Else exists but has no connection - treat as no match, branch ends
+ logger.info(`No condition matched and else has no connection - branch ending`, {
+ blockId: block.id,
+ })
+ return { selectedConnection: null, selectedCondition: null }
}
- throw new Error(
- `No matching path found for condition block "${block.metadata?.name}", and no 'else' block exists.`
- )
+ // No condition matched and no else exists - branch ends gracefully
+ logger.info(`No condition matched and no else block - branch ending`, { blockId: block.id })
+ return { selectedConnection: null, selectedCondition: null }
}
private findConnectionForCondition(
diff --git a/apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts b/apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts
index b5fcfc2c34..0acdcc41c5 100644
--- a/apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts
+++ b/apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts
@@ -1,7 +1,7 @@
import '@/executor/__test-utils__/mock-dependencies'
import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { EvaluatorBlockHandler } from '@/executor/handlers/evaluator/evaluator-handler'
import type { ExecutionContext } from '@/executor/types'
import { getProviderFromModel } from '@/providers/utils'
diff --git a/apps/sim/executor/handlers/evaluator/evaluator-handler.ts b/apps/sim/executor/handlers/evaluator/evaluator-handler.ts
index 8beff8faa2..2e97298818 100644
--- a/apps/sim/executor/handlers/evaluator/evaluator-handler.ts
+++ b/apps/sim/executor/handlers/evaluator/evaluator-handler.ts
@@ -1,6 +1,6 @@
import { createLogger } from '@/lib/logs/console/logger'
import type { BlockOutput } from '@/blocks/types'
-import { BlockType, DEFAULTS, EVALUATOR, HTTP } from '@/executor/consts'
+import { BlockType, DEFAULTS, EVALUATOR, HTTP } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import { buildAPIUrl, extractAPIErrorMessage } from '@/executor/utils/http'
import { isJSONString, parseJSON, stringifyJSON } from '@/executor/utils/json'
diff --git a/apps/sim/executor/handlers/function/function-handler.test.ts b/apps/sim/executor/handlers/function/function-handler.test.ts
index a200211f77..f8d96c6ada 100644
--- a/apps/sim/executor/handlers/function/function-handler.test.ts
+++ b/apps/sim/executor/handlers/function/function-handler.test.ts
@@ -1,6 +1,6 @@
import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/execution/constants'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { FunctionBlockHandler } from '@/executor/handlers/function/function-handler'
import type { ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/function/function-handler.ts b/apps/sim/executor/handlers/function/function-handler.ts
index a3de3973ac..2c240facdd 100644
--- a/apps/sim/executor/handlers/function/function-handler.ts
+++ b/apps/sim/executor/handlers/function/function-handler.ts
@@ -1,6 +1,6 @@
import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/execution/constants'
import { DEFAULT_CODE_LANGUAGE } from '@/lib/execution/languages'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import { collectBlockData } from '@/executor/utils/block-data'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/generic/generic-handler.test.ts b/apps/sim/executor/handlers/generic/generic-handler.test.ts
index e1174a2af7..042592b81f 100644
--- a/apps/sim/executor/handlers/generic/generic-handler.test.ts
+++ b/apps/sim/executor/handlers/generic/generic-handler.test.ts
@@ -1,7 +1,7 @@
import '@/executor/__test-utils__/mock-dependencies'
import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { GenericBlockHandler } from '@/executor/handlers/generic/generic-handler'
import type { ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts b/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
index be354f5920..d79db474f2 100644
--- a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
+++ b/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
@@ -8,7 +8,7 @@ import {
type FieldType,
HTTP,
PAUSE_RESUME,
-} from '@/executor/consts'
+} from '@/executor/constants'
import {
generatePauseContextId,
mapNodeMetadataToPauseScopes,
diff --git a/apps/sim/executor/handlers/response/response-handler.ts b/apps/sim/executor/handlers/response/response-handler.ts
index db6c79b667..1af1bd9f3c 100644
--- a/apps/sim/executor/handlers/response/response-handler.ts
+++ b/apps/sim/executor/handlers/response/response-handler.ts
@@ -1,6 +1,6 @@
import { createLogger } from '@/lib/logs/console/logger'
import type { BlockOutput } from '@/blocks/types'
-import { BlockType, HTTP } from '@/executor/consts'
+import { BlockType, HTTP } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/router/router-handler.test.ts b/apps/sim/executor/handlers/router/router-handler.test.ts
index 5c517b352e..eb3cc73337 100644
--- a/apps/sim/executor/handlers/router/router-handler.test.ts
+++ b/apps/sim/executor/handlers/router/router-handler.test.ts
@@ -2,7 +2,7 @@ import '@/executor/__test-utils__/mock-dependencies'
import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
import { generateRouterPrompt } from '@/blocks/blocks/router'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { RouterBlockHandler } from '@/executor/handlers/router/router-handler'
import type { ExecutionContext } from '@/executor/types'
import { getProviderFromModel } from '@/providers/utils'
diff --git a/apps/sim/executor/handlers/router/router-handler.ts b/apps/sim/executor/handlers/router/router-handler.ts
index cc21c2132c..327d490f35 100644
--- a/apps/sim/executor/handlers/router/router-handler.ts
+++ b/apps/sim/executor/handlers/router/router-handler.ts
@@ -2,7 +2,7 @@ import { getBaseUrl } from '@/lib/core/utils/urls'
import { createLogger } from '@/lib/logs/console/logger'
import { generateRouterPrompt } from '@/blocks/blocks/router'
import type { BlockOutput } from '@/blocks/types'
-import { BlockType, DEFAULTS, HTTP, isAgentBlockType, ROUTER } from '@/executor/consts'
+import { BlockType, DEFAULTS, HTTP, isAgentBlockType, ROUTER } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import { calculateCost, getProviderFromModel } from '@/providers/utils'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/trigger/trigger-handler.ts b/apps/sim/executor/handlers/trigger/trigger-handler.ts
index 1b53cd8641..5999892136 100644
--- a/apps/sim/executor/handlers/trigger/trigger-handler.ts
+++ b/apps/sim/executor/handlers/trigger/trigger-handler.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/variables/variables-handler.ts b/apps/sim/executor/handlers/variables/variables-handler.ts
index c5d4b59a90..8bebe483ef 100644
--- a/apps/sim/executor/handlers/variables/variables-handler.ts
+++ b/apps/sim/executor/handlers/variables/variables-handler.ts
@@ -1,6 +1,6 @@
import { createLogger } from '@/lib/logs/console/logger'
import type { BlockOutput } from '@/blocks/types'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/wait/wait-handler.ts b/apps/sim/executor/handlers/wait/wait-handler.ts
index dbaf47b3b3..5b7545a904 100644
--- a/apps/sim/executor/handlers/wait/wait-handler.ts
+++ b/apps/sim/executor/handlers/wait/wait-handler.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import type { BlockHandler, ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts b/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
index e818e38cec..bf304c786d 100644
--- a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
@@ -1,5 +1,5 @@
import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
-import { BlockType } from '@/executor/consts'
+import { BlockType } from '@/executor/constants'
import { WorkflowBlockHandler } from '@/executor/handlers/workflow/workflow-handler'
import type { ExecutionContext } from '@/executor/types'
import type { SerializedBlock } from '@/serializer/types'
diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.ts b/apps/sim/executor/handlers/workflow/workflow-handler.ts
index fa0cb6b7e1..bc021d620b 100644
--- a/apps/sim/executor/handlers/workflow/workflow-handler.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.ts
@@ -3,7 +3,7 @@ import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
import type { TraceSpan } from '@/lib/logs/types'
import type { BlockOutput } from '@/blocks/types'
import { Executor } from '@/executor'
-import { BlockType, DEFAULTS, HTTP } from '@/executor/consts'
+import { BlockType, DEFAULTS, HTTP } from '@/executor/constants'
import type {
BlockHandler,
ExecutionContext,
diff --git a/apps/sim/executor/human-in-the-loop/utils.ts b/apps/sim/executor/human-in-the-loop/utils.ts
index d2b05395dd..1b060cf833 100644
--- a/apps/sim/executor/human-in-the-loop/utils.ts
+++ b/apps/sim/executor/human-in-the-loop/utils.ts
@@ -1,4 +1,4 @@
-import { PARALLEL } from '@/executor/consts'
+import { PARALLEL } from '@/executor/constants'
import type { ExecutionContext, LoopPauseScope, ParallelPauseScope } from '@/executor/types'
interface NodeMetadataLike {
diff --git a/apps/sim/executor/orchestrators/loop.ts b/apps/sim/executor/orchestrators/loop.ts
index e7a0557060..500a2ec83d 100644
--- a/apps/sim/executor/orchestrators/loop.ts
+++ b/apps/sim/executor/orchestrators/loop.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { buildLoopIndexCondition, DEFAULTS, EDGE } from '@/executor/consts'
+import { buildLoopIndexCondition, DEFAULTS, EDGE } from '@/executor/constants'
import type { DAG } from '@/executor/dag/builder'
import type { LoopScope } from '@/executor/execution/state'
import type { BlockStateController } from '@/executor/execution/types'
diff --git a/apps/sim/executor/orchestrators/node.ts b/apps/sim/executor/orchestrators/node.ts
index 20fd272143..c3e50e9570 100644
--- a/apps/sim/executor/orchestrators/node.ts
+++ b/apps/sim/executor/orchestrators/node.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { EDGE } from '@/executor/consts'
+import { EDGE } from '@/executor/constants'
import type { DAG, DAGNode } from '@/executor/dag/builder'
import type { BlockExecutor } from '@/executor/execution/block-executor'
import type { BlockStateController } from '@/executor/execution/types'
diff --git a/apps/sim/executor/utils/http.ts b/apps/sim/executor/utils/http.ts
index d9db5a1fd9..5562e45674 100644
--- a/apps/sim/executor/utils/http.ts
+++ b/apps/sim/executor/utils/http.ts
@@ -1,6 +1,6 @@
import { generateInternalToken } from '@/lib/auth/internal'
import { getBaseUrl } from '@/lib/core/utils/urls'
-import { HTTP } from '@/executor/consts'
+import { HTTP } from '@/executor/constants'
export async function buildAuthHeaders(): Promise> {
const headers: Record = {
diff --git a/apps/sim/executor/utils/json.ts b/apps/sim/executor/utils/json.ts
index 9ef6d3932d..d2e08136e7 100644
--- a/apps/sim/executor/utils/json.ts
+++ b/apps/sim/executor/utils/json.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { EVALUATOR } from '@/executor/consts'
+import { EVALUATOR } from '@/executor/constants'
const logger = createLogger('JSONUtils')
diff --git a/apps/sim/executor/utils/reference-validation.ts b/apps/sim/executor/utils/reference-validation.ts
index d1f72ce0c1..ce569561c1 100644
--- a/apps/sim/executor/utils/reference-validation.ts
+++ b/apps/sim/executor/utils/reference-validation.ts
@@ -1,5 +1,5 @@
import { isLikelyReferenceSegment } from '@/lib/workflows/sanitization/references'
-import { REFERENCE } from '@/executor/consts'
+import { REFERENCE } from '@/executor/constants'
/**
* Creates a regex pattern for matching variable references.
diff --git a/apps/sim/executor/utils/subflow-utils.ts b/apps/sim/executor/utils/subflow-utils.ts
index 7218654f77..c881adf26c 100644
--- a/apps/sim/executor/utils/subflow-utils.ts
+++ b/apps/sim/executor/utils/subflow-utils.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { LOOP, PARALLEL, PARSING, REFERENCE } from '@/executor/consts'
+import { LOOP, PARALLEL, PARSING, REFERENCE } from '@/executor/constants'
import type { SerializedParallel } from '@/serializer/types'
const logger = createLogger('SubflowUtils')
@@ -10,14 +10,8 @@ const SENTINEL_START_PATTERN = new RegExp(
`${LOOP.SENTINEL.PREFIX}(.+)${LOOP.SENTINEL.START_SUFFIX}`
)
const SENTINEL_END_PATTERN = new RegExp(`${LOOP.SENTINEL.PREFIX}(.+)${LOOP.SENTINEL.END_SUFFIX}`)
-/**
- * ==================
- * LOOP UTILITIES
- * ==================
- */
-/**
- * Build sentinel start node ID
- */
+
+/** Build sentinel start node ID */
export function buildSentinelStartId(loopId: string): string {
return `${LOOP.SENTINEL.PREFIX}${loopId}${LOOP.SENTINEL.START_SUFFIX}`
}
@@ -41,11 +35,7 @@ export function extractLoopIdFromSentinel(sentinelId: string): string | null {
if (endMatch) return endMatch[1]
return null
}
-/**
- * ==================
- * PARALLEL UTILITIES
- * ==================
- */
+
/**
* Parse distribution items from parallel config
* Handles: arrays, JSON strings, and references
diff --git a/apps/sim/executor/variables/resolver.ts b/apps/sim/executor/variables/resolver.ts
index d5aa1dfbab..bcf34d82e4 100644
--- a/apps/sim/executor/variables/resolver.ts
+++ b/apps/sim/executor/variables/resolver.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { BlockType, REFERENCE } from '@/executor/consts'
+import { BlockType, REFERENCE } from '@/executor/constants'
import type { ExecutionState, LoopScope } from '@/executor/execution/state'
import type { ExecutionContext } from '@/executor/types'
import { replaceValidReferences } from '@/executor/utils/reference-validation'
diff --git a/apps/sim/executor/variables/resolvers/block.ts b/apps/sim/executor/variables/resolvers/block.ts
index f09a258e65..bc676ab78c 100644
--- a/apps/sim/executor/variables/resolvers/block.ts
+++ b/apps/sim/executor/variables/resolvers/block.ts
@@ -1,4 +1,4 @@
-import { isReference, parseReferencePath, SPECIAL_REFERENCE_PREFIXES } from '@/executor/consts'
+import { isReference, parseReferencePath, SPECIAL_REFERENCE_PREFIXES } from '@/executor/constants'
import {
navigatePath,
type ResolutionContext,
diff --git a/apps/sim/executor/variables/resolvers/env.ts b/apps/sim/executor/variables/resolvers/env.ts
index 1c97128e27..485b23589b 100644
--- a/apps/sim/executor/variables/resolvers/env.ts
+++ b/apps/sim/executor/variables/resolvers/env.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { extractEnvVarName, isEnvVarReference } from '@/executor/consts'
+import { extractEnvVarName, isEnvVarReference } from '@/executor/constants'
import type { ResolutionContext, Resolver } from '@/executor/variables/resolvers/reference'
const logger = createLogger('EnvResolver')
diff --git a/apps/sim/executor/variables/resolvers/loop.ts b/apps/sim/executor/variables/resolvers/loop.ts
index a406bab8fb..416f684e3e 100644
--- a/apps/sim/executor/variables/resolvers/loop.ts
+++ b/apps/sim/executor/variables/resolvers/loop.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { isReference, parseReferencePath, REFERENCE } from '@/executor/consts'
+import { isReference, parseReferencePath, REFERENCE } from '@/executor/constants'
import { extractBaseBlockId } from '@/executor/utils/subflow-utils'
import {
navigatePath,
diff --git a/apps/sim/executor/variables/resolvers/parallel.ts b/apps/sim/executor/variables/resolvers/parallel.ts
index ce6a5523b9..447e398174 100644
--- a/apps/sim/executor/variables/resolvers/parallel.ts
+++ b/apps/sim/executor/variables/resolvers/parallel.ts
@@ -1,5 +1,5 @@
import { createLogger } from '@/lib/logs/console/logger'
-import { isReference, parseReferencePath, REFERENCE } from '@/executor/consts'
+import { isReference, parseReferencePath, REFERENCE } from '@/executor/constants'
import { extractBaseBlockId, extractBranchIndex } from '@/executor/utils/subflow-utils'
import {
navigatePath,
diff --git a/apps/sim/executor/variables/resolvers/workflow.ts b/apps/sim/executor/variables/resolvers/workflow.ts
index e1c7536827..b5ac6b9887 100644
--- a/apps/sim/executor/variables/resolvers/workflow.ts
+++ b/apps/sim/executor/variables/resolvers/workflow.ts
@@ -1,6 +1,6 @@
import { createLogger } from '@/lib/logs/console/logger'
import { VariableManager } from '@/lib/workflows/variables/variable-manager'
-import { isReference, parseReferencePath, REFERENCE } from '@/executor/consts'
+import { isReference, parseReferencePath, REFERENCE } from '@/executor/constants'
import {
navigatePath,
type ResolutionContext,
diff --git a/apps/sim/hooks/use-trigger-config-aggregation.ts b/apps/sim/hooks/use-trigger-config-aggregation.ts
index 470845aede..801e2a40ea 100644
--- a/apps/sim/hooks/use-trigger-config-aggregation.ts
+++ b/apps/sim/hooks/use-trigger-config-aggregation.ts
@@ -1,7 +1,7 @@
import { createLogger } from '@/lib/logs/console/logger'
import { useSubBlockStore } from '@/stores/workflows/subblock/store'
import { getTrigger, isTriggerValid } from '@/triggers'
-import { SYSTEM_SUBBLOCK_IDS } from '@/triggers/consts'
+import { SYSTEM_SUBBLOCK_IDS } from '@/triggers/constants'
const logger = createLogger('useTriggerConfigAggregation')
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 934e76dc3d..9e2d6fa635 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -28,6 +28,7 @@ import { handleNewUser } from '@/lib/billing/core/usage'
import { syncSubscriptionUsageLimits } from '@/lib/billing/organization'
import { getPlans } from '@/lib/billing/plans'
import { syncSeatsFromStripeQuantity } from '@/lib/billing/validation/seat-management'
+import { handleChargeDispute, handleDisputeClosed } from '@/lib/billing/webhooks/disputes'
import { handleManualEnterpriseSubscription } from '@/lib/billing/webhooks/enterprise'
import {
handleInvoiceFinalized,
@@ -98,6 +99,32 @@ export const auth = betterAuth({
},
},
},
+ account: {
+ create: {
+ after: async (account) => {
+ // Salesforce doesn't return expires_in in its token response (unlike other OAuth providers).
+ // We set a default 2-hour expiration so token refresh logic works correctly.
+ if (account.providerId === 'salesforce' && !account.accessTokenExpiresAt) {
+ const twoHoursFromNow = new Date(Date.now() + 2 * 60 * 60 * 1000)
+ try {
+ await db
+ .update(schema.account)
+ .set({ accessTokenExpiresAt: twoHoursFromNow })
+ .where(eq(schema.account.id, account.id))
+ logger.info(
+ '[databaseHooks.account.create.after] Set default expiration for Salesforce token',
+ { accountId: account.id, expiresAt: twoHoursFromNow }
+ )
+ } catch (error) {
+ logger.error(
+ '[databaseHooks.account.create.after] Failed to set Salesforce token expiration',
+ { accountId: account.id, error }
+ )
+ }
+ }
+ },
+ },
+ },
session: {
create: {
before: async (session) => {
@@ -498,6 +525,22 @@ export const auth = betterAuth({
redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-vault`,
},
+ {
+ providerId: 'google-groups',
+ clientId: env.GOOGLE_CLIENT_ID as string,
+ clientSecret: env.GOOGLE_CLIENT_SECRET as string,
+ discoveryUrl: 'https://accounts.google.com/.well-known/openid-configuration',
+ accessType: 'offline',
+ scopes: [
+ 'https://www.googleapis.com/auth/userinfo.email',
+ 'https://www.googleapis.com/auth/userinfo.profile',
+ 'https://www.googleapis.com/auth/admin.directory.group',
+ 'https://www.googleapis.com/auth/admin.directory.group.member',
+ ],
+ prompt: 'consent',
+ redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-groups`,
+ },
+
{
providerId: 'microsoft-teams',
clientId: env.MICROSOFT_CLIENT_ID as string,
@@ -825,9 +868,10 @@ export const auth = betterAuth({
authorizationUrl: 'https://login.salesforce.com/services/oauth2/authorize',
tokenUrl: 'https://login.salesforce.com/services/oauth2/token',
userInfoUrl: 'https://login.salesforce.com/services/oauth2/userinfo',
- scopes: ['api', 'refresh_token', 'openid'],
+ scopes: ['api', 'refresh_token', 'openid', 'offline_access'],
pkce: true,
prompt: 'consent',
+ accessType: 'offline',
redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/salesforce`,
getUserInfo: async (tokens) => {
try {
@@ -1980,7 +2024,14 @@ export const auth = betterAuth({
await handleManualEnterpriseSubscription(event)
break
}
- // Note: customer.subscription.deleted is handled by better-auth's onSubscriptionDeleted callback above
+ case 'charge.dispute.created': {
+ await handleChargeDispute(event)
+ break
+ }
+ case 'charge.dispute.closed': {
+ await handleDisputeClosed(event)
+ break
+ }
default:
logger.info('[onEvent] Ignoring unsupported webhook event', {
eventId: event.id,
diff --git a/apps/sim/lib/billing/calculations/usage-monitor.ts b/apps/sim/lib/billing/calculations/usage-monitor.ts
index c048c41a68..daddf286ac 100644
--- a/apps/sim/lib/billing/calculations/usage-monitor.ts
+++ b/apps/sim/lib/billing/calculations/usage-monitor.ts
@@ -1,6 +1,6 @@
import { db } from '@sim/db'
import { member, organization, userStats } from '@sim/db/schema'
-import { eq, inArray } from 'drizzle-orm'
+import { and, eq, inArray } from 'drizzle-orm'
import { getOrganizationSubscription, getPlanPricing } from '@/lib/billing/core/billing'
import { getUserUsageLimit } from '@/lib/billing/core/usage'
import { isBillingEnabled } from '@/lib/core/config/environment'
@@ -255,24 +255,72 @@ export async function checkServerSideUsageLimits(userId: string): Promise<{
logger.info('Server-side checking usage limits for user', { userId })
+ // Check user's own blocked status
const stats = await db
.select({
blocked: userStats.billingBlocked,
+ blockedReason: userStats.billingBlockedReason,
current: userStats.currentPeriodCost,
total: userStats.totalCost,
})
.from(userStats)
.where(eq(userStats.userId, userId))
.limit(1)
+
+ const currentUsage =
+ stats.length > 0
+ ? Number.parseFloat(stats[0].current?.toString() || stats[0].total.toString())
+ : 0
+
if (stats.length > 0 && stats[0].blocked) {
- const currentUsage = Number.parseFloat(
- stats[0].current?.toString() || stats[0].total.toString()
- )
+ const message =
+ stats[0].blockedReason === 'dispute'
+ ? 'Account frozen. Please contact support to resolve this issue.'
+ : 'Billing issue detected. Please update your payment method to continue.'
return {
isExceeded: true,
currentUsage,
limit: 0,
- message: 'Billing issue detected. Please update your payment method to continue.',
+ message,
+ }
+ }
+
+ // Check if user is in an org where the owner is blocked
+ const memberships = await db
+ .select({ organizationId: member.organizationId })
+ .from(member)
+ .where(eq(member.userId, userId))
+
+ for (const m of memberships) {
+ // Find the owner of this org
+ const owners = await db
+ .select({ userId: member.userId })
+ .from(member)
+ .where(and(eq(member.organizationId, m.organizationId), eq(member.role, 'owner')))
+ .limit(1)
+
+ if (owners.length > 0) {
+ const ownerStats = await db
+ .select({
+ blocked: userStats.billingBlocked,
+ blockedReason: userStats.billingBlockedReason,
+ })
+ .from(userStats)
+ .where(eq(userStats.userId, owners[0].userId))
+ .limit(1)
+
+ if (ownerStats.length > 0 && ownerStats[0].blocked) {
+ const message =
+ ownerStats[0].blockedReason === 'dispute'
+ ? 'Organization account frozen. Please contact support to resolve this issue.'
+ : 'Organization billing issue. Please contact your organization owner.'
+ return {
+ isExceeded: true,
+ currentUsage,
+ limit: 0,
+ message,
+ }
+ }
}
}
diff --git a/apps/sim/lib/billing/core/billing.ts b/apps/sim/lib/billing/core/billing.ts
index 2c670a1c52..5feac6bab6 100644
--- a/apps/sim/lib/billing/core/billing.ts
+++ b/apps/sim/lib/billing/core/billing.ts
@@ -3,11 +3,11 @@ import { member, organization, subscription, user, userStats } from '@sim/db/sch
import { and, eq } from 'drizzle-orm'
import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
import { getUserUsageData } from '@/lib/billing/core/usage'
-import {
- getFreeTierLimit,
- getProTierLimit,
- getTeamTierLimitPerSeat,
-} from '@/lib/billing/subscriptions/utils'
+import { getCreditBalance } from '@/lib/billing/credits/balance'
+import { getFreeTierLimit, getPlanPricing } from '@/lib/billing/subscriptions/utils'
+
+export { getPlanPricing }
+
import { createLogger } from '@/lib/logs/console/logger'
const logger = createLogger('Billing')
@@ -38,24 +38,6 @@ export async function getOrganizationSubscription(organizationId: string) {
* 4. Usage resets, next month they pay $20 again + any overages
*/
-/**
- * Get plan pricing information
- */
-export function getPlanPricing(plan: string): {
- basePrice: number // What they pay upfront via Stripe subscription
-} {
- switch (plan) {
- case 'free':
- return { basePrice: 0 } // Free plan has no charges
- case 'pro':
- return { basePrice: getProTierLimit() }
- case 'team':
- return { basePrice: getTeamTierLimitPerSeat() } // Per-seat pricing
- default:
- return { basePrice: 0 }
- }
-}
-
/**
* Calculate overage billing for a user
* Returns only the amount that exceeds their subscription base price
@@ -223,6 +205,7 @@ export async function getSimplifiedBillingSummary(
isWarning: boolean
isExceeded: boolean
daysRemaining: number
+ creditBalance: number
// Subscription details
isPaid: boolean
isPro: boolean
@@ -333,6 +316,8 @@ export async function getSimplifiedBillingSummary(
)
: 0
+ const orgCredits = await getCreditBalance(userId)
+
return {
type: 'organization',
plan: subscription.plan,
@@ -345,6 +330,7 @@ export async function getSimplifiedBillingSummary(
isWarning: percentUsed >= 80 && percentUsed < 100,
isExceeded: usageData.currentUsage >= usageData.limit,
daysRemaining,
+ creditBalance: orgCredits.balance,
// Subscription details
isPaid,
isPro,
@@ -456,6 +442,8 @@ export async function getSimplifiedBillingSummary(
)
: 0
+ const userCredits = await getCreditBalance(userId)
+
return {
type: 'individual',
plan,
@@ -468,6 +456,7 @@ export async function getSimplifiedBillingSummary(
isWarning: percentUsed >= 80 && percentUsed < 100,
isExceeded: currentUsage >= usageData.limit,
daysRemaining,
+ creditBalance: userCredits.balance,
// Subscription details
isPaid,
isPro,
@@ -516,6 +505,7 @@ function getDefaultBillingSummary(type: 'individual' | 'organization') {
isWarning: false,
isExceeded: false,
daysRemaining: 0,
+ creditBalance: 0,
// Subscription details
isPaid: false,
isPro: false,
diff --git a/apps/sim/lib/billing/core/usage.ts b/apps/sim/lib/billing/core/usage.ts
index 80ec17fff1..ff52e3fb44 100644
--- a/apps/sim/lib/billing/core/usage.ts
+++ b/apps/sim/lib/billing/core/usage.ts
@@ -11,6 +11,7 @@ import {
canEditUsageLimit,
getFreeTierLimit,
getPerUserMinimumLimit,
+ getPlanPricing,
} from '@/lib/billing/subscriptions/utils'
import type { BillingData, UsageData, UsageLimitInfo } from '@/lib/billing/types'
import { isBillingEnabled } from '@/lib/core/config/environment'
@@ -93,7 +94,6 @@ export async function getUserUsageData(userId: string): Promise {
.where(eq(organization.id, subscription.referenceId))
.limit(1)
- const { getPlanPricing } = await import('@/lib/billing/core/billing')
const { basePrice } = getPlanPricing(subscription.plan)
const minimum = (subscription.seats ?? 0) * basePrice
@@ -166,7 +166,6 @@ export async function getUserUsageLimitInfo(userId: string): Promise 0) {
- const currentUsage = Number.parseFloat(
- userStatsRecord[0].currentPeriodCost?.toString() || userStatsRecord[0].totalCost.toString()
- )
-
- // Validate new limit is not below current usage
- if (newLimit < currentUsage) {
- return {
- success: false,
- error: `Usage limit cannot be below current usage of $${currentUsage.toFixed(2)}`,
- }
- }
- }
-
- // Update the usage limit
await db
.update(userStats)
.set({
@@ -359,14 +336,12 @@ export async function getUserUsageLimit(userId: string): Promise {
if (orgData[0].orgUsageLimit) {
const configured = Number.parseFloat(orgData[0].orgUsageLimit)
- const { getPlanPricing } = await import('@/lib/billing/core/billing')
const { basePrice } = getPlanPricing(subscription.plan)
const minimum = (subscription.seats ?? 0) * basePrice
return Math.max(configured, minimum)
}
// If org hasn't set a custom limit, use minimum (seats × cost per seat)
- const { getPlanPricing } = await import('@/lib/billing/core/billing')
const { basePrice } = getPlanPricing(subscription.plan)
return (subscription.seats ?? 0) * basePrice
}
diff --git a/apps/sim/lib/billing/credits/balance.ts b/apps/sim/lib/billing/credits/balance.ts
new file mode 100644
index 0000000000..f1f32824fe
--- /dev/null
+++ b/apps/sim/lib/billing/credits/balance.ts
@@ -0,0 +1,194 @@
+import { db } from '@sim/db'
+import { member, organization, userStats } from '@sim/db/schema'
+import { and, eq, sql } from 'drizzle-orm'
+import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('CreditBalance')
+
+export interface CreditBalanceInfo {
+ balance: number
+ entityType: 'user' | 'organization'
+ entityId: string
+}
+
+export async function getCreditBalance(userId: string): Promise {
+ const subscription = await getHighestPrioritySubscription(userId)
+
+ if (subscription?.plan === 'team' || subscription?.plan === 'enterprise') {
+ const orgRows = await db
+ .select({ creditBalance: organization.creditBalance })
+ .from(organization)
+ .where(eq(organization.id, subscription.referenceId))
+ .limit(1)
+
+ return {
+ balance: orgRows.length > 0 ? Number.parseFloat(orgRows[0].creditBalance || '0') : 0,
+ entityType: 'organization',
+ entityId: subscription.referenceId,
+ }
+ }
+
+ const userRows = await db
+ .select({ creditBalance: userStats.creditBalance })
+ .from(userStats)
+ .where(eq(userStats.userId, userId))
+ .limit(1)
+
+ return {
+ balance: userRows.length > 0 ? Number.parseFloat(userRows[0].creditBalance || '0') : 0,
+ entityType: 'user',
+ entityId: userId,
+ }
+}
+
+export async function addCredits(
+ entityType: 'user' | 'organization',
+ entityId: string,
+ amount: number
+): Promise {
+ if (entityType === 'organization') {
+ await db
+ .update(organization)
+ .set({ creditBalance: sql`${organization.creditBalance} + ${amount}` })
+ .where(eq(organization.id, entityId))
+
+ logger.info('Added credits to organization', { organizationId: entityId, amount })
+ } else {
+ await db
+ .update(userStats)
+ .set({ creditBalance: sql`${userStats.creditBalance} + ${amount}` })
+ .where(eq(userStats.userId, entityId))
+
+ logger.info('Added credits to user', { userId: entityId, amount })
+ }
+}
+
+export async function removeCredits(
+ entityType: 'user' | 'organization',
+ entityId: string,
+ amount: number
+): Promise {
+ if (entityType === 'organization') {
+ await db
+ .update(organization)
+ .set({ creditBalance: sql`GREATEST(0, ${organization.creditBalance} - ${amount})` })
+ .where(eq(organization.id, entityId))
+
+ logger.info('Removed credits from organization', { organizationId: entityId, amount })
+ } else {
+ await db
+ .update(userStats)
+ .set({ creditBalance: sql`GREATEST(0, ${userStats.creditBalance} - ${amount})` })
+ .where(eq(userStats.userId, entityId))
+
+ logger.info('Removed credits from user', { userId: entityId, amount })
+ }
+}
+
+export interface DeductResult {
+ creditsUsed: number
+ overflow: number
+}
+
+async function atomicDeductUserCredits(userId: string, cost: number): Promise {
+ const costStr = cost.toFixed(6)
+
+ // Use raw SQL with CTE to capture old balance before update
+ const result = await db.execute<{ old_balance: string; new_balance: string }>(sql`
+ WITH old_balance AS (
+ SELECT credit_balance FROM user_stats WHERE user_id = ${userId}
+ )
+ UPDATE user_stats
+ SET credit_balance = CASE
+ WHEN credit_balance >= ${costStr}::decimal THEN credit_balance - ${costStr}::decimal
+ ELSE 0
+ END
+ WHERE user_id = ${userId} AND credit_balance >= 0
+ RETURNING
+ (SELECT credit_balance FROM old_balance) as old_balance,
+ credit_balance as new_balance
+ `)
+
+ const rows = Array.from(result)
+ if (rows.length === 0) return 0
+
+ const oldBalance = Number.parseFloat(rows[0].old_balance || '0')
+ return Math.min(oldBalance, cost)
+}
+
+async function atomicDeductOrgCredits(orgId: string, cost: number): Promise {
+ const costStr = cost.toFixed(6)
+
+ // Use raw SQL with CTE to capture old balance before update
+ const result = await db.execute<{ old_balance: string; new_balance: string }>(sql`
+ WITH old_balance AS (
+ SELECT credit_balance FROM organization WHERE id = ${orgId}
+ )
+ UPDATE organization
+ SET credit_balance = CASE
+ WHEN credit_balance >= ${costStr}::decimal THEN credit_balance - ${costStr}::decimal
+ ELSE 0
+ END
+ WHERE id = ${orgId} AND credit_balance >= 0
+ RETURNING
+ (SELECT credit_balance FROM old_balance) as old_balance,
+ credit_balance as new_balance
+ `)
+
+ const rows = Array.from(result)
+ if (rows.length === 0) return 0
+
+ const oldBalance = Number.parseFloat(rows[0].old_balance || '0')
+ return Math.min(oldBalance, cost)
+}
+
+export async function deductFromCredits(userId: string, cost: number): Promise {
+ if (cost <= 0) {
+ return { creditsUsed: 0, overflow: 0 }
+ }
+
+ const subscription = await getHighestPrioritySubscription(userId)
+ const isTeamOrEnterprise = subscription?.plan === 'team' || subscription?.plan === 'enterprise'
+
+ let creditsUsed: number
+
+ if (isTeamOrEnterprise && subscription?.referenceId) {
+ creditsUsed = await atomicDeductOrgCredits(subscription.referenceId, cost)
+ } else {
+ creditsUsed = await atomicDeductUserCredits(userId, cost)
+ }
+
+ const overflow = Math.max(0, cost - creditsUsed)
+
+ if (creditsUsed > 0) {
+ logger.info('Deducted credits atomically', {
+ userId,
+ creditsUsed,
+ overflow,
+ entityType: isTeamOrEnterprise ? 'organization' : 'user',
+ })
+ }
+
+ return { creditsUsed, overflow }
+}
+
+export async function canPurchaseCredits(userId: string): Promise {
+ const subscription = await getHighestPrioritySubscription(userId)
+ if (!subscription || subscription.status !== 'active') {
+ return false
+ }
+ // Enterprise users must contact support to purchase credits
+ return subscription.plan === 'pro' || subscription.plan === 'team'
+}
+
+export async function isOrgAdmin(userId: string, organizationId: string): Promise {
+ const memberRows = await db
+ .select({ role: member.role })
+ .from(member)
+ .where(and(eq(member.organizationId, organizationId), eq(member.userId, userId)))
+ .limit(1)
+
+ if (memberRows.length === 0) return false
+ return memberRows[0].role === 'owner' || memberRows[0].role === 'admin'
+}
diff --git a/apps/sim/lib/billing/credits/purchase.ts b/apps/sim/lib/billing/credits/purchase.ts
new file mode 100644
index 0000000000..08792e1973
--- /dev/null
+++ b/apps/sim/lib/billing/credits/purchase.ts
@@ -0,0 +1,231 @@
+import { db } from '@sim/db'
+import { organization, userStats } from '@sim/db/schema'
+import { eq } from 'drizzle-orm'
+import type Stripe from 'stripe'
+import { getPlanPricing } from '@/lib/billing/core/billing'
+import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
+import { canPurchaseCredits, isOrgAdmin } from '@/lib/billing/credits/balance'
+import { requireStripeClient } from '@/lib/billing/stripe-client'
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('CreditPurchase')
+
+/**
+ * Sets usage limit to planBase + creditBalance.
+ * This ensures users can use their plan's included amount plus any prepaid credits.
+ */
+export async function setUsageLimitForCredits(
+ entityType: 'user' | 'organization',
+ entityId: string,
+ plan: string,
+ seats: number | null,
+ creditBalance: number
+): Promise {
+ try {
+ const { basePrice } = getPlanPricing(plan)
+ const planBase =
+ entityType === 'organization' ? Number(basePrice) * (seats || 1) : Number(basePrice)
+ const creditBalanceNum = Number(creditBalance)
+ const newLimit = planBase + creditBalanceNum
+
+ if (entityType === 'organization') {
+ const orgRows = await db
+ .select({ orgUsageLimit: organization.orgUsageLimit })
+ .from(organization)
+ .where(eq(organization.id, entityId))
+ .limit(1)
+
+ const currentLimit =
+ orgRows.length > 0 ? Number.parseFloat(orgRows[0].orgUsageLimit || '0') : 0
+
+ if (newLimit > currentLimit) {
+ await db
+ .update(organization)
+ .set({ orgUsageLimit: newLimit.toString() })
+ .where(eq(organization.id, entityId))
+
+ logger.info('Set org usage limit to planBase + credits', {
+ organizationId: entityId,
+ plan,
+ seats,
+ planBase,
+ creditBalance,
+ previousLimit: currentLimit,
+ newLimit,
+ })
+ }
+ } else {
+ const userStatsRows = await db
+ .select({ currentUsageLimit: userStats.currentUsageLimit })
+ .from(userStats)
+ .where(eq(userStats.userId, entityId))
+ .limit(1)
+
+ const currentLimit =
+ userStatsRows.length > 0 ? Number.parseFloat(userStatsRows[0].currentUsageLimit || '0') : 0
+
+ if (newLimit > currentLimit) {
+ await db
+ .update(userStats)
+ .set({ currentUsageLimit: newLimit.toString() })
+ .where(eq(userStats.userId, entityId))
+
+ logger.info('Set user usage limit to planBase + credits', {
+ userId: entityId,
+ plan,
+ planBase,
+ creditBalance,
+ previousLimit: currentLimit,
+ newLimit,
+ })
+ }
+ }
+ } catch (error) {
+ logger.error('Failed to set usage limit for credits', { entityType, entityId, error })
+ }
+}
+
+export interface PurchaseCreditsParams {
+ userId: string
+ amountDollars: number
+ requestId: string
+}
+
+export interface PurchaseResult {
+ success: boolean
+ error?: string
+}
+
+function getPaymentMethodId(
+ pm: string | Stripe.PaymentMethod | null | undefined
+): string | undefined {
+ return typeof pm === 'string' ? pm : pm?.id
+}
+
+export async function purchaseCredits(params: PurchaseCreditsParams): Promise {
+ const { userId, amountDollars, requestId } = params
+
+ if (amountDollars < 10 || amountDollars > 1000) {
+ return { success: false, error: 'Amount must be between $10 and $1000' }
+ }
+
+ const canPurchase = await canPurchaseCredits(userId)
+ if (!canPurchase) {
+ return { success: false, error: 'Only Pro and Team users can purchase credits' }
+ }
+
+ const subscription = await getHighestPrioritySubscription(userId)
+ if (!subscription || !subscription.stripeSubscriptionId) {
+ return { success: false, error: 'No active subscription found' }
+ }
+
+ // Enterprise users must contact support
+ if (subscription.plan === 'enterprise') {
+ return { success: false, error: 'Enterprise users must contact support to purchase credits' }
+ }
+
+ let entityType: 'user' | 'organization' = 'user'
+ let entityId = userId
+
+ if (subscription.plan === 'team') {
+ const isAdmin = await isOrgAdmin(userId, subscription.referenceId)
+ if (!isAdmin) {
+ return { success: false, error: 'Only organization owners and admins can purchase credits' }
+ }
+ entityType = 'organization'
+ entityId = subscription.referenceId
+ }
+
+ try {
+ const stripe = requireStripeClient()
+
+ // Get customer ID and payment method from subscription
+ const stripeSub = await stripe.subscriptions.retrieve(subscription.stripeSubscriptionId)
+ const customerId =
+ typeof stripeSub.customer === 'string' ? stripeSub.customer : stripeSub.customer.id
+
+ // Get default payment method
+ let defaultPaymentMethod: string | undefined
+ const subPm = getPaymentMethodId(stripeSub.default_payment_method)
+ if (subPm) {
+ defaultPaymentMethod = subPm
+ } else {
+ const customer = await stripe.customers.retrieve(customerId)
+ if (customer && !('deleted' in customer)) {
+ defaultPaymentMethod = getPaymentMethodId(customer.invoice_settings?.default_payment_method)
+ }
+ }
+
+ if (!defaultPaymentMethod) {
+ return {
+ success: false,
+ error: 'No payment method on file. Please update your billing info.',
+ }
+ }
+
+ const amountCents = Math.round(amountDollars * 100)
+ const idempotencyKey = `credit-purchase:${requestId}`
+
+ const creditMetadata = {
+ type: 'credit_purchase',
+ entityType,
+ entityId,
+ amountDollars: amountDollars.toString(),
+ purchasedBy: userId,
+ }
+
+ // Create invoice
+ const invoice = await stripe.invoices.create(
+ {
+ customer: customerId,
+ collection_method: 'charge_automatically',
+ auto_advance: false,
+ description: `Credit purchase - $${amountDollars}`,
+ metadata: creditMetadata,
+ default_payment_method: defaultPaymentMethod,
+ },
+ { idempotencyKey: `${idempotencyKey}-invoice` }
+ )
+
+ // Add line item
+ await stripe.invoiceItems.create(
+ {
+ customer: customerId,
+ invoice: invoice.id,
+ amount: amountCents,
+ currency: 'usd',
+ description: `Prepaid credits ($${amountDollars})`,
+ metadata: creditMetadata,
+ },
+ { idempotencyKey }
+ )
+
+ // Finalize and pay
+ if (!invoice.id) {
+ return { success: false, error: 'Failed to create invoice' }
+ }
+
+ const finalized = await stripe.invoices.finalizeInvoice(invoice.id)
+
+ if (finalized.status === 'open' && finalized.id) {
+ await stripe.invoices.pay(finalized.id, {
+ payment_method: defaultPaymentMethod,
+ })
+ // Credits are added via webhook (handleInvoicePaymentSucceeded) after payment confirmation
+ }
+
+ logger.info('Credit purchase invoice created and paid', {
+ invoiceId: invoice.id,
+ entityType,
+ entityId,
+ amountDollars,
+ purchasedBy: userId,
+ })
+
+ return { success: true }
+ } catch (error) {
+ logger.error('Failed to purchase credits', { error, userId, amountDollars })
+ const message = error instanceof Error ? error.message : 'Failed to process payment'
+ return { success: false, error: message }
+ }
+}
diff --git a/apps/sim/lib/billing/index.ts b/apps/sim/lib/billing/index.ts
index dbc285f0a9..cfa17f8785 100644
--- a/apps/sim/lib/billing/index.ts
+++ b/apps/sim/lib/billing/index.ts
@@ -23,6 +23,8 @@ export {
getUserUsageLimit as getUsageLimit,
updateUserUsageLimit as updateUsageLimit,
} from '@/lib/billing/core/usage'
+export * from '@/lib/billing/credits/balance'
+export * from '@/lib/billing/credits/purchase'
export * from '@/lib/billing/subscriptions/utils'
export { canEditUsageLimit as canEditLimit } from '@/lib/billing/subscriptions/utils'
export * from '@/lib/billing/types'
diff --git a/apps/sim/lib/billing/storage/limits.ts b/apps/sim/lib/billing/storage/limits.ts
index f188f8bc24..8f15ec2237 100644
--- a/apps/sim/lib/billing/storage/limits.ts
+++ b/apps/sim/lib/billing/storage/limits.ts
@@ -9,7 +9,7 @@ import {
DEFAULT_FREE_STORAGE_LIMIT_GB,
DEFAULT_PRO_STORAGE_LIMIT_GB,
DEFAULT_TEAM_STORAGE_LIMIT_GB,
-} from '@sim/db/consts'
+} from '@sim/db/constants'
import { organization, subscription, userStats } from '@sim/db/schema'
import { eq } from 'drizzle-orm'
import { getEnv } from '@/lib/core/config/env'
diff --git a/apps/sim/lib/billing/subscriptions/utils.ts b/apps/sim/lib/billing/subscriptions/utils.ts
index 3a8d1b6384..ef54ba8326 100644
--- a/apps/sim/lib/billing/subscriptions/utils.ts
+++ b/apps/sim/lib/billing/subscriptions/utils.ts
@@ -121,3 +121,21 @@ export function canEditUsageLimit(subscription: any): boolean {
// Enterprise has fixed limits that match their monthly cost
return subscription.plan === 'pro' || subscription.plan === 'team'
}
+
+/**
+ * Get pricing info for a plan
+ */
+export function getPlanPricing(plan: string): { basePrice: number } {
+ switch (plan) {
+ case 'free':
+ return { basePrice: 0 }
+ case 'pro':
+ return { basePrice: getProTierLimit() }
+ case 'team':
+ return { basePrice: getTeamTierLimitPerSeat() }
+ case 'enterprise':
+ return { basePrice: getEnterpriseTierLimitPerSeat() }
+ default:
+ return { basePrice: 0 }
+ }
+}
diff --git a/apps/sim/lib/billing/threshold-billing.ts b/apps/sim/lib/billing/threshold-billing.ts
index 40b97aa64e..72b1d033e1 100644
--- a/apps/sim/lib/billing/threshold-billing.ts
+++ b/apps/sim/lib/billing/threshold-billing.ts
@@ -1,5 +1,5 @@
import { db } from '@sim/db'
-import { member, subscription, userStats } from '@sim/db/schema'
+import { member, organization, subscription, userStats } from '@sim/db/schema'
import { and, eq, inArray, sql } from 'drizzle-orm'
import type Stripe from 'stripe'
import { DEFAULT_OVERAGE_THRESHOLD } from '@/lib/billing/constants'
@@ -161,7 +161,46 @@ export async function checkAndBillOverageThreshold(userId: string): Promise 0) {
+ creditsApplied = Math.min(creditBalance, amountToBill)
+ // Update credit balance within the transaction
+ await tx
+ .update(userStats)
+ .set({
+ creditBalance: sql`GREATEST(0, ${userStats.creditBalance} - ${creditsApplied})`,
+ })
+ .where(eq(userStats.userId, userId))
+ amountToBill = amountToBill - creditsApplied
+
+ logger.info('Applied credits to reduce threshold overage', {
+ userId,
+ creditBalance,
+ creditsApplied,
+ remainingToBill: amountToBill,
+ })
+ }
+
+ // If credits covered everything, just update the billed amount but don't create invoice
+ if (amountToBill <= 0) {
+ await tx
+ .update(userStats)
+ .set({
+ billedOverageThisPeriod: sql`${userStats.billedOverageThisPeriod} + ${unbilledOverage}`,
+ })
+ .where(eq(userStats.userId, userId))
+
+ logger.info('Credits fully covered threshold overage', {
+ userId,
+ creditsApplied,
+ unbilledOverage,
+ })
+ return
+ }
const stripeSubscriptionId = userSubscription.stripeSubscriptionId
if (!stripeSubscriptionId) {
@@ -214,15 +253,17 @@ export async function checkAndBillOverageThreshold(userId: string): Promise {
+ // Lock both owner stats and organization rows
const ownerStatsLock = await tx
.select()
.from(userStats)
@@ -305,13 +347,26 @@ export async function checkAndBillOrganizationOverageThreshold(
.for('update')
.limit(1)
+ const orgLock = await tx
+ .select()
+ .from(organization)
+ .where(eq(organization.id, organizationId))
+ .for('update')
+ .limit(1)
+
if (ownerStatsLock.length === 0) {
logger.error('Owner stats not found', { organizationId, ownerId: owner.userId })
return
}
+ if (orgLock.length === 0) {
+ logger.error('Organization not found', { organizationId })
+ return
+ }
+
let totalTeamUsage = parseDecimal(ownerStatsLock[0].currentPeriodCost)
const totalBilledOverage = parseDecimal(ownerStatsLock[0].billedOverageThisPeriod)
+ const orgCreditBalance = Number.parseFloat(orgLock[0].creditBalance?.toString() || '0')
const nonOwnerIds = members.filter((m) => m.userId !== owner.userId).map((m) => m.userId)
@@ -348,7 +403,45 @@ export async function checkAndBillOrganizationOverageThreshold(
return
}
- const amountToBill = unbilledOverage
+ // Apply credits to reduce the amount to bill (use locked org's balance)
+ let amountToBill = unbilledOverage
+ let creditsApplied = 0
+
+ if (orgCreditBalance > 0) {
+ creditsApplied = Math.min(orgCreditBalance, amountToBill)
+ // Update credit balance within the transaction
+ await tx
+ .update(organization)
+ .set({
+ creditBalance: sql`GREATEST(0, ${organization.creditBalance} - ${creditsApplied})`,
+ })
+ .where(eq(organization.id, organizationId))
+ amountToBill = amountToBill - creditsApplied
+
+ logger.info('Applied org credits to reduce threshold overage', {
+ organizationId,
+ creditBalance: orgCreditBalance,
+ creditsApplied,
+ remainingToBill: amountToBill,
+ })
+ }
+
+ // If credits covered everything, just update the billed amount but don't create invoice
+ if (amountToBill <= 0) {
+ await tx
+ .update(userStats)
+ .set({
+ billedOverageThisPeriod: sql`${userStats.billedOverageThisPeriod} + ${unbilledOverage}`,
+ })
+ .where(eq(userStats.userId, owner.userId))
+
+ logger.info('Credits fully covered org threshold overage', {
+ organizationId,
+ creditsApplied,
+ unbilledOverage,
+ })
+ return
+ }
const stripeSubscriptionId = orgSubscription.stripeSubscriptionId
if (!stripeSubscriptionId) {
@@ -375,6 +468,7 @@ export async function checkAndBillOrganizationOverageThreshold(
logger.info('Creating organization threshold overage invoice', {
organizationId,
amountToBill,
+ creditsApplied,
billingPeriod,
})
@@ -399,14 +493,16 @@ export async function checkAndBillOrganizationOverageThreshold(
await tx
.update(userStats)
.set({
- billedOverageThisPeriod: sql`${userStats.billedOverageThisPeriod} + ${amountToBill}`,
+ billedOverageThisPeriod: sql`${userStats.billedOverageThisPeriod} + ${unbilledOverage}`,
})
.where(eq(userStats.userId, owner.userId))
logger.info('Successfully created and finalized organization threshold overage invoice', {
organizationId,
ownerId: owner.userId,
+ creditsApplied,
amountBilled: amountToBill,
+ totalProcessed: unbilledOverage,
invoiceId,
})
})
diff --git a/apps/sim/lib/billing/webhooks/disputes.ts b/apps/sim/lib/billing/webhooks/disputes.ts
new file mode 100644
index 0000000000..7637a0b55b
--- /dev/null
+++ b/apps/sim/lib/billing/webhooks/disputes.ts
@@ -0,0 +1,150 @@
+import { db } from '@sim/db'
+import { member, subscription, user, userStats } from '@sim/db/schema'
+import { and, eq } from 'drizzle-orm'
+import type Stripe from 'stripe'
+import { requireStripeClient } from '@/lib/billing/stripe-client'
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('DisputeWebhooks')
+
+async function getCustomerIdFromDispute(dispute: Stripe.Dispute): Promise {
+ const chargeId = typeof dispute.charge === 'string' ? dispute.charge : dispute.charge?.id
+ if (!chargeId) return null
+
+ const stripe = requireStripeClient()
+ const charge = await stripe.charges.retrieve(chargeId)
+ return typeof charge.customer === 'string' ? charge.customer : (charge.customer?.id ?? null)
+}
+
+/**
+ * Handles charge.dispute.created - blocks the responsible user
+ */
+export async function handleChargeDispute(event: Stripe.Event): Promise {
+ const dispute = event.data.object as Stripe.Dispute
+
+ const customerId = await getCustomerIdFromDispute(dispute)
+ if (!customerId) {
+ logger.warn('No customer ID found in dispute', { disputeId: dispute.id })
+ return
+ }
+
+ // Find user by stripeCustomerId (Pro plans)
+ const users = await db
+ .select({ id: user.id })
+ .from(user)
+ .where(eq(user.stripeCustomerId, customerId))
+ .limit(1)
+
+ if (users.length > 0) {
+ await db
+ .update(userStats)
+ .set({ billingBlocked: true, billingBlockedReason: 'dispute' })
+ .where(eq(userStats.userId, users[0].id))
+
+ logger.warn('Blocked user due to dispute', {
+ disputeId: dispute.id,
+ userId: users[0].id,
+ })
+ return
+ }
+
+ // Find subscription by stripeCustomerId (Team/Enterprise)
+ const subs = await db
+ .select({ referenceId: subscription.referenceId })
+ .from(subscription)
+ .where(eq(subscription.stripeCustomerId, customerId))
+ .limit(1)
+
+ if (subs.length > 0) {
+ const orgId = subs[0].referenceId
+
+ const owners = await db
+ .select({ userId: member.userId })
+ .from(member)
+ .where(and(eq(member.organizationId, orgId), eq(member.role, 'owner')))
+ .limit(1)
+
+ if (owners.length > 0) {
+ await db
+ .update(userStats)
+ .set({ billingBlocked: true, billingBlockedReason: 'dispute' })
+ .where(eq(userStats.userId, owners[0].userId))
+
+ logger.warn('Blocked org owner due to dispute', {
+ disputeId: dispute.id,
+ ownerId: owners[0].userId,
+ organizationId: orgId,
+ })
+ }
+ }
+}
+
+/**
+ * Handles charge.dispute.closed - unblocks user if dispute was won
+ */
+export async function handleDisputeClosed(event: Stripe.Event): Promise {
+ const dispute = event.data.object as Stripe.Dispute
+
+ if (dispute.status !== 'won') {
+ logger.info('Dispute not won, user remains blocked', {
+ disputeId: dispute.id,
+ status: dispute.status,
+ })
+ return
+ }
+
+ const customerId = await getCustomerIdFromDispute(dispute)
+ if (!customerId) {
+ return
+ }
+
+ // Find and unblock user (Pro plans)
+ const users = await db
+ .select({ id: user.id })
+ .from(user)
+ .where(eq(user.stripeCustomerId, customerId))
+ .limit(1)
+
+ if (users.length > 0) {
+ await db
+ .update(userStats)
+ .set({ billingBlocked: false, billingBlockedReason: null })
+ .where(eq(userStats.userId, users[0].id))
+
+ logger.info('Unblocked user after winning dispute', {
+ disputeId: dispute.id,
+ userId: users[0].id,
+ })
+ return
+ }
+
+ // Find and unblock org owner (Team/Enterprise)
+ const subs = await db
+ .select({ referenceId: subscription.referenceId })
+ .from(subscription)
+ .where(eq(subscription.stripeCustomerId, customerId))
+ .limit(1)
+
+ if (subs.length > 0) {
+ const orgId = subs[0].referenceId
+
+ const owners = await db
+ .select({ userId: member.userId })
+ .from(member)
+ .where(and(eq(member.organizationId, orgId), eq(member.role, 'owner')))
+ .limit(1)
+
+ if (owners.length > 0) {
+ await db
+ .update(userStats)
+ .set({ billingBlocked: false, billingBlockedReason: null })
+ .where(eq(userStats.userId, owners[0].userId))
+
+ logger.info('Unblocked org owner after winning dispute', {
+ disputeId: dispute.id,
+ ownerId: owners[0].userId,
+ organizationId: orgId,
+ })
+ }
+ }
+}
diff --git a/apps/sim/lib/billing/webhooks/invoices.ts b/apps/sim/lib/billing/webhooks/invoices.ts
index 8d272aad62..3110f60af9 100644
--- a/apps/sim/lib/billing/webhooks/invoices.ts
+++ b/apps/sim/lib/billing/webhooks/invoices.ts
@@ -10,7 +10,10 @@ import {
import { and, eq, inArray } from 'drizzle-orm'
import type Stripe from 'stripe'
import PaymentFailedEmail from '@/components/emails/billing/payment-failed-email'
+import { getEmailSubject, renderCreditPurchaseEmail } from '@/components/emails/render-email'
import { calculateSubscriptionOverage } from '@/lib/billing/core/billing'
+import { addCredits, getCreditBalance, removeCredits } from '@/lib/billing/credits/balance'
+import { setUsageLimitForCredits } from '@/lib/billing/credits/purchase'
import { requireStripeClient } from '@/lib/billing/stripe-client'
import { getBaseUrl } from '@/lib/core/utils/urls'
import { createLogger } from '@/lib/logs/console/logger'
@@ -335,21 +338,131 @@ export async function resetUsageForSubscription(sub: { plan: string | null; refe
}
/**
- * Handle invoice payment succeeded webhook
- * We unblock any previously blocked users for this subscription.
+ * Handle credit purchase invoice payment succeeded.
+ */
+async function handleCreditPurchaseSuccess(invoice: Stripe.Invoice): Promise {
+ const { entityType, entityId, amountDollars, purchasedBy } = invoice.metadata || {}
+ if (!entityType || !entityId || !amountDollars) {
+ logger.error('Missing metadata in credit purchase invoice', {
+ invoiceId: invoice.id,
+ metadata: invoice.metadata,
+ })
+ return
+ }
+
+ if (entityType !== 'user' && entityType !== 'organization') {
+ logger.error('Invalid entityType in credit purchase', { invoiceId: invoice.id, entityType })
+ return
+ }
+
+ const amount = Number.parseFloat(amountDollars)
+ if (Number.isNaN(amount) || amount <= 0) {
+ logger.error('Invalid amount in credit purchase', { invoiceId: invoice.id, amountDollars })
+ return
+ }
+
+ await addCredits(entityType, entityId, amount)
+
+ const subscription = await db
+ .select()
+ .from(subscriptionTable)
+ .where(eq(subscriptionTable.referenceId, entityId))
+ .limit(1)
+
+ if (subscription.length > 0) {
+ const sub = subscription[0]
+ const { balance: newCreditBalance } = await getCreditBalance(entityId)
+ await setUsageLimitForCredits(entityType, entityId, sub.plan, sub.seats, newCreditBalance)
+ }
+
+ logger.info('Credit purchase completed via webhook', {
+ invoiceId: invoice.id,
+ entityType,
+ entityId,
+ amount,
+ purchasedBy,
+ })
+
+ // Send confirmation emails
+ try {
+ const { balance: newBalance } = await getCreditBalance(
+ entityType === 'organization' ? entityId : purchasedBy || entityId
+ )
+ let recipients: Array<{ email: string; name: string | null }> = []
+
+ if (entityType === 'organization') {
+ const members = await db
+ .select({ userId: member.userId, role: member.role })
+ .from(member)
+ .where(eq(member.organizationId, entityId))
+
+ const ownerAdminIds = members
+ .filter((m) => m.role === 'owner' || m.role === 'admin')
+ .map((m) => m.userId)
+
+ if (ownerAdminIds.length > 0) {
+ recipients = await db
+ .select({ email: user.email, name: user.name })
+ .from(user)
+ .where(inArray(user.id, ownerAdminIds))
+ }
+ } else if (purchasedBy) {
+ const users = await db
+ .select({ email: user.email, name: user.name })
+ .from(user)
+ .where(eq(user.id, purchasedBy))
+ .limit(1)
+
+ recipients = users
+ }
+
+ for (const recipient of recipients) {
+ if (!recipient.email) continue
+
+ const emailHtml = await renderCreditPurchaseEmail({
+ userName: recipient.name || undefined,
+ amount,
+ newBalance,
+ })
+
+ await sendEmail({
+ to: recipient.email,
+ subject: getEmailSubject('credit-purchase'),
+ html: emailHtml,
+ emailType: 'transactional',
+ })
+
+ logger.info('Sent credit purchase confirmation email', {
+ email: recipient.email,
+ invoiceId: invoice.id,
+ })
+ }
+ } catch (emailError) {
+ logger.error('Failed to send credit purchase emails', { emailError, invoiceId: invoice.id })
+ }
+}
+
+/**
+ * Handle invoice payment succeeded webhook.
+ * Handles both credit purchases and subscription payments.
*/
export async function handleInvoicePaymentSucceeded(event: Stripe.Event) {
try {
const invoice = event.data.object as Stripe.Invoice
+ // Handle credit purchase invoices
+ if (invoice.metadata?.type === 'credit_purchase') {
+ await handleCreditPurchaseSuccess(invoice)
+ return
+ }
+
+ // Handle subscription invoices
const subscription = invoice.parent?.subscription_details?.subscription
const stripeSubscriptionId = typeof subscription === 'string' ? subscription : subscription?.id
if (!stripeSubscriptionId) {
- logger.info('No subscription found on invoice; skipping payment succeeded handler', {
- invoiceId: invoice.id,
- })
return
}
+
const records = await db
.select()
.from(subscriptionTable)
@@ -392,16 +505,28 @@ export async function handleInvoicePaymentSucceeded(event: Stripe.Event) {
const memberIds = members.map((m) => m.userId)
if (memberIds.length > 0) {
+ // Only unblock users blocked for payment_failed, not disputes
await db
.update(userStats)
- .set({ billingBlocked: false })
- .where(inArray(userStats.userId, memberIds))
+ .set({ billingBlocked: false, billingBlockedReason: null })
+ .where(
+ and(
+ inArray(userStats.userId, memberIds),
+ eq(userStats.billingBlockedReason, 'payment_failed')
+ )
+ )
}
} else {
+ // Only unblock users blocked for payment_failed, not disputes
await db
.update(userStats)
- .set({ billingBlocked: false })
- .where(eq(userStats.userId, sub.referenceId))
+ .set({ billingBlocked: false, billingBlockedReason: null })
+ .where(
+ and(
+ eq(userStats.userId, sub.referenceId),
+ eq(userStats.billingBlockedReason, 'payment_failed')
+ )
+ )
}
if (wasBlocked) {
@@ -496,7 +621,7 @@ export async function handleInvoicePaymentFailed(event: Stripe.Event) {
if (memberIds.length > 0) {
await db
.update(userStats)
- .set({ billingBlocked: true })
+ .set({ billingBlocked: true, billingBlockedReason: 'payment_failed' })
.where(inArray(userStats.userId, memberIds))
}
logger.info('Blocked team/enterprise members due to payment failure', {
@@ -507,7 +632,7 @@ export async function handleInvoicePaymentFailed(event: Stripe.Event) {
} else {
await db
.update(userStats)
- .set({ billingBlocked: true })
+ .set({ billingBlocked: true, billingBlockedReason: 'payment_failed' })
.where(eq(userStats.userId, sub.referenceId))
logger.info('Blocked user due to payment failure', {
userId: sub.referenceId,
@@ -592,12 +717,34 @@ export async function handleInvoiceFinalized(event: Stripe.Event) {
const billedOverage = await getBilledOverageForSubscription(sub)
// Only bill the remaining unbilled overage
- const remainingOverage = Math.max(0, totalOverage - billedOverage)
+ let remainingOverage = Math.max(0, totalOverage - billedOverage)
+
+ // Apply credits to reduce overage at end of cycle
+ let creditsApplied = 0
+ if (remainingOverage > 0) {
+ const entityType = sub.plan === 'team' || sub.plan === 'enterprise' ? 'organization' : 'user'
+ const entityId = sub.referenceId
+ const { balance: creditBalance } = await getCreditBalance(entityId)
+
+ if (creditBalance > 0) {
+ creditsApplied = Math.min(creditBalance, remainingOverage)
+ await removeCredits(entityType, entityId, creditsApplied)
+ remainingOverage = remainingOverage - creditsApplied
+
+ logger.info('Applied credits to reduce overage at cycle end', {
+ subscriptionId: sub.id,
+ creditBalance,
+ creditsApplied,
+ remainingOverageAfterCredits: remainingOverage,
+ })
+ }
+ }
logger.info('Invoice finalized overage calculation', {
subscriptionId: sub.id,
totalOverage,
billedOverage,
+ creditsApplied,
remainingOverage,
billingPeriod,
})
diff --git a/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts b/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts
index 7b94873512..984988f07f 100644
--- a/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts
+++ b/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts
@@ -12,7 +12,7 @@ import { AuthMode } from '@/blocks/types'
import { PROVIDER_DEFINITIONS } from '@/providers/models'
import { tools as toolsRegistry } from '@/tools/registry'
import { getTrigger, isTriggerValid } from '@/triggers'
-import { SYSTEM_SUBBLOCK_IDS } from '@/triggers/consts'
+import { SYSTEM_SUBBLOCK_IDS } from '@/triggers/constants'
export interface CopilotSubblockMetadata {
id: string
diff --git a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
index 32567dbf07..8c3a04598a 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
@@ -12,7 +12,7 @@ import { validateWorkflowState } from '@/lib/workflows/sanitization/validation'
import { getAllBlocks, getBlock } from '@/blocks/registry'
import type { SubBlockConfig } from '@/blocks/types'
import { generateLoopBlocks, generateParallelBlocks } from '@/stores/workflows/workflow/utils'
-import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/consts'
+import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
/** Selector subblock types that can be validated */
const SELECTOR_TYPES = new Set([
diff --git a/apps/sim/lib/logs/execution/logger.ts b/apps/sim/lib/logs/execution/logger.ts
index 046cd77e69..53d6b604b9 100644
--- a/apps/sim/lib/logs/execution/logger.ts
+++ b/apps/sim/lib/logs/execution/logger.ts
@@ -566,6 +566,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
return
}
+ // All costs go to currentPeriodCost - credits are applied at end of billing cycle
const updateFields: any = {
totalTokensUsed: sql`total_tokens_used + ${costSummary.totalTokens}`,
totalCost: sql`total_cost + ${costToStore}`,
diff --git a/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts b/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts
index dbc787d865..8a671a4e92 100644
--- a/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts
+++ b/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts
@@ -1,6 +1,6 @@
import { createLogger } from '@/lib/logs/console/logger'
import type { ToolCall, TraceSpan } from '@/lib/logs/types'
-import { isWorkflowBlockType } from '@/executor/consts'
+import { isWorkflowBlockType } from '@/executor/constants'
import type { ExecutionResult } from '@/executor/types'
const logger = createLogger('TraceSpans')
diff --git a/apps/sim/lib/oauth/oauth.ts b/apps/sim/lib/oauth/oauth.ts
index bfd86227d1..3e4181aadf 100644
--- a/apps/sim/lib/oauth/oauth.ts
+++ b/apps/sim/lib/oauth/oauth.ts
@@ -11,6 +11,7 @@ import {
GoogleDocsIcon,
GoogleDriveIcon,
GoogleFormsIcon,
+ GoogleGroupsIcon,
GoogleIcon,
GoogleSheetsIcon,
HubspotIcon,
@@ -80,6 +81,7 @@ export type OAuthService =
| 'google-calendar'
| 'google-vault'
| 'google-forms'
+ | 'google-groups'
| 'github'
| 'x'
// | 'supabase'
@@ -224,6 +226,19 @@ export const OAUTH_PROVIDERS: Record = {
],
scopeHints: ['ediscovery', 'devstorage'],
},
+ 'google-groups': {
+ id: 'google-groups',
+ name: 'Google Groups',
+ description: 'Manage Google Workspace Groups and their members.',
+ providerId: 'google-groups',
+ icon: (props) => GoogleGroupsIcon(props),
+ baseProviderIcon: (props) => GoogleIcon(props),
+ scopes: [
+ 'https://www.googleapis.com/auth/admin.directory.group',
+ 'https://www.googleapis.com/auth/admin.directory.group.member',
+ ],
+ scopeHints: ['admin.directory.group'],
+ },
},
defaultService: 'gmail',
},
@@ -825,7 +840,7 @@ export const OAUTH_PROVIDERS: Record = {
providerId: 'salesforce',
icon: (props) => SalesforceIcon(props),
baseProviderIcon: (props) => SalesforceIcon(props),
- scopes: ['api', 'refresh_token', 'openid'],
+ scopes: ['api', 'refresh_token', 'openid', 'offline_access'],
},
},
defaultService: 'salesforce',
@@ -1412,7 +1427,7 @@ function getProviderAuthConfig(provider: string): ProviderAuthConfig {
clientId,
clientSecret,
useBasicAuth: false,
- supportsRefreshTokenRotation: false,
+ supportsRefreshTokenRotation: true,
}
}
case 'shopify': {
@@ -1531,9 +1546,15 @@ export async function refreshOAuthToken(
logger.error('Token refresh failed:', {
status: response.status,
+ statusText: response.statusText,
error: errorText,
parsedError: errorData,
providerId,
+ tokenEndpoint: config.tokenEndpoint,
+ hasClientId: !!config.clientId,
+ hasClientSecret: !!config.clientSecret,
+ hasRefreshToken: !!refreshToken,
+ refreshTokenPrefix: refreshToken ? `${refreshToken.substring(0, 10)}...` : 'none',
})
throw new Error(`Failed to refresh token: ${response.status} ${errorText}`)
}
diff --git a/apps/sim/lib/webhooks/env-resolver.ts b/apps/sim/lib/webhooks/env-resolver.ts
index 34811cc6f2..74da1ce2bc 100644
--- a/apps/sim/lib/webhooks/env-resolver.ts
+++ b/apps/sim/lib/webhooks/env-resolver.ts
@@ -1,6 +1,6 @@
import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
import { createLogger } from '@/lib/logs/console/logger'
-import { extractEnvVarName, isEnvVarReference } from '@/executor/consts'
+import { extractEnvVarName, isEnvVarReference } from '@/executor/constants'
const logger = createLogger('EnvResolver')
diff --git a/apps/sim/lib/workflows/autolayout/constants.ts b/apps/sim/lib/workflows/autolayout/constants.ts
index 0d92258975..c932ede0a0 100644
--- a/apps/sim/lib/workflows/autolayout/constants.ts
+++ b/apps/sim/lib/workflows/autolayout/constants.ts
@@ -11,7 +11,7 @@ export { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/b
/**
* Horizontal spacing between layers (columns)
*/
-export const DEFAULT_HORIZONTAL_SPACING = 550
+export const DEFAULT_HORIZONTAL_SPACING = 350
/**
* Vertical spacing between blocks in the same layer
@@ -81,7 +81,7 @@ export const DEFAULT_LAYOUT_OPTIONS = {
/**
* Default horizontal spacing for containers (tighter than root level)
*/
-export const DEFAULT_CONTAINER_HORIZONTAL_SPACING = 400
+export const DEFAULT_CONTAINER_HORIZONTAL_SPACING = 250
/**
* Container-specific layout options (tighter spacing for nested layouts)
diff --git a/apps/sim/lib/workflows/autolayout/core.ts b/apps/sim/lib/workflows/autolayout/core.ts
index 9ff3fb9943..0131984756 100644
--- a/apps/sim/lib/workflows/autolayout/core.ts
+++ b/apps/sim/lib/workflows/autolayout/core.ts
@@ -3,12 +3,9 @@ import {
CONTAINER_LAYOUT_OPTIONS,
DEFAULT_LAYOUT_OPTIONS,
MAX_OVERLAP_ITERATIONS,
- OVERLAP_MARGIN,
} from '@/lib/workflows/autolayout/constants'
import type { Edge, GraphNode, LayoutOptions } from '@/lib/workflows/autolayout/types'
import {
- boxesOverlap,
- createBoundingBox,
getBlockMetrics,
normalizePositions,
prepareBlockMetrics,
@@ -172,11 +169,10 @@ export function groupByLayer(nodes: Map): Map {
- if (a.layer !== b.layer) return a.layer - b.layer
- return a.position.y - b.position.y
- })
+ // Group nodes by layer for same-layer overlap resolution
+ const nodesByLayer = new Map()
+ for (const node of nodes) {
+ if (!nodesByLayer.has(node.layer)) {
+ nodesByLayer.set(node.layer, [])
+ }
+ nodesByLayer.get(node.layer)!.push(node)
+ }
- for (let i = 0; i < sortedNodes.length; i++) {
- for (let j = i + 1; j < sortedNodes.length; j++) {
- const node1 = sortedNodes[i]
- const node2 = sortedNodes[j]
+ // Process each layer independently
+ for (const [layer, layerNodes] of nodesByLayer) {
+ if (layerNodes.length < 2) continue
- const box1 = createBoundingBox(node1.position, node1.metrics)
- const box2 = createBoundingBox(node2.position, node2.metrics)
+ // Sort by Y position for consistent processing
+ layerNodes.sort((a, b) => a.position.y - b.position.y)
- // Check for overlap with margin
- if (boxesOverlap(box1, box2, OVERLAP_MARGIN)) {
- hasOverlap = true
+ for (let i = 0; i < layerNodes.length - 1; i++) {
+ const node1 = layerNodes[i]
+ const node2 = layerNodes[i + 1]
- // If in same layer, shift vertically around midpoint
- if (node1.layer === node2.layer) {
- const midpoint = (node1.position.y + node2.position.y) / 2
-
- node1.position.y = midpoint - node1.metrics.height / 2 - verticalSpacing / 2
- node2.position.y = midpoint + node2.metrics.height / 2 + verticalSpacing / 2
- } else {
- // Different layers - shift the later one down
- const requiredSpace = box1.y + box1.height + verticalSpacing
- if (node2.position.y < requiredSpace) {
- node2.position.y = requiredSpace
- }
- }
+ const node1Bottom = node1.position.y + node1.metrics.height
+ const requiredY = node1Bottom + verticalSpacing
+
+ if (node2.position.y < requiredY) {
+ hasOverlap = true
+ node2.position.y = requiredY
- logger.debug('Resolved overlap between blocks', {
+ logger.debug('Resolved vertical overlap in layer', {
+ layer,
block1: node1.id,
block2: node2.id,
- sameLayer: node1.layer === node2.layer,
iteration,
})
}
@@ -228,14 +219,15 @@ function resolveOverlaps(nodes: GraphNode[], verticalSpacing: number): void {
}
if (hasOverlap) {
- logger.warn('Could not fully resolve all overlaps after max iterations', {
+ logger.warn('Could not fully resolve all vertical overlaps after max iterations', {
iterations: MAX_OVERLAP_ITERATIONS,
})
}
}
/**
- * Calculates positions for nodes organized by layer
+ * Calculates positions for nodes organized by layer.
+ * Uses cumulative width-based X positioning to properly handle containers of varying widths.
*/
export function calculatePositions(
layers: Map,
@@ -248,9 +240,27 @@ export function calculatePositions(
const layerNumbers = Array.from(layers.keys()).sort((a, b) => a - b)
+ // Calculate max width for each layer
+ const layerWidths = new Map()
+ for (const layerNum of layerNumbers) {
+ const nodesInLayer = layers.get(layerNum)!
+ const maxWidth = Math.max(...nodesInLayer.map((n) => n.metrics.width))
+ layerWidths.set(layerNum, maxWidth)
+ }
+
+ // Calculate cumulative X positions for each layer based on actual widths
+ const layerXPositions = new Map()
+ let cumulativeX = padding.x
+
+ for (const layerNum of layerNumbers) {
+ layerXPositions.set(layerNum, cumulativeX)
+ cumulativeX += layerWidths.get(layerNum)! + horizontalSpacing
+ }
+
+ // Position nodes using cumulative X
for (const layerNum of layerNumbers) {
const nodesInLayer = layers.get(layerNum)!
- const xPosition = padding.x + layerNum * horizontalSpacing
+ const xPosition = layerXPositions.get(layerNum)!
// Calculate total height for this layer
const totalHeight = nodesInLayer.reduce(
@@ -285,8 +295,8 @@ export function calculatePositions(
}
}
- // Resolve overlaps across all nodes
- resolveOverlaps(Array.from(layers.values()).flat(), verticalSpacing)
+ // Resolve vertical overlaps within layers (X overlaps prevented by cumulative positioning)
+ resolveVerticalOverlaps(Array.from(layers.values()).flat(), verticalSpacing)
}
/**
diff --git a/apps/sim/lib/workflows/autolayout/index.ts b/apps/sim/lib/workflows/autolayout/index.ts
index bc8f435419..5647f3bae0 100644
--- a/apps/sim/lib/workflows/autolayout/index.ts
+++ b/apps/sim/lib/workflows/autolayout/index.ts
@@ -1,4 +1,8 @@
import { createLogger } from '@/lib/logs/console/logger'
+import {
+ DEFAULT_HORIZONTAL_SPACING,
+ DEFAULT_VERTICAL_SPACING,
+} from '@/lib/workflows/autolayout/constants'
import { layoutContainers } from '@/lib/workflows/autolayout/containers'
import { assignLayers, layoutBlocksCore } from '@/lib/workflows/autolayout/core'
import type { Edge, LayoutOptions, LayoutResult } from '@/lib/workflows/autolayout/types'
@@ -6,6 +10,7 @@ import {
calculateSubflowDepths,
filterLayoutEligibleBlockIds,
getBlocksByParent,
+ prepareContainerDimensions,
} from '@/lib/workflows/autolayout/utils'
import type { BlockState } from '@/stores/workflows/workflow/types'
@@ -28,6 +33,19 @@ export function applyAutoLayout(
const blocksCopy: Record = JSON.parse(JSON.stringify(blocks))
+ const horizontalSpacing = options.horizontalSpacing ?? DEFAULT_HORIZONTAL_SPACING
+ const verticalSpacing = options.verticalSpacing ?? DEFAULT_VERTICAL_SPACING
+
+ // Pre-calculate container dimensions by laying out their children (bottom-up)
+ // This ensures accurate widths/heights before root-level layout
+ prepareContainerDimensions(
+ blocksCopy,
+ edges,
+ layoutBlocksCore,
+ horizontalSpacing,
+ verticalSpacing
+ )
+
const { root: rootBlockIds } = getBlocksByParent(blocksCopy)
const layoutRootIds = filterLayoutEligibleBlockIds(rootBlockIds, blocksCopy)
diff --git a/apps/sim/lib/workflows/autolayout/targeted.ts b/apps/sim/lib/workflows/autolayout/targeted.ts
index c0ebbe9408..97cb9e0715 100644
--- a/apps/sim/lib/workflows/autolayout/targeted.ts
+++ b/apps/sim/lib/workflows/autolayout/targeted.ts
@@ -12,6 +12,7 @@ import {
getBlockMetrics,
getBlocksByParent,
isContainerType,
+ prepareContainerDimensions,
shouldSkipAutoLayout,
} from '@/lib/workflows/autolayout/utils'
import { CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
@@ -47,6 +48,16 @@ export function applyTargetedLayout(
const changedSet = new Set(changedBlockIds)
const blocksCopy: Record = JSON.parse(JSON.stringify(blocks))
+ // Pre-calculate container dimensions by laying out their children (bottom-up)
+ // This ensures accurate widths/heights before root-level layout
+ prepareContainerDimensions(
+ blocksCopy,
+ edges,
+ layoutBlocksCore,
+ horizontalSpacing,
+ verticalSpacing
+ )
+
const groups = getBlocksByParent(blocksCopy)
// Calculate subflow depths before layout to properly position blocks after subflow ends
@@ -109,14 +120,15 @@ function layoutGroup(
const requestedLayout = layoutEligibleChildIds.filter((id) => {
const block = blocks[id]
if (!block) return false
- // Never reposition containers, only update their dimensions
- if (isContainerType(block.type)) return false
+ if (isContainerType(block.type)) {
+ return changedSet.has(id) && isDefaultPosition(block)
+ }
return changedSet.has(id)
})
const missingPositions = layoutEligibleChildIds.filter((id) => {
const block = blocks[id]
if (!block) return false
- return !hasPosition(block)
+ return !hasPosition(block) || isDefaultPosition(block)
})
const needsLayoutSet = new Set([...requestedLayout, ...missingPositions])
const needsLayout = Array.from(needsLayoutSet)
@@ -308,3 +320,13 @@ function hasPosition(block: BlockState): boolean {
const { x, y } = block.position
return Number.isFinite(x) && Number.isFinite(y)
}
+
+/**
+ * Checks if a block is at the default/uninitialized position (0, 0).
+ * New blocks typically start at this position before being laid out.
+ */
+function isDefaultPosition(block: BlockState): boolean {
+ if (!block.position) return true
+ const { x, y } = block.position
+ return x === 0 && y === 0
+}
diff --git a/apps/sim/lib/workflows/autolayout/utils.ts b/apps/sim/lib/workflows/autolayout/utils.ts
index a4cf5084e0..7c63edc81a 100644
--- a/apps/sim/lib/workflows/autolayout/utils.ts
+++ b/apps/sim/lib/workflows/autolayout/utils.ts
@@ -315,3 +315,126 @@ export function calculateSubflowDepths(
return depths
}
+
+/**
+ * Layout function type for preparing container dimensions.
+ * Returns laid out nodes and bounding dimensions.
+ */
+export type LayoutFunction = (
+ blocks: Record,
+ edges: Edge[],
+ options: {
+ isContainer: boolean
+ layoutOptions?: {
+ horizontalSpacing?: number
+ verticalSpacing?: number
+ padding?: { x: number; y: number }
+ alignment?: 'start' | 'center' | 'end'
+ }
+ subflowDepths?: Map
+ }
+) => { nodes: Map; dimensions: { width: number; height: number } }
+
+/**
+ * Pre-calculates container dimensions by laying out their children.
+ * Processes containers bottom-up to handle nested subflows correctly.
+ * This ensures accurate width/height values before root-level layout.
+ *
+ * @param blocks - All blocks in the workflow (will be mutated with updated dimensions)
+ * @param edges - All edges in the workflow
+ * @param layoutFn - The layout function to use for calculating dimensions
+ * @param horizontalSpacing - Horizontal spacing between blocks
+ * @param verticalSpacing - Vertical spacing between blocks
+ */
+export function prepareContainerDimensions(
+ blocks: Record,
+ edges: Edge[],
+ layoutFn: LayoutFunction,
+ horizontalSpacing: number,
+ verticalSpacing: number
+): void {
+ const { children } = getBlocksByParent(blocks)
+
+ // Build dependency graph to process nested containers bottom-up
+ const containerIds = Array.from(children.keys())
+ const containerDepth = new Map()
+
+ // Calculate nesting depth for each container
+ for (const containerId of containerIds) {
+ let depth = 0
+ let currentId: string | undefined = containerId
+ while (currentId) {
+ const block: BlockState | undefined = blocks[currentId]
+ const parentId: string | undefined = block?.data?.parentId
+ currentId = parentId
+ if (currentId) depth++
+ }
+ containerDepth.set(containerId, depth)
+ }
+
+ // Sort containers by depth (deepest first) for bottom-up processing
+ const sortedContainerIds = containerIds.sort((a, b) => {
+ const depthA = containerDepth.get(a) ?? 0
+ const depthB = containerDepth.get(b) ?? 0
+ return depthB - depthA
+ })
+
+ // Process each container, laying out its children to determine dimensions
+ for (const containerId of sortedContainerIds) {
+ const container = blocks[containerId]
+ if (!container) continue
+
+ const childIds = children.get(containerId) ?? []
+ const layoutChildIds = filterLayoutEligibleBlockIds(childIds, blocks)
+
+ if (layoutChildIds.length === 0) {
+ // Empty container - use default dimensions
+ container.data = {
+ ...container.data,
+ width: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+ height: CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
+ }
+ container.layout = {
+ ...container.layout,
+ measuredWidth: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+ measuredHeight: CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
+ }
+ continue
+ }
+
+ // Build subset of blocks and edges for this container's children
+ const childBlocks: Record = {}
+ for (const childId of layoutChildIds) {
+ childBlocks[childId] = blocks[childId]
+ }
+
+ const childEdges = edges.filter(
+ (edge) => layoutChildIds.includes(edge.source) && layoutChildIds.includes(edge.target)
+ )
+
+ // Layout children to get dimensions
+ const { dimensions } = layoutFn(childBlocks, childEdges, {
+ isContainer: true,
+ layoutOptions: {
+ horizontalSpacing: horizontalSpacing * 0.85,
+ verticalSpacing,
+ alignment: 'center',
+ },
+ })
+
+ // Update container with calculated dimensions
+ const calculatedWidth = Math.max(dimensions.width, CONTAINER_DIMENSIONS.DEFAULT_WIDTH)
+ const calculatedHeight = Math.max(dimensions.height, CONTAINER_DIMENSIONS.DEFAULT_HEIGHT)
+
+ container.data = {
+ ...container.data,
+ width: calculatedWidth,
+ height: calculatedHeight,
+ }
+ container.layout = {
+ ...container.layout,
+ measuredWidth: calculatedWidth,
+ measuredHeight: calculatedHeight,
+ }
+ }
+}
diff --git a/apps/sim/lib/workflows/sanitization/json-sanitizer.ts b/apps/sim/lib/workflows/sanitization/json-sanitizer.ts
index 864a1b5130..c3c414947e 100644
--- a/apps/sim/lib/workflows/sanitization/json-sanitizer.ts
+++ b/apps/sim/lib/workflows/sanitization/json-sanitizer.ts
@@ -2,7 +2,7 @@ import type { Edge } from 'reactflow'
import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/credential-extractor'
import type { BlockState, Loop, Parallel, WorkflowState } from '@/stores/workflows/workflow/types'
import { generateLoopBlocks, generateParallelBlocks } from '@/stores/workflows/workflow/utils'
-import { TRIGGER_PERSISTED_SUBBLOCK_IDS } from '@/triggers/consts'
+import { TRIGGER_PERSISTED_SUBBLOCK_IDS } from '@/triggers/constants'
/**
* Sanitized workflow state for copilot (removes all UI-specific data)
diff --git a/apps/sim/lib/workflows/training/compute-edit-sequence.ts b/apps/sim/lib/workflows/training/compute-edit-sequence.ts
index bf4204376e..b50ce49211 100644
--- a/apps/sim/lib/workflows/training/compute-edit-sequence.ts
+++ b/apps/sim/lib/workflows/training/compute-edit-sequence.ts
@@ -1,5 +1,5 @@
import type { CopilotWorkflowState } from '@/lib/workflows/sanitization/json-sanitizer'
-import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/consts'
+import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
export interface EditOperation {
operation_type: 'add' | 'edit' | 'delete' | 'insert_into_subflow' | 'extract_from_subflow'
diff --git a/apps/sim/providers/utils.test.ts b/apps/sim/providers/utils.test.ts
index ea8d7d5133..13977f37d9 100644
--- a/apps/sim/providers/utils.test.ts
+++ b/apps/sim/providers/utils.test.ts
@@ -41,7 +41,6 @@ describe('getApiKey', () => {
beforeEach(() => {
vi.clearAllMocks()
- // @ts-expect-error - mocking boolean with different value
isHostedSpy.mockReturnValue(false)
module.require = vi.fn(() => ({
@@ -55,7 +54,6 @@ describe('getApiKey', () => {
})
it('should return user-provided key when not in hosted environment', () => {
- // @ts-expect-error - mocking boolean with different value
isHostedSpy.mockReturnValue(false)
// For OpenAI
@@ -68,7 +66,6 @@ describe('getApiKey', () => {
})
it('should throw error if no key provided in non-hosted environment', () => {
- // @ts-expect-error - mocking boolean with different value
isHostedSpy.mockReturnValue(false)
expect(() => getApiKey('openai', 'gpt-4')).toThrow('API key is required for openai gpt-4')
diff --git a/apps/sim/socket-server/index.test.ts b/apps/sim/socket-server/index.test.ts
index 3f006607db..d21bb9b8aa 100644
--- a/apps/sim/socket-server/index.test.ts
+++ b/apps/sim/socket-server/index.test.ts
@@ -3,7 +3,7 @@
*
* @vitest-environment node
*/
-import { createServer } from 'http'
+import { createServer, request as httpRequest } from 'http'
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
import { createLogger } from '@/lib/logs/console/logger'
import { createSocketIOServer } from '@/socket-server/config/socket'
@@ -68,23 +68,17 @@ describe('Socket Server Index Integration', () => {
})
beforeEach(async () => {
- // Use a random port for each test to avoid conflicts
PORT = 3333 + Math.floor(Math.random() * 1000)
- // Create HTTP server
httpServer = createServer()
- // Create Socket.IO server using extracted config
io = createSocketIOServer(httpServer)
- // Initialize room manager after io is created
roomManager = new RoomManager(io)
- // Configure HTTP request handler
const httpHandler = createHttpHandler(roomManager, logger)
httpServer.on('request', httpHandler)
- // Start server with timeout handling
await new Promise((resolve, reject) => {
const timeout = setTimeout(() => {
reject(new Error(`Server failed to start on port ${PORT} within 15 seconds`))
@@ -98,7 +92,6 @@ describe('Socket Server Index Integration', () => {
httpServer.on('error', (err: any) => {
clearTimeout(timeout)
if (err.code === 'EADDRINUSE') {
- // Try a different port
PORT = 3333 + Math.floor(Math.random() * 1000)
httpServer.listen(PORT, '0.0.0.0', () => {
resolve()
@@ -111,7 +104,6 @@ describe('Socket Server Index Integration', () => {
}, 20000)
afterEach(async () => {
- // Properly close servers and wait for them to fully close
if (io) {
await new Promise((resolve) => {
io.close(() => resolve())
@@ -132,18 +124,40 @@ describe('Socket Server Index Integration', () => {
})
it('should handle health check endpoint', async () => {
- try {
- const response = await fetch(`http://localhost:${PORT}/health`)
- expect(response.status).toBe(200)
-
- const data = await response.json()
- expect(data).toHaveProperty('status', 'ok')
- expect(data).toHaveProperty('timestamp')
- expect(data).toHaveProperty('connections')
- } catch (error) {
- // Skip this test if fetch fails (likely due to test environment)
- console.warn('Health check test skipped due to fetch error:', error)
- }
+ const data = await new Promise<{ status: string; timestamp: number; connections: number }>(
+ (resolve, reject) => {
+ const req = httpRequest(
+ {
+ hostname: 'localhost',
+ port: PORT,
+ path: '/health',
+ method: 'GET',
+ },
+ (res) => {
+ expect(res.statusCode).toBe(200)
+
+ let body = ''
+ res.on('data', (chunk) => {
+ body += chunk
+ })
+ res.on('end', () => {
+ try {
+ resolve(JSON.parse(body))
+ } catch (e) {
+ reject(e)
+ }
+ })
+ }
+ )
+
+ req.on('error', reject)
+ req.end()
+ }
+ )
+
+ expect(data).toHaveProperty('status', 'ok')
+ expect(data).toHaveProperty('timestamp')
+ expect(data).toHaveProperty('connections')
})
})
@@ -228,7 +242,6 @@ describe('Socket Server Index Integration', () => {
describe('Module Integration', () => {
it.concurrent('should properly import all extracted modules', async () => {
- // Test that all modules can be imported without errors
const { createSocketIOServer } = await import('@/socket-server/config/socket')
const { createHttpHandler } = await import('@/socket-server/routes/http')
const { RoomManager } = await import('@/socket-server/rooms/manager')
@@ -247,12 +260,10 @@ describe('Socket Server Index Integration', () => {
})
it.concurrent('should maintain all original functionality after refactoring', () => {
- // Verify that the main components are properly instantiated
expect(httpServer).toBeDefined()
expect(io).toBeDefined()
expect(roomManager).toBeDefined()
- // Verify core methods exist and are callable
expect(typeof roomManager.createWorkflowRoom).toBe('function')
expect(typeof roomManager.cleanupUserFromRoom).toBe('function')
expect(typeof roomManager.handleWorkflowDeletion).toBe('function')
diff --git a/apps/sim/socket-server/tests/socket-server.test.ts b/apps/sim/socket-server/tests/socket-server.test.ts
index 2414716791..706024de10 100644
--- a/apps/sim/socket-server/tests/socket-server.test.ts
+++ b/apps/sim/socket-server/tests/socket-server.test.ts
@@ -1,7 +1,7 @@
import { createServer } from 'http'
import { Server } from 'socket.io'
import { io, type Socket } from 'socket.io-client'
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
describe('Socket Server Integration Tests', () => {
let httpServer: any
@@ -10,7 +10,6 @@ describe('Socket Server Integration Tests', () => {
let serverPort: number
beforeAll(async () => {
- // Create a test server instance
httpServer = createServer()
socketServer = new Server(httpServer, {
cors: {
@@ -19,7 +18,6 @@ describe('Socket Server Integration Tests', () => {
},
})
- // Start server on random port
await new Promise((resolve) => {
httpServer.listen(() => {
serverPort = httpServer.address()?.port
@@ -27,7 +25,6 @@ describe('Socket Server Integration Tests', () => {
})
})
- // Basic socket handlers for testing
socketServer.on('connection', (socket) => {
socket.on('join-workflow', ({ workflowId }) => {
socket.join(workflowId)
@@ -41,19 +38,7 @@ describe('Socket Server Integration Tests', () => {
})
})
})
- })
-
- afterAll(async () => {
- if (socketServer) {
- socketServer.close()
- }
- if (httpServer) {
- httpServer.close()
- }
- })
- beforeEach(async () => {
- // Create client socket for each test
clientSocket = io(`http://localhost:${serverPort}`, {
transports: ['polling', 'websocket'],
})
@@ -65,10 +50,16 @@ describe('Socket Server Integration Tests', () => {
})
})
- afterEach(() => {
+ afterAll(async () => {
if (clientSocket) {
clientSocket.close()
}
+ if (socketServer) {
+ socketServer.close()
+ }
+ if (httpServer) {
+ httpServer.close()
+ }
})
it('should connect to socket server', () => {
@@ -79,7 +70,7 @@ describe('Socket Server Integration Tests', () => {
const workflowId = 'test-workflow-123'
const joinedPromise = new Promise((resolve) => {
- clientSocket.on('joined-workflow', (data) => {
+ clientSocket.once('joined-workflow', (data) => {
expect(data.workflowId).toBe(workflowId)
resolve()
})
@@ -92,39 +83,45 @@ describe('Socket Server Integration Tests', () => {
it('should broadcast workflow operations', async () => {
const workflowId = 'test-workflow-456'
- // Create second client
const client2 = io(`http://localhost:${serverPort}`)
await new Promise((resolve) => {
- client2.on('connect', resolve)
+ client2.once('connect', resolve)
})
- // Both clients join the same workflow
- clientSocket.emit('join-workflow', { workflowId })
- client2.emit('join-workflow', { workflowId })
+ try {
+ const join1Promise = new Promise((resolve) => {
+ clientSocket.once('joined-workflow', () => resolve())
+ })
+ const join2Promise = new Promise((resolve) => {
+ client2.once('joined-workflow', () => resolve())
+ })
- // Wait for joins to complete
- await new Promise((resolve) => setTimeout(resolve, 100))
+ clientSocket.emit('join-workflow', { workflowId })
+ client2.emit('join-workflow', { workflowId })
- const operationPromise = new Promise((resolve) => {
- client2.on('workflow-operation', (data) => {
- expect(data.operation).toBe('add')
- expect(data.target).toBe('block')
- expect(data.payload.id).toBe('block-123')
- resolve()
+ await Promise.all([join1Promise, join2Promise])
+
+ const operationPromise = new Promise((resolve) => {
+ client2.once('workflow-operation', (data) => {
+ expect(data.operation).toBe('add')
+ expect(data.target).toBe('block')
+ expect(data.payload.id).toBe('block-123')
+ resolve()
+ })
})
- })
- // Client 1 sends operation
- clientSocket.emit('workflow-operation', {
- workflowId,
- operation: 'add',
- target: 'block',
- payload: { id: 'block-123', type: 'action', name: 'Test Block' },
- timestamp: Date.now(),
- })
+ clientSocket.emit('workflow-operation', {
+ workflowId,
+ operation: 'add',
+ target: 'block',
+ payload: { id: 'block-123', type: 'action', name: 'Test Block' },
+ timestamp: Date.now(),
+ })
- await operationPromise
- client2.close()
+ await operationPromise
+ } finally {
+ client2.close()
+ }
})
it('should handle multiple concurrent connections', async () => {
@@ -132,51 +129,58 @@ describe('Socket Server Integration Tests', () => {
const clients: Socket[] = []
const workflowId = 'stress-test-workflow'
- // Create multiple clients
- for (let i = 0; i < numClients; i++) {
- const client = io(`http://localhost:${serverPort}`)
- clients.push(client)
+ try {
+ const connectPromises = Array.from({ length: numClients }, () => {
+ const client = io(`http://localhost:${serverPort}`)
+ clients.push(client)
+ return new Promise((resolve) => {
+ client.once('connect', resolve)
+ })
+ })
- await new Promise((resolve) => {
- client.on('connect', resolve)
+ await Promise.all(connectPromises)
+
+ const joinPromises = clients.map((client) => {
+ return new Promise((resolve) => {
+ client.once('joined-workflow', () => resolve())
+ })
})
- client.emit('join-workflow', { workflowId })
- }
+ clients.forEach((client) => {
+ client.emit('join-workflow', { workflowId })
+ })
- // Wait for all joins
- await new Promise((resolve) => setTimeout(resolve, 200))
+ await Promise.all(joinPromises)
- let receivedCount = 0
- const expectedCount = numClients - 1 // All except sender
+ let receivedCount = 0
+ const expectedCount = numClients - 1
- const operationPromise = new Promise((resolve) => {
- clients.forEach((client, index) => {
- if (index === 0) return // Skip sender
+ const operationPromise = new Promise((resolve) => {
+ clients.forEach((client, index) => {
+ if (index === 0) return
- client.on('workflow-operation', () => {
- receivedCount++
- if (receivedCount === expectedCount) {
- resolve()
- }
+ client.once('workflow-operation', () => {
+ receivedCount++
+ if (receivedCount === expectedCount) {
+ resolve()
+ }
+ })
})
})
- })
- // First client sends operation
- clients[0].emit('workflow-operation', {
- workflowId,
- operation: 'add',
- target: 'block',
- payload: { id: 'stress-block', type: 'action' },
- timestamp: Date.now(),
- })
-
- await operationPromise
- expect(receivedCount).toBe(expectedCount)
+ clients[0].emit('workflow-operation', {
+ workflowId,
+ operation: 'add',
+ target: 'block',
+ payload: { id: 'stress-block', type: 'action' },
+ timestamp: Date.now(),
+ })
- // Clean up
- clients.forEach((client) => client.close())
+ await operationPromise
+ expect(receivedCount).toBe(expectedCount)
+ } finally {
+ clients.forEach((client) => client.close())
+ }
})
it('should handle rapid operations without loss', async () => {
@@ -185,43 +189,51 @@ describe('Socket Server Integration Tests', () => {
const client2 = io(`http://localhost:${serverPort}`)
await new Promise((resolve) => {
- client2.on('connect', resolve)
+ client2.once('connect', resolve)
})
- clientSocket.emit('join-workflow', { workflowId })
- client2.emit('join-workflow', { workflowId })
+ try {
+ const join1Promise = new Promise((resolve) => {
+ clientSocket.once('joined-workflow', () => resolve())
+ })
+ const join2Promise = new Promise((resolve) => {
+ client2.once('joined-workflow', () => resolve())
+ })
- await new Promise((resolve) => setTimeout(resolve, 100))
+ clientSocket.emit('join-workflow', { workflowId })
+ client2.emit('join-workflow', { workflowId })
- let receivedCount = 0
- const receivedOperations = new Set()
+ await Promise.all([join1Promise, join2Promise])
- const operationsPromise = new Promise((resolve) => {
- client2.on('workflow-operation', (data) => {
- receivedCount++
- receivedOperations.add(data.payload.id)
+ let receivedCount = 0
+ const receivedOperations = new Set()
- if (receivedCount === numOperations) {
- resolve()
- }
- })
- })
+ const operationsPromise = new Promise((resolve) => {
+ client2.on('workflow-operation', (data) => {
+ receivedCount++
+ receivedOperations.add(data.payload.id)
- // Send rapid operations
- for (let i = 0; i < numOperations; i++) {
- clientSocket.emit('workflow-operation', {
- workflowId,
- operation: 'add',
- target: 'block',
- payload: { id: `rapid-block-${i}`, type: 'action' },
- timestamp: Date.now(),
+ if (receivedCount === numOperations) {
+ resolve()
+ }
+ })
})
- }
- await operationsPromise
- expect(receivedCount).toBe(numOperations)
- expect(receivedOperations.size).toBe(numOperations)
+ for (let i = 0; i < numOperations; i++) {
+ clientSocket.emit('workflow-operation', {
+ workflowId,
+ operation: 'add',
+ target: 'block',
+ payload: { id: `rapid-block-${i}`, type: 'action' },
+ timestamp: Date.now(),
+ })
+ }
- client2.close()
+ await operationsPromise
+ expect(receivedCount).toBe(numOperations)
+ expect(receivedOperations.size).toBe(numOperations)
+ } finally {
+ client2.close()
+ }
})
})
diff --git a/apps/sim/stores/sidebar/store.ts b/apps/sim/stores/sidebar/store.ts
index 47da89629e..139330eec3 100644
--- a/apps/sim/stores/sidebar/store.ts
+++ b/apps/sim/stores/sidebar/store.ts
@@ -8,9 +8,11 @@ interface SidebarState {
workspaceDropdownOpen: boolean
sidebarWidth: number
isCollapsed: boolean
+ _hasHydrated: boolean
setWorkspaceDropdownOpen: (isOpen: boolean) => void
setSidebarWidth: (width: number) => void
setIsCollapsed: (isCollapsed: boolean) => void
+ setHasHydrated: (hasHydrated: boolean) => void
}
/**
@@ -26,6 +28,7 @@ export const useSidebarStore = create()(
workspaceDropdownOpen: false,
sidebarWidth: DEFAULT_SIDEBAR_WIDTH,
isCollapsed: false,
+ _hasHydrated: false,
setWorkspaceDropdownOpen: (isOpen) => set({ workspaceDropdownOpen: isOpen }),
setSidebarWidth: (width) => {
// Only enforce minimum - maximum is enforced dynamically by the resize hook
@@ -47,17 +50,24 @@ export const useSidebarStore = create()(
document.documentElement.style.setProperty('--sidebar-width', `${currentWidth}px`)
}
},
+ setHasHydrated: (hasHydrated) => set({ _hasHydrated: hasHydrated }),
}),
{
name: 'sidebar-state',
onRehydrateStorage: () => (state) => {
- // Validate and enforce constraints after rehydration
- if (state && typeof window !== 'undefined') {
- // Use 0 width if collapsed (floating UI), otherwise use stored width
- const width = state.isCollapsed ? 0 : state.sidebarWidth
- document.documentElement.style.setProperty('--sidebar-width', `${width}px`)
+ // Mark store as hydrated and apply CSS variables
+ if (state) {
+ state.setHasHydrated(true)
+ if (typeof window !== 'undefined') {
+ const width = state.isCollapsed ? 0 : state.sidebarWidth
+ document.documentElement.style.setProperty('--sidebar-width', `${width}px`)
+ }
}
},
+ partialize: (state) => ({
+ sidebarWidth: state.sidebarWidth,
+ isCollapsed: state.isCollapsed,
+ }),
}
)
)
diff --git a/apps/sim/stores/workflows/json/importer.ts b/apps/sim/stores/workflows/json/importer.ts
index 16da473f1b..6157cfd3b9 100644
--- a/apps/sim/stores/workflows/json/importer.ts
+++ b/apps/sim/stores/workflows/json/importer.ts
@@ -1,5 +1,6 @@
import { v4 as uuidv4 } from 'uuid'
import { createLogger } from '@/lib/logs/console/logger'
+import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
import type { WorkflowState } from '../workflow/types'
const logger = createLogger('WorkflowJsonImporter')
@@ -60,10 +61,18 @@ function regenerateIds(workflowState: WorkflowState): WorkflowState {
})
}
- // Fifth pass: update any block references in subblock values
+ // Fifth pass: update any block references in subblock values and clear runtime trigger values
Object.entries(newBlocks).forEach(([blockId, block]) => {
if (block.subBlocks) {
Object.entries(block.subBlocks).forEach(([subBlockId, subBlock]) => {
+ if (TRIGGER_RUNTIME_SUBBLOCK_IDS.includes(subBlockId)) {
+ block.subBlocks[subBlockId] = {
+ ...subBlock,
+ value: null,
+ }
+ return
+ }
+
if (subBlock.value && typeof subBlock.value === 'string') {
// Replace any block references in the value
let updatedValue = subBlock.value
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 842a1ff40f..02195ebf41 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -6,7 +6,7 @@ import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
import { getBlock } from '@/blocks'
import type { SubBlockConfig } from '@/blocks/types'
-import { isAnnotationOnlyBlock } from '@/executor/consts'
+import { isAnnotationOnlyBlock } from '@/executor/constants'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
import { useSubBlockStore } from '@/stores/workflows/subblock/store'
import {
diff --git a/apps/sim/tools/cursor/add_followup.ts b/apps/sim/tools/cursor/add_followup.ts
new file mode 100644
index 0000000000..5291d57ade
--- /dev/null
+++ b/apps/sim/tools/cursor/add_followup.ts
@@ -0,0 +1,89 @@
+import type { AddFollowupParams, AddFollowupResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const addFollowupTool: ToolConfig = {
+ id: 'cursor_add_followup',
+ name: 'Cursor Add Follow-up',
+ description: 'Add a follow-up instruction to an existing cloud agent.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ agentId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+ },
+ followupPromptText: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'The follow-up instruction text for the agent',
+ },
+ promptImages: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'JSON array of image objects with base64 data and dimensions (max 5)',
+ },
+ },
+
+ request: {
+ url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}/followup`,
+ method: 'POST',
+ headers: (params) => ({
+ 'Content-Type': 'application/json',
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ body: (params) => {
+ const body: Record = {
+ prompt: {
+ text: params.followupPromptText,
+ },
+ }
+
+ if (params.promptImages) {
+ try {
+ body.prompt.images = JSON.parse(params.promptImages)
+ } catch {
+ body.prompt.images = []
+ }
+ }
+
+ return body
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+
+ const content = `Follow-up added to agent ${data.id}`
+
+ return {
+ success: true,
+ output: {
+ content,
+ metadata: {
+ id: data.id,
+ },
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Success message' },
+ metadata: {
+ type: 'object',
+ description: 'Result metadata',
+ properties: {
+ id: { type: 'string', description: 'Agent ID' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/delete_agent.ts b/apps/sim/tools/cursor/delete_agent.ts
new file mode 100644
index 0000000000..ba6d10f7bb
--- /dev/null
+++ b/apps/sim/tools/cursor/delete_agent.ts
@@ -0,0 +1,59 @@
+import type { DeleteAgentParams, DeleteAgentResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const deleteAgentTool: ToolConfig = {
+ id: 'cursor_delete_agent',
+ name: 'Cursor Delete Agent',
+ description: 'Permanently delete a cloud agent. This action cannot be undone.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ agentId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+ },
+ },
+
+ request: {
+ url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}`,
+ method: 'DELETE',
+ headers: (params) => ({
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+
+ const content = `Agent ${data.id} has been deleted`
+
+ return {
+ success: true,
+ output: {
+ content,
+ metadata: {
+ id: data.id,
+ },
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Success message' },
+ metadata: {
+ type: 'object',
+ description: 'Result metadata',
+ properties: {
+ id: { type: 'string', description: 'Agent ID' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/get_agent.ts b/apps/sim/tools/cursor/get_agent.ts
new file mode 100644
index 0000000000..7dd62ff24b
--- /dev/null
+++ b/apps/sim/tools/cursor/get_agent.ts
@@ -0,0 +1,61 @@
+import type { GetAgentParams, GetAgentResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const getAgentTool: ToolConfig = {
+ id: 'cursor_get_agent',
+ name: 'Cursor Get Agent',
+ description: 'Retrieve the current status and results of a cloud agent.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ agentId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+ },
+ },
+
+ request: {
+ url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}`,
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+
+ return {
+ success: true,
+ output: {
+ content: `Agent "${data.name}" is ${data.status}`,
+ metadata: data,
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Human-readable agent details' },
+ metadata: {
+ type: 'object',
+ description: 'Agent metadata',
+ properties: {
+ id: { type: 'string', description: 'Agent ID' },
+ name: { type: 'string', description: 'Agent name' },
+ status: { type: 'string', description: 'Agent status' },
+ source: { type: 'object', description: 'Source repository info' },
+ target: { type: 'object', description: 'Target branch info' },
+ summary: { type: 'string', description: 'Agent summary', optional: true },
+ createdAt: { type: 'string', description: 'Creation timestamp' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/get_conversation.ts b/apps/sim/tools/cursor/get_conversation.ts
new file mode 100644
index 0000000000..f9c231f656
--- /dev/null
+++ b/apps/sim/tools/cursor/get_conversation.ts
@@ -0,0 +1,63 @@
+import type { GetConversationParams, GetConversationResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const getConversationTool: ToolConfig = {
+ id: 'cursor_get_conversation',
+ name: 'Cursor Get Conversation',
+ description:
+ 'Retrieve the conversation history of a cloud agent, including all user prompts and assistant responses.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ agentId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+ },
+ },
+
+ request: {
+ url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}/conversation`,
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+
+ return {
+ success: true,
+ output: {
+ content: `Retrieved ${data.messages.length} messages`,
+ metadata: {
+ id: data.id,
+ messages: data.messages,
+ },
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Human-readable conversation history' },
+ metadata: {
+ type: 'object',
+ description: 'Conversation metadata',
+ properties: {
+ id: { type: 'string', description: 'Agent ID' },
+ messages: {
+ type: 'array',
+ description: 'Array of conversation messages',
+ },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/index.ts b/apps/sim/tools/cursor/index.ts
new file mode 100644
index 0000000000..009eaec6c5
--- /dev/null
+++ b/apps/sim/tools/cursor/index.ts
@@ -0,0 +1,15 @@
+import { addFollowupTool } from '@/tools/cursor/add_followup'
+import { deleteAgentTool } from '@/tools/cursor/delete_agent'
+import { getAgentTool } from '@/tools/cursor/get_agent'
+import { getConversationTool } from '@/tools/cursor/get_conversation'
+import { launchAgentTool } from '@/tools/cursor/launch_agent'
+import { listAgentsTool } from '@/tools/cursor/list_agents'
+import { stopAgentTool } from '@/tools/cursor/stop_agent'
+
+export const cursorListAgentsTool = listAgentsTool
+export const cursorGetAgentTool = getAgentTool
+export const cursorGetConversationTool = getConversationTool
+export const cursorLaunchAgentTool = launchAgentTool
+export const cursorAddFollowupTool = addFollowupTool
+export const cursorStopAgentTool = stopAgentTool
+export const cursorDeleteAgentTool = deleteAgentTool
diff --git a/apps/sim/tools/cursor/launch_agent.ts b/apps/sim/tools/cursor/launch_agent.ts
new file mode 100644
index 0000000000..87a4887610
--- /dev/null
+++ b/apps/sim/tools/cursor/launch_agent.ts
@@ -0,0 +1,150 @@
+import type { LaunchAgentParams, LaunchAgentResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const launchAgentTool: ToolConfig = {
+ id: 'cursor_launch_agent',
+ name: 'Cursor Launch Agent',
+ description:
+ 'Start a new cloud agent to work on a GitHub repository with the given instructions.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ repository: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'GitHub repository URL (e.g., https://github.com/your-org/your-repo)',
+ },
+ ref: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Branch, tag, or commit to work from (defaults to default branch)',
+ },
+ promptText: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'The instruction text for the agent',
+ },
+ promptImages: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'JSON array of image objects with base64 data and dimensions',
+ },
+ model: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Model to use (leave empty for auto-selection)',
+ },
+ branchName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Custom branch name for the agent to use',
+ },
+ autoCreatePr: {
+ type: 'boolean',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Automatically create a PR when the agent finishes',
+ },
+ openAsCursorGithubApp: {
+ type: 'boolean',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Open the PR as the Cursor GitHub App',
+ },
+ skipReviewerRequest: {
+ type: 'boolean',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Skip requesting reviewers on the PR',
+ },
+ },
+
+ request: {
+ url: () => 'https://api.cursor.com/v0/agents',
+ method: 'POST',
+ headers: (params) => ({
+ 'Content-Type': 'application/json',
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ body: (params) => {
+ const body: Record = {
+ source: {
+ repository: params.repository,
+ },
+ prompt: {
+ text: params.promptText,
+ },
+ }
+
+ if (params.ref) {
+ body.source.ref = params.ref
+ }
+
+ if (params.promptImages) {
+ try {
+ body.prompt.images = JSON.parse(params.promptImages)
+ } catch {
+ body.prompt.images = []
+ }
+ }
+
+ if (params.model) {
+ body.model = params.model
+ }
+
+ const target: Record = {}
+ if (params.branchName) target.branchName = params.branchName
+ if (typeof params.autoCreatePr === 'boolean') target.autoCreatePr = params.autoCreatePr
+ if (typeof params.openAsCursorGithubApp === 'boolean')
+ target.openAsCursorGithubApp = params.openAsCursorGithubApp
+ if (typeof params.skipReviewerRequest === 'boolean')
+ target.skipReviewerRequest = params.skipReviewerRequest
+
+ if (Object.keys(target).length > 0) {
+ body.target = target
+ }
+
+ return body
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ const agentUrl = `https://cursor.com/agents?selectedBcId=${data.id}`
+
+ return {
+ success: true,
+ output: {
+ content: 'Agent launched successfully!',
+ metadata: {
+ id: data.id,
+ url: agentUrl,
+ },
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Success message with agent details' },
+ metadata: {
+ type: 'object',
+ description: 'Launch result metadata',
+ properties: {
+ id: { type: 'string', description: 'Agent ID' },
+ url: { type: 'string', description: 'Agent URL' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/list_agents.ts b/apps/sim/tools/cursor/list_agents.ts
new file mode 100644
index 0000000000..7f96f67812
--- /dev/null
+++ b/apps/sim/tools/cursor/list_agents.ts
@@ -0,0 +1,77 @@
+import type { ListAgentsParams, ListAgentsResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const listAgentsTool: ToolConfig = {
+ id: 'cursor_list_agents',
+ name: 'Cursor List Agents',
+ description: 'List all cloud agents for the authenticated user with optional pagination.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ limit: {
+ type: 'number',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Number of agents to return (default: 20, max: 100)',
+ },
+ cursor: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Pagination cursor from previous response',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const url = new URL('https://api.cursor.com/v0/agents')
+ if (params.limit) url.searchParams.set('limit', String(params.limit))
+ if (params.cursor) url.searchParams.set('cursor', params.cursor)
+ return url.toString()
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+
+ return {
+ success: true,
+ output: {
+ content: `Found ${data.agents.length} agents`,
+ metadata: {
+ agents: data.agents,
+ nextCursor: data.nextCursor,
+ },
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Human-readable list of agents' },
+ metadata: {
+ type: 'object',
+ description: 'Agent list metadata',
+ properties: {
+ agents: {
+ type: 'array',
+ description: 'Array of agent objects',
+ },
+ nextCursor: {
+ type: 'string',
+ description: 'Pagination cursor for next page',
+ optional: true,
+ },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/stop_agent.ts b/apps/sim/tools/cursor/stop_agent.ts
new file mode 100644
index 0000000000..6680bb681f
--- /dev/null
+++ b/apps/sim/tools/cursor/stop_agent.ts
@@ -0,0 +1,59 @@
+import type { StopAgentParams, StopAgentResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const stopAgentTool: ToolConfig = {
+ id: 'cursor_stop_agent',
+ name: 'Cursor Stop Agent',
+ description: 'Stop a running cloud agent. This pauses the agent without deleting it.',
+ version: '1.0.0',
+
+ params: {
+ apiKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Cursor API key',
+ },
+ agentId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+ },
+ },
+
+ request: {
+ url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}/stop`,
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+
+ const content = `Agent ${data.id} has been stopped`
+
+ return {
+ success: true,
+ output: {
+ content,
+ metadata: {
+ id: data.id,
+ },
+ },
+ }
+ },
+
+ outputs: {
+ content: { type: 'string', description: 'Success message' },
+ metadata: {
+ type: 'object',
+ description: 'Result metadata',
+ properties: {
+ id: { type: 'string', description: 'Agent ID' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/cursor/types.ts b/apps/sim/tools/cursor/types.ts
new file mode 100644
index 0000000000..4ec843ce28
--- /dev/null
+++ b/apps/sim/tools/cursor/types.ts
@@ -0,0 +1,187 @@
+import type { ToolResponse } from '@/tools/types'
+
+export interface BaseCursorParams {
+ apiKey: string
+}
+
+export interface ListAgentsParams extends BaseCursorParams {
+ limit?: number
+ cursor?: string
+}
+
+export interface GetAgentParams extends BaseCursorParams {
+ agentId: string
+}
+
+export interface GetConversationParams extends BaseCursorParams {
+ agentId: string
+}
+
+export interface LaunchAgentParams extends BaseCursorParams {
+ repository: string
+ ref?: string
+ promptText: string
+ promptImages?: string
+ model?: string
+ branchName?: string
+ autoCreatePr?: boolean
+ openAsCursorGithubApp?: boolean
+ skipReviewerRequest?: boolean
+}
+
+export interface AddFollowupParams extends BaseCursorParams {
+ agentId: string
+ followupPromptText: string
+ promptImages?: string
+}
+
+export interface StopAgentParams extends BaseCursorParams {
+ agentId: string
+}
+
+export interface DeleteAgentParams extends BaseCursorParams {
+ agentId: string
+}
+
+interface AgentSource {
+ repository: string
+ ref: string
+}
+
+interface AgentTarget {
+ branchName: string
+ url: string
+ prUrl?: string
+ autoCreatePr: boolean
+ openAsCursorGithubApp: boolean
+ skipReviewerRequest: boolean
+}
+
+interface AgentMetadata {
+ id: string
+ name: string
+ status: 'RUNNING' | 'FINISHED' | 'STOPPED' | 'FAILED'
+ source: AgentSource
+ target: AgentTarget
+ summary?: string
+ createdAt: string
+}
+
+interface ConversationMessage {
+ id: string
+ type: 'user_message' | 'assistant_message'
+ text: string
+}
+
+interface RepositoryMetadata {
+ owner: string
+ name: string
+ repository: string
+}
+
+interface ApiKeyInfoMetadata {
+ apiKeyName: string
+ createdAt: string
+ userEmail: string
+}
+
+export interface ListAgentsResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ agents: AgentMetadata[]
+ nextCursor?: string
+ }
+ }
+}
+
+export interface GetAgentResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: AgentMetadata
+ }
+}
+
+export interface GetConversationResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ id: string
+ messages: ConversationMessage[]
+ }
+ }
+}
+
+export interface LaunchAgentResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ id: string
+ url: string
+ }
+ }
+}
+
+export interface AddFollowupResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ id: string
+ }
+ }
+}
+
+export interface StopAgentResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ id: string
+ }
+ }
+}
+
+export interface DeleteAgentResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ id: string
+ }
+ }
+}
+
+export interface GetApiKeyInfoResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: ApiKeyInfoMetadata
+ }
+}
+
+export interface ListModelsResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ models: string[]
+ }
+ }
+}
+
+export interface ListRepositoriesResponse extends ToolResponse {
+ output: {
+ content: string
+ metadata: {
+ repositories: RepositoryMetadata[]
+ }
+ }
+}
+
+export type CursorResponse =
+ | ListAgentsResponse
+ | GetAgentResponse
+ | GetConversationResponse
+ | LaunchAgentResponse
+ | AddFollowupResponse
+ | StopAgentResponse
+ | DeleteAgentResponse
+ | GetApiKeyInfoResponse
+ | ListModelsResponse
+ | ListRepositoriesResponse
diff --git a/apps/sim/tools/dynamodb/index.ts b/apps/sim/tools/dynamodb/index.ts
index b2e7bdf46d..69e95f7901 100644
--- a/apps/sim/tools/dynamodb/index.ts
+++ b/apps/sim/tools/dynamodb/index.ts
@@ -5,4 +5,9 @@ import { queryTool } from './query'
import { scanTool } from './scan'
import { updateTool } from './update'
-export { deleteTool, getTool, putTool, queryTool, scanTool, updateTool }
+export const dynamodbDeleteTool = deleteTool
+export const dynamodbGetTool = getTool
+export const dynamodbPutTool = putTool
+export const dynamodbQueryTool = queryTool
+export const dynamodbScanTool = scanTool
+export const dynamodbUpdateTool = updateTool
diff --git a/apps/sim/tools/firecrawl/index.ts b/apps/sim/tools/firecrawl/index.ts
index 870b1e820a..ae0ca66e43 100644
--- a/apps/sim/tools/firecrawl/index.ts
+++ b/apps/sim/tools/firecrawl/index.ts
@@ -4,4 +4,8 @@ import { mapTool } from '@/tools/firecrawl/map'
import { scrapeTool } from '@/tools/firecrawl/scrape'
import { searchTool } from '@/tools/firecrawl/search'
-export { scrapeTool, searchTool, crawlTool, mapTool, extractTool }
+export const firecrawlScrapeTool = scrapeTool
+export const firecrawlSearchTool = searchTool
+export const firecrawlCrawlTool = crawlTool
+export const firecrawlMapTool = mapTool
+export const firecrawlExtractTool = extractTool
diff --git a/apps/sim/tools/google/index.ts b/apps/sim/tools/google/index.ts
index baa2a16f5a..4419837d9a 100644
--- a/apps/sim/tools/google/index.ts
+++ b/apps/sim/tools/google/index.ts
@@ -1,3 +1,3 @@
-import { searchTool } from '@/tools/google/search'
+import { searchTool } from './search'
-export { searchTool }
+export const googleSearchTool = searchTool
diff --git a/apps/sim/tools/google_docs/create.ts b/apps/sim/tools/google_docs/create.ts
index 5339b36867..9191dd8b3f 100644
--- a/apps/sim/tools/google_docs/create.ts
+++ b/apps/sim/tools/google_docs/create.ts
@@ -50,7 +50,7 @@ export const createTool: ToolConfig {
- return 'https://www.googleapis.com/drive/v3/files'
+ return 'https://www.googleapis.com/drive/v3/files?supportsAllDrives=true'
},
method: 'POST',
headers: (params) => {
diff --git a/apps/sim/tools/google_drive/download.ts b/apps/sim/tools/google_drive/download.ts
index 6e92e9474c..4aa0d58544 100644
--- a/apps/sim/tools/google_drive/download.ts
+++ b/apps/sim/tools/google_drive/download.ts
@@ -45,7 +45,7 @@ export const downloadTool: ToolConfig
- `https://www.googleapis.com/drive/v3/files/${params.fileId}?fields=id,name,mimeType`,
+ `https://www.googleapis.com/drive/v3/files/${params.fileId}?fields=id,name,mimeType&supportsAllDrives=true`,
method: 'GET',
headers: (params) => ({
Authorization: `Bearer ${params.accessToken}`,
@@ -83,7 +83,7 @@ export const downloadTool: ToolConfig
- `https://www.googleapis.com/drive/v3/files/${params.fileId}?fields=id,name,mimeType`,
+ `https://www.googleapis.com/drive/v3/files/${params.fileId}?fields=id,name,mimeType&supportsAllDrives=true`,
method: 'GET',
headers: (params) => ({
Authorization: `Bearer ${params.accessToken}`,
@@ -77,7 +77,7 @@ export const getContentTool: ToolConfig = {
+ id: 'google_groups_add_member',
+ name: 'Google Groups Add Member',
+ description: 'Add a new member to a Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ email: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Email address of the member to add',
+ },
+ role: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Role for the member (MEMBER, MANAGER, or OWNER). Defaults to MEMBER.',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/members`
+ },
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {
+ email: params.email,
+ role: params.role || 'MEMBER',
+ }
+
+ return JSON.stringify(body)
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to add member to group')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/create_group.ts b/apps/sim/tools/google_groups/create_group.ts
new file mode 100644
index 0000000000..fb696bed60
--- /dev/null
+++ b/apps/sim/tools/google_groups/create_group.ts
@@ -0,0 +1,73 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsCreateParams, GoogleGroupsResponse } from './types'
+
+export const createGroupTool: ToolConfig = {
+ id: 'google_groups_create_group',
+ name: 'Google Groups Create Group',
+ description: 'Create a new Google Group in the domain',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ email: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Email address for the new group (e.g., team@yourdomain.com)',
+ },
+ name: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Display name for the group',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Description of the group',
+ },
+ },
+
+ request: {
+ url: () => 'https://admin.googleapis.com/admin/directory/v1/groups',
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {
+ email: params.email,
+ name: params.name,
+ }
+
+ if (params.description) {
+ body.description = params.description
+ }
+
+ return JSON.stringify(body)
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to create group')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/delete_group.ts b/apps/sim/tools/google_groups/delete_group.ts
new file mode 100644
index 0000000000..93eb17f21c
--- /dev/null
+++ b/apps/sim/tools/google_groups/delete_group.ts
@@ -0,0 +1,52 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsDeleteParams, GoogleGroupsResponse } from './types'
+
+export const deleteGroupTool: ToolConfig = {
+ id: 'google_groups_delete_group',
+ name: 'Google Groups Delete Group',
+ description: 'Delete a Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID to delete',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}`
+ },
+ method: 'DELETE',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ if (!response.ok) {
+ const data = await response.json()
+ throw new Error(data.error?.message || 'Failed to delete group')
+ }
+ return {
+ success: true,
+ output: { message: 'Group deleted successfully' },
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/get_group.ts b/apps/sim/tools/google_groups/get_group.ts
new file mode 100644
index 0000000000..bc911a49f9
--- /dev/null
+++ b/apps/sim/tools/google_groups/get_group.ts
@@ -0,0 +1,52 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsGetParams, GoogleGroupsResponse } from './types'
+
+export const getGroupTool: ToolConfig = {
+ id: 'google_groups_get_group',
+ name: 'Google Groups Get Group',
+ description: 'Get details of a specific Google Group by email or group ID',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to get group')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/get_member.ts b/apps/sim/tools/google_groups/get_member.ts
new file mode 100644
index 0000000000..cc46097b9e
--- /dev/null
+++ b/apps/sim/tools/google_groups/get_member.ts
@@ -0,0 +1,59 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsGetMemberParams, GoogleGroupsResponse } from './types'
+
+export const getMemberTool: ToolConfig = {
+ id: 'google_groups_get_member',
+ name: 'Google Groups Get Member',
+ description: 'Get details of a specific member in a Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ memberKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Member email address or unique member ID',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ const encodedMemberKey = encodeURIComponent(params.memberKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/members/${encodedMemberKey}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to get group member')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/has_member.ts b/apps/sim/tools/google_groups/has_member.ts
new file mode 100644
index 0000000000..8e1d838c21
--- /dev/null
+++ b/apps/sim/tools/google_groups/has_member.ts
@@ -0,0 +1,59 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsHasMemberParams, GoogleGroupsResponse } from './types'
+
+export const hasMemberTool: ToolConfig = {
+ id: 'google_groups_has_member',
+ name: 'Google Groups Has Member',
+ description: 'Check if a user is a member of a Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ memberKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Member email address or unique member ID to check',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ const encodedMemberKey = encodeURIComponent(params.memberKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/hasMember/${encodedMemberKey}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to check membership')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/index.ts b/apps/sim/tools/google_groups/index.ts
new file mode 100644
index 0000000000..c1f7aa42c9
--- /dev/null
+++ b/apps/sim/tools/google_groups/index.ts
@@ -0,0 +1,23 @@
+import { addMemberTool } from './add_member'
+import { createGroupTool } from './create_group'
+import { deleteGroupTool } from './delete_group'
+import { getGroupTool } from './get_group'
+import { getMemberTool } from './get_member'
+import { hasMemberTool } from './has_member'
+import { listGroupsTool } from './list_groups'
+import { listMembersTool } from './list_members'
+import { removeMemberTool } from './remove_member'
+import { updateGroupTool } from './update_group'
+import { updateMemberTool } from './update_member'
+
+export const googleGroupsAddMemberTool = addMemberTool
+export const googleGroupsCreateGroupTool = createGroupTool
+export const googleGroupsDeleteGroupTool = deleteGroupTool
+export const googleGroupsGetGroupTool = getGroupTool
+export const googleGroupsGetMemberTool = getMemberTool
+export const googleGroupsHasMemberTool = hasMemberTool
+export const googleGroupsListGroupsTool = listGroupsTool
+export const googleGroupsListMembersTool = listMembersTool
+export const googleGroupsRemoveMemberTool = removeMemberTool
+export const googleGroupsUpdateGroupTool = updateGroupTool
+export const googleGroupsUpdateMemberTool = updateMemberTool
diff --git a/apps/sim/tools/google_groups/list_groups.ts b/apps/sim/tools/google_groups/list_groups.ts
new file mode 100644
index 0000000000..0a2531bf0e
--- /dev/null
+++ b/apps/sim/tools/google_groups/list_groups.ts
@@ -0,0 +1,97 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsListParams, GoogleGroupsResponse } from './types'
+
+export const listGroupsTool: ToolConfig = {
+ id: 'google_groups_list_groups',
+ name: 'Google Groups List Groups',
+ description: 'List all groups in a Google Workspace domain',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ customer: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Customer ID or "my_customer" for the authenticated user\'s domain',
+ },
+ domain: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Domain name to filter groups by',
+ },
+ maxResults: {
+ type: 'number',
+ required: false,
+ visibility: 'user-only',
+ description: 'Maximum number of results to return (1-200)',
+ },
+ pageToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ description: 'Token for pagination',
+ },
+ query: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Search query to filter groups (e.g., "email:admin*")',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const url = new URL('https://admin.googleapis.com/admin/directory/v1/groups')
+
+ // Use my_customer as default if no customer or domain specified
+ if (params.customer) {
+ url.searchParams.set('customer', params.customer)
+ } else if (!params.domain) {
+ url.searchParams.set('customer', 'my_customer')
+ }
+
+ if (params.domain) {
+ url.searchParams.set('domain', params.domain)
+ }
+ if (params.maxResults) {
+ url.searchParams.set('maxResults', String(params.maxResults))
+ }
+ if (params.pageToken) {
+ url.searchParams.set('pageToken', params.pageToken)
+ }
+ if (params.query) {
+ url.searchParams.set('query', params.query)
+ }
+
+ return url.toString()
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to list groups')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/list_members.ts b/apps/sim/tools/google_groups/list_members.ts
new file mode 100644
index 0000000000..dd3dcda9af
--- /dev/null
+++ b/apps/sim/tools/google_groups/list_members.ts
@@ -0,0 +1,84 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsListMembersParams, GoogleGroupsResponse } from './types'
+
+export const listMembersTool: ToolConfig = {
+ id: 'google_groups_list_members',
+ name: 'Google Groups List Members',
+ description: 'List all members of a Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ maxResults: {
+ type: 'number',
+ required: false,
+ visibility: 'user-only',
+ description: 'Maximum number of results to return (1-200)',
+ },
+ pageToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ description: 'Token for pagination',
+ },
+ roles: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'Filter by roles (comma-separated: OWNER, MANAGER, MEMBER)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ const url = new URL(
+ `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/members`
+ )
+
+ if (params.maxResults) {
+ url.searchParams.set('maxResults', String(params.maxResults))
+ }
+ if (params.pageToken) {
+ url.searchParams.set('pageToken', params.pageToken)
+ }
+ if (params.roles) {
+ url.searchParams.set('roles', params.roles)
+ }
+
+ return url.toString()
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to list group members')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/remove_member.ts b/apps/sim/tools/google_groups/remove_member.ts
new file mode 100644
index 0000000000..5c15fdb987
--- /dev/null
+++ b/apps/sim/tools/google_groups/remove_member.ts
@@ -0,0 +1,59 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsRemoveMemberParams, GoogleGroupsResponse } from './types'
+
+export const removeMemberTool: ToolConfig = {
+ id: 'google_groups_remove_member',
+ name: 'Google Groups Remove Member',
+ description: 'Remove a member from a Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ memberKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Email address or unique ID of the member to remove',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ const encodedMemberKey = encodeURIComponent(params.memberKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/members/${encodedMemberKey}`
+ },
+ method: 'DELETE',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ if (!response.ok) {
+ const data = await response.json()
+ throw new Error(data.error?.message || 'Failed to remove member from group')
+ }
+ return {
+ success: true,
+ output: { message: 'Member removed successfully' },
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/types.ts b/apps/sim/tools/google_groups/types.ts
new file mode 100644
index 0000000000..5de0f4d74e
--- /dev/null
+++ b/apps/sim/tools/google_groups/types.ts
@@ -0,0 +1,111 @@
+import type { ToolResponse } from '@/tools/types'
+
+/**
+ * Common parameters for Google Groups API calls
+ */
+export interface GoogleGroupsCommonParams {
+ accessToken: string
+}
+
+/**
+ * Parameters for listing groups
+ */
+export interface GoogleGroupsListParams extends GoogleGroupsCommonParams {
+ customer?: string
+ domain?: string
+ maxResults?: number
+ pageToken?: string
+ query?: string
+}
+
+/**
+ * Parameters for getting a specific group
+ */
+export interface GoogleGroupsGetParams extends GoogleGroupsCommonParams {
+ groupKey: string
+}
+
+/**
+ * Parameters for creating a group
+ */
+export interface GoogleGroupsCreateParams extends GoogleGroupsCommonParams {
+ email: string
+ name: string
+ description?: string
+}
+
+/**
+ * Parameters for updating a group
+ */
+export interface GoogleGroupsUpdateParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ name?: string
+ description?: string
+ email?: string
+}
+
+/**
+ * Parameters for deleting a group
+ */
+export interface GoogleGroupsDeleteParams extends GoogleGroupsCommonParams {
+ groupKey: string
+}
+
+/**
+ * Parameters for listing group members
+ */
+export interface GoogleGroupsListMembersParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ maxResults?: number
+ pageToken?: string
+ roles?: string
+}
+
+/**
+ * Parameters for getting a specific member
+ */
+export interface GoogleGroupsGetMemberParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ memberKey: string
+}
+
+/**
+ * Parameters for adding a member to a group
+ */
+export interface GoogleGroupsAddMemberParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ email: string
+ role?: 'MEMBER' | 'MANAGER' | 'OWNER'
+}
+
+/**
+ * Parameters for removing a member from a group
+ */
+export interface GoogleGroupsRemoveMemberParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ memberKey: string
+}
+
+/**
+ * Parameters for updating a member's role in a group
+ */
+export interface GoogleGroupsUpdateMemberParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ memberKey: string
+ role: 'MEMBER' | 'MANAGER' | 'OWNER'
+}
+
+/**
+ * Parameters for checking if a user is a member of a group
+ */
+export interface GoogleGroupsHasMemberParams extends GoogleGroupsCommonParams {
+ groupKey: string
+ memberKey: string
+}
+
+/**
+ * Standard response for Google Groups operations
+ */
+export interface GoogleGroupsResponse extends ToolResponse {
+ output: Record
+}
diff --git a/apps/sim/tools/google_groups/update_group.ts b/apps/sim/tools/google_groups/update_group.ts
new file mode 100644
index 0000000000..1fef8e34c9
--- /dev/null
+++ b/apps/sim/tools/google_groups/update_group.ts
@@ -0,0 +1,85 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsResponse, GoogleGroupsUpdateParams } from './types'
+
+export const updateGroupTool: ToolConfig = {
+ id: 'google_groups_update_group',
+ name: 'Google Groups Update Group',
+ description: 'Update an existing Google Group',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ name: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'New display name for the group',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'New description for the group',
+ },
+ email: {
+ type: 'string',
+ required: false,
+ visibility: 'user-or-llm',
+ description: 'New email address for the group',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}`
+ },
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {}
+
+ if (params.name) {
+ body.name = params.name
+ }
+ if (params.description) {
+ body.description = params.description
+ }
+ if (params.email) {
+ body.email = params.email
+ }
+
+ return JSON.stringify(body)
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to update group')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_groups/update_member.ts b/apps/sim/tools/google_groups/update_member.ts
new file mode 100644
index 0000000000..d1193dec27
--- /dev/null
+++ b/apps/sim/tools/google_groups/update_member.ts
@@ -0,0 +1,70 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsResponse, GoogleGroupsUpdateMemberParams } from './types'
+
+export const updateMemberTool: ToolConfig = {
+ id: 'google_groups_update_member',
+ name: 'Google Groups Update Member',
+ description: "Update a member's role in a Google Group (promote or demote)",
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'google-groups',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ description: 'OAuth access token',
+ },
+ groupKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Group email address or unique group ID',
+ },
+ memberKey: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'Member email address or unique member ID',
+ },
+ role: {
+ type: 'string',
+ required: true,
+ visibility: 'user-or-llm',
+ description: 'New role for the member (MEMBER, MANAGER, or OWNER)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const encodedGroupKey = encodeURIComponent(params.groupKey)
+ const encodedMemberKey = encodeURIComponent(params.memberKey)
+ return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/members/${encodedMemberKey}`
+ },
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ return JSON.stringify({
+ role: params.role,
+ })
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ throw new Error(data.error?.message || 'Failed to update member role')
+ }
+ return {
+ success: true,
+ output: data,
+ }
+ },
+}
diff --git a/apps/sim/tools/google_slides/create.ts b/apps/sim/tools/google_slides/create.ts
index ffe319cca7..92217b0747 100644
--- a/apps/sim/tools/google_slides/create.ts
+++ b/apps/sim/tools/google_slides/create.ts
@@ -53,7 +53,7 @@ export const createTool: ToolConfig {
- return 'https://www.googleapis.com/drive/v3/files'
+ return 'https://www.googleapis.com/drive/v3/files?supportsAllDrives=true'
},
method: 'POST',
headers: (params) => {
diff --git a/apps/sim/tools/http/index.ts b/apps/sim/tools/http/index.ts
index aa60451376..7eb2081886 100644
--- a/apps/sim/tools/http/index.ts
+++ b/apps/sim/tools/http/index.ts
@@ -1,3 +1,3 @@
-import { requestTool } from '@/tools/http/request'
+import { requestTool } from './request'
-export { requestTool }
+export const httpRequestTool = requestTool
diff --git a/apps/sim/tools/jina/index.ts b/apps/sim/tools/jina/index.ts
index b5c18e8e0c..07620f3793 100644
--- a/apps/sim/tools/jina/index.ts
+++ b/apps/sim/tools/jina/index.ts
@@ -1,4 +1,5 @@
-import { readUrlTool } from '@/tools/jina/read_url'
-import { searchTool } from '@/tools/jina/search'
+import { readUrlTool } from './read_url'
+import { searchTool } from './search'
-export { readUrlTool, searchTool }
+export const jinaReadUrlTool = readUrlTool
+export const jinaSearchTool = searchTool
diff --git a/apps/sim/tools/mongodb/index.ts b/apps/sim/tools/mongodb/index.ts
index b532035cb3..8407b7772c 100644
--- a/apps/sim/tools/mongodb/index.ts
+++ b/apps/sim/tools/mongodb/index.ts
@@ -1,6 +1,13 @@
-export { deleteTool } from './delete'
-export { executeTool } from './execute'
-export { insertTool } from './insert'
-export { queryTool } from './query'
+import { deleteTool } from './delete'
+import { executeTool } from './execute'
+import { insertTool } from './insert'
+import { queryTool } from './query'
+import { updateTool } from './update'
+
+export const mongodbDeleteTool = deleteTool
+export const mongodbExecuteTool = executeTool
+export const mongodbInsertTool = insertTool
+export const mongodbQueryTool = queryTool
+export const mongodbUpdateTool = updateTool
+
export * from './types'
-export { updateTool } from './update'
diff --git a/apps/sim/tools/mysql/index.ts b/apps/sim/tools/mysql/index.ts
index b532035cb3..1e388a67ee 100644
--- a/apps/sim/tools/mysql/index.ts
+++ b/apps/sim/tools/mysql/index.ts
@@ -1,6 +1,13 @@
-export { deleteTool } from './delete'
-export { executeTool } from './execute'
-export { insertTool } from './insert'
-export { queryTool } from './query'
+import { deleteTool } from './delete'
+import { executeTool } from './execute'
+import { insertTool } from './insert'
+import { queryTool } from './query'
+import { updateTool } from './update'
+
+export const mysqlDeleteTool = deleteTool
+export const mysqlExecuteTool = executeTool
+export const mysqlInsertTool = insertTool
+export const mysqlQueryTool = queryTool
+export const mysqlUpdateTool = updateTool
+
export * from './types'
-export { updateTool } from './update'
diff --git a/apps/sim/tools/neo4j/index.ts b/apps/sim/tools/neo4j/index.ts
index 1e4ac37041..ba5c38830c 100644
--- a/apps/sim/tools/neo4j/index.ts
+++ b/apps/sim/tools/neo4j/index.ts
@@ -1,7 +1,14 @@
-export { createTool } from './create'
-export { deleteTool } from './delete'
-export { executeTool } from './execute'
-export { mergeTool } from './merge'
-export { queryTool } from './query'
+import { createTool } from './create'
+import { deleteTool } from './delete'
+import { executeTool } from './execute'
+import { mergeTool } from './merge'
+import { queryTool } from './query'
+import { updateTool } from './update'
+
+export const neo4jCreateTool = createTool
+export const neo4jDeleteTool = deleteTool
+export const neo4jExecuteTool = executeTool
+export const neo4jMergeTool = mergeTool
+export const neo4jQueryTool = queryTool
+export const neo4jUpdateTool = updateTool
export * from './types'
-export { updateTool } from './update'
diff --git a/apps/sim/tools/openai/index.ts b/apps/sim/tools/openai/index.ts
index 63d875c1f4..137ea17f1c 100644
--- a/apps/sim/tools/openai/index.ts
+++ b/apps/sim/tools/openai/index.ts
@@ -1,4 +1,5 @@
import { embeddingsTool } from '@/tools/openai/embeddings'
import { imageTool } from '@/tools/openai/image'
-export { embeddingsTool, imageTool }
+export const openAIEmbeddingsTool = embeddingsTool
+export const openAIImageTool = imageTool
diff --git a/apps/sim/tools/postgresql/index.ts b/apps/sim/tools/postgresql/index.ts
index 651026e93f..ea54708a8d 100644
--- a/apps/sim/tools/postgresql/index.ts
+++ b/apps/sim/tools/postgresql/index.ts
@@ -4,4 +4,8 @@ import { insertTool } from './insert'
import { queryTool } from './query'
import { updateTool } from './update'
-export { deleteTool, executeTool, insertTool, queryTool, updateTool }
+export const postgresDeleteTool = deleteTool
+export const postgresExecuteTool = executeTool
+export const postgresInsertTool = insertTool
+export const postgresQueryTool = queryTool
+export const postgresUpdateTool = updateTool
diff --git a/apps/sim/tools/rds/index.ts b/apps/sim/tools/rds/index.ts
index 651026e93f..49bf773775 100644
--- a/apps/sim/tools/rds/index.ts
+++ b/apps/sim/tools/rds/index.ts
@@ -4,4 +4,8 @@ import { insertTool } from './insert'
import { queryTool } from './query'
import { updateTool } from './update'
-export { deleteTool, executeTool, insertTool, queryTool, updateTool }
+export const rdsDeleteTool = deleteTool
+export const rdsExecuteTool = executeTool
+export const rdsInsertTool = insertTool
+export const rdsQueryTool = queryTool
+export const rdsUpdateTool = updateTool
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index 2433ae86df..b49e63788d 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -81,6 +81,15 @@ import {
confluenceUpdateCommentTool,
confluenceUpdateTool,
} from '@/tools/confluence'
+import {
+ cursorAddFollowupTool,
+ cursorDeleteAgentTool,
+ cursorGetAgentTool,
+ cursorGetConversationTool,
+ cursorLaunchAgentTool,
+ cursorListAgentsTool,
+ cursorStopAgentTool,
+} from '@/tools/cursor'
import {
datadogCancelDowntimeTool,
datadogCreateDowntimeTool,
@@ -145,12 +154,12 @@ import {
dropboxUploadTool,
} from '@/tools/dropbox'
import {
- deleteTool as dynamodbDeleteTool,
- getTool as dynamodbGetTool,
- putTool as dynamodbPutTool,
- queryTool as dynamodbQueryTool,
- scanTool as dynamodbScanTool,
- updateTool as dynamodbUpdateTool,
+ dynamodbDeleteTool,
+ dynamodbGetTool,
+ dynamodbPutTool,
+ dynamodbQueryTool,
+ dynamodbScanTool,
+ dynamodbUpdateTool,
} from '@/tools/dynamodb'
import {
elasticsearchBulkTool,
@@ -176,11 +185,11 @@ import {
} from '@/tools/exa'
import { fileParseTool } from '@/tools/file'
import {
- crawlTool,
- extractTool,
- searchTool as firecrawlSearchTool,
- mapTool,
- scrapeTool,
+ firecrawlCrawlTool,
+ firecrawlExtractTool,
+ firecrawlMapTool,
+ firecrawlScrapeTool,
+ firecrawlSearchTool,
} from '@/tools/firecrawl'
import { functionExecuteTool } from '@/tools/function'
import {
@@ -272,7 +281,7 @@ import {
gmailSendTool,
gmailUnarchiveTool,
} from '@/tools/gmail'
-import { searchTool as googleSearchTool } from '@/tools/google'
+import { googleSearchTool } from '@/tools/google'
import {
googleCalendarCreateTool,
googleCalendarGetTool,
@@ -289,6 +298,19 @@ import {
googleDriveUploadTool,
} from '@/tools/google_drive'
import { googleFormsGetResponsesTool } from '@/tools/google_form'
+import {
+ googleGroupsAddMemberTool,
+ googleGroupsCreateGroupTool,
+ googleGroupsDeleteGroupTool,
+ googleGroupsGetGroupTool,
+ googleGroupsGetMemberTool,
+ googleGroupsHasMemberTool,
+ googleGroupsListGroupsTool,
+ googleGroupsListMembersTool,
+ googleGroupsRemoveMemberTool,
+ googleGroupsUpdateGroupTool,
+ googleGroupsUpdateMemberTool,
+} from '@/tools/google_groups'
import {
googleSheetsAppendTool,
googleSheetsReadTool,
@@ -335,7 +357,7 @@ import {
grafanaUpdateDashboardTool,
} from '@/tools/grafana'
import { guardrailsValidateTool } from '@/tools/guardrails'
-import { requestTool as httpRequest } from '@/tools/http'
+import { httpRequestTool } from '@/tools/http'
import {
hubspotCreateCompanyTool,
hubspotCreateContactTool,
@@ -424,7 +446,7 @@ import {
intercomSearchConversationsTool,
intercomUpdateContactTool,
} from '@/tools/intercom'
-import { searchTool as jinaSearchTool, readUrlTool } from '@/tools/jina'
+import { jinaReadUrlTool, jinaSearchTool } from '@/tools/jina'
import {
jiraAddCommentTool,
jiraAddWatcherTool,
@@ -682,26 +704,26 @@ import {
} from '@/tools/microsoft_teams'
import { mistralParserTool } from '@/tools/mistral'
import {
- deleteTool as mongodbDeleteTool,
- executeTool as mongodbExecuteTool,
- insertTool as mongodbInsertTool,
- queryTool as mongodbQueryTool,
- updateTool as mongodbUpdateTool,
+ mongodbDeleteTool,
+ mongodbExecuteTool,
+ mongodbInsertTool,
+ mongodbQueryTool,
+ mongodbUpdateTool,
} from '@/tools/mongodb'
import {
- deleteTool as mysqlDeleteTool,
- executeTool as mysqlExecuteTool,
- insertTool as mysqlInsertTool,
- queryTool as mysqlQueryTool,
- updateTool as mysqlUpdateTool,
+ mysqlDeleteTool,
+ mysqlExecuteTool,
+ mysqlInsertTool,
+ mysqlQueryTool,
+ mysqlUpdateTool,
} from '@/tools/mysql'
import {
- createTool as neo4jCreateTool,
- deleteTool as neo4jDeleteTool,
- executeTool as neo4jExecuteTool,
- mergeTool as neo4jMergeTool,
- queryTool as neo4jQueryTool,
- updateTool as neo4jUpdateTool,
+ neo4jCreateTool,
+ neo4jDeleteTool,
+ neo4jExecuteTool,
+ neo4jMergeTool,
+ neo4jQueryTool,
+ neo4jUpdateTool,
} from '@/tools/neo4j'
import {
notionCreateDatabaseTool,
@@ -719,7 +741,7 @@ import {
onedriveListTool,
onedriveUploadTool,
} from '@/tools/onedrive'
-import { imageTool, embeddingsTool as openAIEmbeddings } from '@/tools/openai'
+import { openAIEmbeddingsTool, openAIImageTool } from '@/tools/openai'
import {
outlookCopyTool,
outlookDeleteTool,
@@ -780,11 +802,11 @@ import {
polymarketSearchTool,
} from '@/tools/polymarket'
import {
- deleteTool as postgresDeleteTool,
- executeTool as postgresExecuteTool,
- insertTool as postgresInsertTool,
- queryTool as postgresQueryTool,
- updateTool as postgresUpdateTool,
+ postgresDeleteTool,
+ postgresExecuteTool,
+ postgresInsertTool,
+ postgresQueryTool,
+ postgresUpdateTool,
} from '@/tools/postgresql'
import {
posthogBatchEventsTool,
@@ -873,11 +895,11 @@ import {
} from '@/tools/pylon'
import { qdrantFetchTool, qdrantSearchTool, qdrantUpsertTool } from '@/tools/qdrant'
import {
- deleteTool as rdsDeleteTool,
- executeTool as rdsExecuteTool,
- insertTool as rdsInsertTool,
- queryTool as rdsQueryTool,
- updateTool as rdsUpdateTool,
+ rdsDeleteTool,
+ rdsExecuteTool,
+ rdsInsertTool,
+ rdsQueryTool,
+ rdsUpdateTool,
} from '@/tools/rds'
import {
redditDeleteTool,
@@ -915,12 +937,23 @@ import {
salesforceDeleteLeadTool,
salesforceDeleteOpportunityTool,
salesforceDeleteTaskTool,
+ salesforceDescribeObjectTool,
salesforceGetAccountsTool,
salesforceGetCasesTool,
salesforceGetContactsTool,
+ salesforceGetDashboardTool,
salesforceGetLeadsTool,
salesforceGetOpportunitiesTool,
+ salesforceGetReportTool,
salesforceGetTasksTool,
+ salesforceListDashboardsTool,
+ salesforceListObjectsTool,
+ salesforceListReportsTool,
+ salesforceListReportTypesTool,
+ salesforceQueryMoreTool,
+ salesforceQueryTool,
+ salesforceRefreshDashboardTool,
+ salesforceRunReportTool,
salesforceUpdateAccountTool,
salesforceUpdateCaseTool,
salesforceUpdateContactTool,
@@ -961,7 +994,7 @@ import {
updateIssueTool,
updateProjectTool,
} from '@/tools/sentry'
-import { searchTool as serperSearch } from '@/tools/serper'
+import { serperSearchTool } from '@/tools/serper'
import {
sharepointAddListItemTool,
sharepointCreateListTool,
@@ -1011,19 +1044,19 @@ import {
import { smsSendTool } from '@/tools/sms'
import { smtpSendMailTool } from '@/tools/smtp'
import {
- checkCommandExistsTool as sshCheckCommandExistsTool,
- checkFileExistsTool as sshCheckFileExistsTool,
- createDirectoryTool as sshCreateDirectoryTool,
- deleteFileTool as sshDeleteFileTool,
- downloadFileTool as sshDownloadFileTool,
- executeCommandTool as sshExecuteCommandTool,
- executeScriptTool as sshExecuteScriptTool,
- getSystemInfoTool as sshGetSystemInfoTool,
- listDirectoryTool as sshListDirectoryTool,
- moveRenameTool as sshMoveRenameTool,
- readFileContentTool as sshReadFileContentTool,
- uploadFileTool as sshUploadFileTool,
- writeFileContentTool as sshWriteFileContentTool,
+ sshCheckCommandExistsTool,
+ sshCheckFileExistsTool,
+ sshCreateDirectoryTool,
+ sshDeleteFileTool,
+ sshDownloadFileTool,
+ sshExecuteCommandTool,
+ sshExecuteScriptTool,
+ sshGetSystemInfoTool,
+ sshListDirectoryTool,
+ sshMoveRenameTool,
+ sshReadFileContentTool,
+ sshUploadFileTool,
+ sshWriteFileContentTool,
} from '@/tools/ssh'
import { stagehandAgentTool, stagehandExtractTool } from '@/tools/stagehand'
import {
@@ -1283,17 +1316,17 @@ export const tools: Record = {
asana_search_tasks: asanaSearchTasksTool,
asana_add_comment: asanaAddCommentTool,
browser_use_run_task: browserUseRunTaskTool,
- openai_embeddings: openAIEmbeddings,
- http_request: httpRequest,
+ openai_embeddings: openAIEmbeddingsTool,
+ http_request: httpRequestTool,
huggingface_chat: huggingfaceChatTool,
function_execute: functionExecuteTool,
vision_tool: visionTool,
file_parser: fileParseTool,
- firecrawl_scrape: scrapeTool,
+ firecrawl_scrape: firecrawlScrapeTool,
firecrawl_search: firecrawlSearchTool,
- firecrawl_crawl: crawlTool,
- firecrawl_map: mapTool,
- firecrawl_extract: extractTool,
+ firecrawl_crawl: firecrawlCrawlTool,
+ firecrawl_map: firecrawlMapTool,
+ firecrawl_extract: firecrawlExtractTool,
grafana_get_dashboard: grafanaGetDashboardTool,
grafana_list_dashboards: grafanaListDashboardsTool,
grafana_create_dashboard: grafanaCreateDashboardTool,
@@ -1315,7 +1348,7 @@ export const tools: Record = {
grafana_create_folder: grafanaCreateFolderTool,
google_search: googleSearchTool,
guardrails_validate: guardrailsValidateTool,
- jina_read_url: readUrlTool,
+ jina_read_url: jinaReadUrlTool,
jina_search: jinaSearchTool,
linkup_search: linkupSearchTool,
linkedin_share_post: linkedInSharePostTool,
@@ -1429,7 +1462,7 @@ export const tools: Record = {
slack_add_reaction: slackAddReactionTool,
github_repo_info: githubRepoInfoTool,
github_latest_commit: githubLatestCommitTool,
- serper_search: serperSearch,
+ serper_search: serperSearchTool,
tavily_search: tavilySearchTool,
tavily_extract: tavilyExtractTool,
tavily_crawl: tavilyCrawlTool,
@@ -1763,6 +1796,13 @@ export const tools: Record = {
confluence_list_labels: confluenceListLabelsTool,
confluence_get_space: confluenceGetSpaceTool,
confluence_list_spaces: confluenceListSpacesTool,
+ cursor_list_agents: cursorListAgentsTool,
+ cursor_get_agent: cursorGetAgentTool,
+ cursor_get_conversation: cursorGetConversationTool,
+ cursor_launch_agent: cursorLaunchAgentTool,
+ cursor_add_followup: cursorAddFollowupTool,
+ cursor_stop_agent: cursorStopAgentTool,
+ cursor_delete_agent: cursorDeleteAgentTool,
trello_list_lists: trelloListListsTool,
trello_list_cards: trelloListCardsTool,
trello_create_card: trelloCreateCardTool,
@@ -1914,7 +1954,7 @@ export const tools: Record = {
datadog_create_downtime: datadogCreateDowntimeTool,
datadog_list_downtimes: datadogListDowntimesTool,
datadog_cancel_downtime: datadogCancelDowntimeTool,
- openai_image: imageTool,
+ openai_image: openAIImageTool,
microsoft_teams_read_chat: microsoftTeamsReadChatTool,
microsoft_teams_write_chat: microsoftTeamsWriteChatTool,
microsoft_teams_read_channel: microsoftTeamsReadChannelTool,
@@ -2115,6 +2155,17 @@ export const tools: Record = {
google_vault_create_matters: createMattersTool,
google_vault_list_matters: listMattersTool,
google_vault_download_export_file: downloadExportFileTool,
+ google_groups_list_groups: googleGroupsListGroupsTool,
+ google_groups_get_group: googleGroupsGetGroupTool,
+ google_groups_create_group: googleGroupsCreateGroupTool,
+ google_groups_update_group: googleGroupsUpdateGroupTool,
+ google_groups_delete_group: googleGroupsDeleteGroupTool,
+ google_groups_list_members: googleGroupsListMembersTool,
+ google_groups_get_member: googleGroupsGetMemberTool,
+ google_groups_add_member: googleGroupsAddMemberTool,
+ google_groups_remove_member: googleGroupsRemoveMemberTool,
+ google_groups_update_member: googleGroupsUpdateMemberTool,
+ google_groups_has_member: googleGroupsHasMemberTool,
qdrant_fetch_points: qdrantFetchTool,
qdrant_search_vector: qdrantSearchTool,
qdrant_upsert_points: qdrantUpsertTool,
@@ -2251,6 +2302,17 @@ export const tools: Record = {
salesforce_create_task: salesforceCreateTaskTool,
salesforce_update_task: salesforceUpdateTaskTool,
salesforce_delete_task: salesforceDeleteTaskTool,
+ salesforce_list_reports: salesforceListReportsTool,
+ salesforce_get_report: salesforceGetReportTool,
+ salesforce_run_report: salesforceRunReportTool,
+ salesforce_list_report_types: salesforceListReportTypesTool,
+ salesforce_list_dashboards: salesforceListDashboardsTool,
+ salesforce_get_dashboard: salesforceGetDashboardTool,
+ salesforce_refresh_dashboard: salesforceRefreshDashboardTool,
+ salesforce_query: salesforceQueryTool,
+ salesforce_query_more: salesforceQueryMoreTool,
+ salesforce_describe_object: salesforceDescribeObjectTool,
+ salesforce_list_objects: salesforceListObjectsTool,
pylon_list_issues: pylonListIssuesTool,
pylon_create_issue: pylonCreateIssueTool,
pylon_get_issue: pylonGetIssueTool,
diff --git a/apps/sim/tools/salesforce/cases.ts b/apps/sim/tools/salesforce/cases.ts
deleted file mode 100644
index a3f27437ef..0000000000
--- a/apps/sim/tools/salesforce/cases.ts
+++ /dev/null
@@ -1,315 +0,0 @@
-import { createLogger } from '@/lib/logs/console/logger'
-import type { ToolConfig } from '@/tools/types'
-
-const logger = createLogger('SalesforceCases')
-
-function getInstanceUrl(idToken?: string, instanceUrl?: string): string {
- if (instanceUrl) return instanceUrl
- if (idToken) {
- try {
- const base64Url = idToken.split('.')[1]
- const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
- const jsonPayload = decodeURIComponent(
- atob(base64)
- .split('')
- .map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`)
- .join('')
- )
- const decoded = JSON.parse(jsonPayload)
- if (decoded.profile) {
- const match = decoded.profile.match(/^(https:\/\/[^/]+)/)
- if (match) return match[1]
- } else if (decoded.sub) {
- const match = decoded.sub.match(/^(https:\/\/[^/]+)/)
- if (match && match[1] !== 'https://login.salesforce.com') return match[1]
- }
- } catch (error) {
- logger.error('Failed to decode Salesforce idToken', { error })
- }
- }
- throw new Error('Salesforce instance URL is required but not provided')
-}
-
-// Get Cases
-export const salesforceGetCasesTool: ToolConfig = {
- id: 'salesforce_get_cases',
- name: 'Get Cases from Salesforce',
- description: 'Get case(s) from Salesforce',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- caseId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Case ID (optional)',
- },
- limit: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Max results (default: 100)',
- },
- fields: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Comma-separated fields',
- },
- orderBy: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Order by field',
- },
- },
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- if (params.caseId) {
- const fields =
- params.fields || 'Id,CaseNumber,Subject,Status,Priority,Origin,ContactId,AccountId'
- return `${instanceUrl}/services/data/v59.0/sobjects/Case/${params.caseId}?fields=${fields}`
- }
- const limit = params.limit ? Number.parseInt(params.limit) : 100
- const fields =
- params.fields || 'Id,CaseNumber,Subject,Status,Priority,Origin,ContactId,AccountId'
- const orderBy = params.orderBy || 'CreatedDate DESC'
- const query = `SELECT ${fields} FROM Case ORDER BY ${orderBy} LIMIT ${limit}`
- return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
- },
- method: 'GET',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- },
- transformResponse: async (response, params) => {
- const data = await response.json()
- if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to fetch cases')
- if (params.caseId) {
- return {
- success: true,
- output: { case: data, metadata: { operation: 'get_cases' }, success: true },
- }
- }
- const cases = data.records || []
- return {
- success: true,
- output: {
- cases,
- paging: {
- nextRecordsUrl: data.nextRecordsUrl,
- totalSize: data.totalSize || cases.length,
- done: data.done !== false,
- },
- metadata: { operation: 'get_cases', totalReturned: cases.length, hasMore: !data.done },
- success: true,
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Case data' },
- },
-}
-
-// Create Case
-export const salesforceCreateCaseTool: ToolConfig = {
- id: 'salesforce_create_case',
- name: 'Create Case in Salesforce',
- description: 'Create a new case',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- subject: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Case subject (required)',
- },
- status: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Status (e.g., New, Working, Escalated)',
- },
- priority: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Priority (e.g., Low, Medium, High)',
- },
- origin: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Origin (e.g., Phone, Email, Web)',
- },
- contactId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Contact ID',
- },
- accountId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Account ID',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Case`,
- method: 'POST',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = { Subject: params.subject }
- if (params.status) body.Status = params.status
- if (params.priority) body.Priority = params.priority
- if (params.origin) body.Origin = params.origin
- if (params.contactId) body.ContactId = params.contactId
- if (params.accountId) body.AccountId = params.accountId
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response) => {
- const data = await response.json()
- if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to create case')
- return {
- success: true,
- output: {
- id: data.id,
- success: data.success,
- created: true,
- metadata: { operation: 'create_case' },
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Created case' },
- },
-}
-
-// Update Case
-export const salesforceUpdateCaseTool: ToolConfig = {
- id: 'salesforce_update_case',
- name: 'Update Case in Salesforce',
- description: 'Update an existing case',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- caseId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Case ID (required)',
- },
- subject: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Case subject',
- },
- status: { type: 'string', required: false, visibility: 'user-only', description: 'Status' },
- priority: { type: 'string', required: false, visibility: 'user-only', description: 'Priority' },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Case/${params.caseId}`,
- method: 'PATCH',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = {}
- if (params.subject) body.Subject = params.subject
- if (params.status) body.Status = params.status
- if (params.priority) body.Priority = params.priority
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json()
- throw new Error(data[0]?.message || data.message || 'Failed to update case')
- }
- return {
- success: true,
- output: { id: params.caseId, updated: true, metadata: { operation: 'update_case' } },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Updated case' },
- },
-}
-
-// Delete Case
-export const salesforceDeleteCaseTool: ToolConfig = {
- id: 'salesforce_delete_case',
- name: 'Delete Case from Salesforce',
- description: 'Delete a case',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- caseId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Case ID (required)',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Case/${params.caseId}`,
- method: 'DELETE',
- headers: (params) => ({ Authorization: `Bearer ${params.accessToken}` }),
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json().catch(() => ({}))
- throw new Error(data[0]?.message || data.message || 'Failed to delete case')
- }
- return {
- success: true,
- output: { id: params.caseId, deleted: true, metadata: { operation: 'delete_case' } },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Deleted case' },
- },
-}
diff --git a/apps/sim/tools/salesforce/contacts.ts b/apps/sim/tools/salesforce/contacts.ts
deleted file mode 100644
index fa27075419..0000000000
--- a/apps/sim/tools/salesforce/contacts.ts
+++ /dev/null
@@ -1,658 +0,0 @@
-import { createLogger } from '@/lib/logs/console/logger'
-import type { ToolConfig } from '@/tools/types'
-
-const logger = createLogger('SalesforceContacts')
-
-// Helper to extract instance URL from idToken
-function getInstanceUrl(idToken?: string, instanceUrl?: string): string {
- if (instanceUrl) return instanceUrl
-
- if (idToken) {
- try {
- const base64Url = idToken.split('.')[1]
- const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
- const jsonPayload = decodeURIComponent(
- atob(base64)
- .split('')
- .map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`)
- .join('')
- )
- const decoded = JSON.parse(jsonPayload)
-
- if (decoded.profile) {
- const match = decoded.profile.match(/^(https:\/\/[^/]+)/)
- if (match) return match[1]
- } else if (decoded.sub) {
- const match = decoded.sub.match(/^(https:\/\/[^/]+)/)
- if (match && match[1] !== 'https://login.salesforce.com') {
- return match[1]
- }
- }
- } catch (error) {
- logger.error('Failed to decode Salesforce idToken', { error })
- }
- }
-
- throw new Error('Salesforce instance URL is required but not provided')
-}
-
-// Get Contacts (with optional contactId)
-export interface SalesforceGetContactsParams {
- accessToken: string
- idToken?: string
- instanceUrl?: string
- contactId?: string
- limit?: string
- fields?: string
- orderBy?: string
-}
-
-export interface SalesforceGetContactsResponse {
- success: boolean
- output: {
- contacts?: any[]
- contact?: any
- paging?: {
- nextRecordsUrl?: string
- totalSize: number
- done: boolean
- }
- metadata: {
- operation: 'get_contacts'
- totalReturned?: number
- hasMore?: boolean
- singleContact?: boolean
- }
- success: boolean
- }
-}
-
-export const salesforceGetContactsTool: ToolConfig<
- SalesforceGetContactsParams,
- SalesforceGetContactsResponse
-> = {
- id: 'salesforce_get_contacts',
- name: 'Get Contacts from Salesforce',
- description: 'Get contact(s) from Salesforce - single contact if ID provided, or list if not',
- version: '1.0.0',
-
- oauth: {
- required: true,
- provider: 'salesforce',
- },
-
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- contactId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Contact ID (if provided, returns single contact)',
- },
- limit: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Number of results (default: 100, max: 2000). Only for list query.',
- },
- fields: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Comma-separated fields (e.g., "Id,FirstName,LastName,Email,Phone")',
- },
- orderBy: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Order by field (e.g., "LastName ASC"). Only for list query.',
- },
- },
-
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
-
- // Single contact by ID
- if (params.contactId) {
- const fields =
- params.fields || 'Id,FirstName,LastName,Email,Phone,AccountId,Title,Department'
- return `${instanceUrl}/services/data/v59.0/sobjects/Contact/${params.contactId}?fields=${fields}`
- }
-
- // List contacts with SOQL query
- const limit = params.limit ? Number.parseInt(params.limit) : 100
- const fields = params.fields || 'Id,FirstName,LastName,Email,Phone,AccountId,Title,Department'
- const orderBy = params.orderBy || 'LastName ASC'
- const query = `SELECT ${fields} FROM Contact ORDER BY ${orderBy} LIMIT ${limit}`
- const encodedQuery = encodeURIComponent(query)
-
- return `${instanceUrl}/services/data/v59.0/query?q=${encodedQuery}`
- },
- method: 'GET',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- },
-
- transformResponse: async (response: Response, params) => {
- const data = await response.json()
-
- if (!response.ok) {
- logger.error('Salesforce API request failed', { data, status: response.status })
- throw new Error(
- data[0]?.message || data.message || 'Failed to fetch contacts from Salesforce'
- )
- }
-
- // Single contact response
- if (params?.contactId) {
- return {
- success: true,
- output: {
- contact: data,
- metadata: {
- operation: 'get_contacts' as const,
- singleContact: true,
- },
- success: true,
- },
- }
- }
-
- // List contacts response
- const contacts = data.records || []
- return {
- success: true,
- output: {
- contacts,
- paging: {
- nextRecordsUrl: data.nextRecordsUrl,
- totalSize: data.totalSize || contacts.length,
- done: data.done !== false,
- },
- metadata: {
- operation: 'get_contacts' as const,
- totalReturned: contacts.length,
- hasMore: !data.done,
- singleContact: false,
- },
- success: true,
- },
- }
- },
-
- outputs: {
- success: { type: 'boolean', description: 'Operation success status' },
- output: {
- type: 'object',
- description: 'Contact(s) data',
- properties: {
- contacts: { type: 'array', description: 'Array of contacts (list query)' },
- contact: { type: 'object', description: 'Single contact (by ID)' },
- paging: { type: 'object', description: 'Pagination info (list query)' },
- metadata: { type: 'object', description: 'Operation metadata' },
- success: { type: 'boolean', description: 'Operation success' },
- },
- },
- },
-}
-
-// Create Contact
-export interface SalesforceCreateContactParams {
- accessToken: string
- idToken?: string
- instanceUrl?: string
- lastName: string
- firstName?: string
- email?: string
- phone?: string
- accountId?: string
- title?: string
- department?: string
- mailingStreet?: string
- mailingCity?: string
- mailingState?: string
- mailingPostalCode?: string
- mailingCountry?: string
- description?: string
-}
-
-export interface SalesforceCreateContactResponse {
- success: boolean
- output: {
- id: string
- success: boolean
- created: boolean
- metadata: { operation: 'create_contact' }
- }
-}
-
-export const salesforceCreateContactTool: ToolConfig<
- SalesforceCreateContactParams,
- SalesforceCreateContactResponse
-> = {
- id: 'salesforce_create_contact',
- name: 'Create Contact in Salesforce',
- description: 'Create a new contact in Salesforce CRM',
- version: '1.0.0',
-
- oauth: { required: true, provider: 'salesforce' },
-
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- lastName: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Last name (required)',
- },
- firstName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'First name',
- },
- email: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Email address',
- },
- phone: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Phone number',
- },
- accountId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Account ID to associate contact with',
- },
- title: { type: 'string', required: false, visibility: 'user-only', description: 'Job title' },
- department: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Department',
- },
- mailingStreet: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing street',
- },
- mailingCity: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing city',
- },
- mailingState: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing state',
- },
- mailingPostalCode: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing postal code',
- },
- mailingCountry: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing country',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Contact description',
- },
- },
-
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- return `${instanceUrl}/services/data/v59.0/sobjects/Contact`
- },
- method: 'POST',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = { LastName: params.lastName }
-
- if (params.firstName) body.FirstName = params.firstName
- if (params.email) body.Email = params.email
- if (params.phone) body.Phone = params.phone
- if (params.accountId) body.AccountId = params.accountId
- if (params.title) body.Title = params.title
- if (params.department) body.Department = params.department
- if (params.mailingStreet) body.MailingStreet = params.mailingStreet
- if (params.mailingCity) body.MailingCity = params.mailingCity
- if (params.mailingState) body.MailingState = params.mailingState
- if (params.mailingPostalCode) body.MailingPostalCode = params.mailingPostalCode
- if (params.mailingCountry) body.MailingCountry = params.mailingCountry
- if (params.description) body.Description = params.description
-
- return body
- },
- },
-
- transformResponse: async (response: Response) => {
- const data = await response.json()
-
- if (!response.ok) {
- logger.error('Salesforce API request failed', { data, status: response.status })
- throw new Error(data[0]?.message || data.message || 'Failed to create contact in Salesforce')
- }
-
- return {
- success: true,
- output: {
- id: data.id,
- success: data.success,
- created: true,
- metadata: { operation: 'create_contact' as const },
- },
- }
- },
-
- outputs: {
- success: { type: 'boolean', description: 'Operation success status' },
- output: {
- type: 'object',
- description: 'Created contact data',
- properties: {
- id: { type: 'string', description: 'Created contact ID' },
- success: { type: 'boolean', description: 'Salesforce operation success' },
- created: { type: 'boolean', description: 'Whether contact was created' },
- metadata: { type: 'object', description: 'Operation metadata' },
- },
- },
- },
-}
-
-// Update Contact
-export interface SalesforceUpdateContactParams {
- accessToken: string
- idToken?: string
- instanceUrl?: string
- contactId: string
- lastName?: string
- firstName?: string
- email?: string
- phone?: string
- accountId?: string
- title?: string
- department?: string
- mailingStreet?: string
- mailingCity?: string
- mailingState?: string
- mailingPostalCode?: string
- mailingCountry?: string
- description?: string
-}
-
-export interface SalesforceUpdateContactResponse {
- success: boolean
- output: {
- id: string
- updated: boolean
- metadata: { operation: 'update_contact' }
- }
-}
-
-export const salesforceUpdateContactTool: ToolConfig<
- SalesforceUpdateContactParams,
- SalesforceUpdateContactResponse
-> = {
- id: 'salesforce_update_contact',
- name: 'Update Contact in Salesforce',
- description: 'Update an existing contact in Salesforce CRM',
- version: '1.0.0',
-
- oauth: { required: true, provider: 'salesforce' },
-
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- contactId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Contact ID to update (required)',
- },
- lastName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Last name',
- },
- firstName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'First name',
- },
- email: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Email address',
- },
- phone: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Phone number',
- },
- accountId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Account ID to associate with',
- },
- title: { type: 'string', required: false, visibility: 'user-only', description: 'Job title' },
- department: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Department',
- },
- mailingStreet: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing street',
- },
- mailingCity: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing city',
- },
- mailingState: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing state',
- },
- mailingPostalCode: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing postal code',
- },
- mailingCountry: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Mailing country',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
-
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- return `${instanceUrl}/services/data/v59.0/sobjects/Contact/${params.contactId}`
- },
- method: 'PATCH',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = {}
-
- if (params.lastName) body.LastName = params.lastName
- if (params.firstName) body.FirstName = params.firstName
- if (params.email) body.Email = params.email
- if (params.phone) body.Phone = params.phone
- if (params.accountId) body.AccountId = params.accountId
- if (params.title) body.Title = params.title
- if (params.department) body.Department = params.department
- if (params.mailingStreet) body.MailingStreet = params.mailingStreet
- if (params.mailingCity) body.MailingCity = params.mailingCity
- if (params.mailingState) body.MailingState = params.mailingState
- if (params.mailingPostalCode) body.MailingPostalCode = params.mailingPostalCode
- if (params.mailingCountry) body.MailingCountry = params.mailingCountry
- if (params.description) body.Description = params.description
-
- return body
- },
- },
-
- transformResponse: async (response: Response, params) => {
- if (!response.ok) {
- const data = await response.json()
- logger.error('Salesforce API request failed', { data, status: response.status })
- throw new Error(data[0]?.message || data.message || 'Failed to update contact in Salesforce')
- }
-
- return {
- success: true,
- output: {
- id: params?.contactId || '',
- updated: true,
- metadata: { operation: 'update_contact' as const },
- },
- }
- },
-
- outputs: {
- success: { type: 'boolean', description: 'Operation success status' },
- output: {
- type: 'object',
- description: 'Updated contact data',
- properties: {
- id: { type: 'string', description: 'Updated contact ID' },
- updated: { type: 'boolean', description: 'Whether contact was updated' },
- metadata: { type: 'object', description: 'Operation metadata' },
- },
- },
- },
-}
-
-// Delete Contact
-export interface SalesforceDeleteContactParams {
- accessToken: string
- idToken?: string
- instanceUrl?: string
- contactId: string
-}
-
-export interface SalesforceDeleteContactResponse {
- success: boolean
- output: {
- id: string
- deleted: boolean
- metadata: { operation: 'delete_contact' }
- }
-}
-
-export const salesforceDeleteContactTool: ToolConfig<
- SalesforceDeleteContactParams,
- SalesforceDeleteContactResponse
-> = {
- id: 'salesforce_delete_contact',
- name: 'Delete Contact from Salesforce',
- description: 'Delete a contact from Salesforce CRM',
- version: '1.0.0',
-
- oauth: { required: true, provider: 'salesforce' },
-
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- contactId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Contact ID to delete (required)',
- },
- },
-
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- return `${instanceUrl}/services/data/v59.0/sobjects/Contact/${params.contactId}`
- },
- method: 'DELETE',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- }),
- },
-
- transformResponse: async (response: Response, params) => {
- if (!response.ok) {
- const data = await response.json().catch(() => ({}))
- logger.error('Salesforce API request failed', { data, status: response.status })
- throw new Error(
- data[0]?.message || data.message || 'Failed to delete contact from Salesforce'
- )
- }
-
- return {
- success: true,
- output: {
- id: params?.contactId || '',
- deleted: true,
- metadata: { operation: 'delete_contact' as const },
- },
- }
- },
-
- outputs: {
- success: { type: 'boolean', description: 'Operation success status' },
- output: {
- type: 'object',
- description: 'Deleted contact data',
- properties: {
- id: { type: 'string', description: 'Deleted contact ID' },
- deleted: { type: 'boolean', description: 'Whether contact was deleted' },
- metadata: { type: 'object', description: 'Operation metadata' },
- },
- },
- },
-}
diff --git a/apps/sim/tools/salesforce/create_case.ts b/apps/sim/tools/salesforce/create_case.ts
new file mode 100644
index 0000000000..251ba91c23
--- /dev/null
+++ b/apps/sim/tools/salesforce/create_case.ts
@@ -0,0 +1,141 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceCreateCaseParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ subject: string
+ status?: string
+ priority?: string
+ origin?: string
+ contactId?: string
+ accountId?: string
+ description?: string
+}
+
+export interface SalesforceCreateCaseResponse {
+ success: boolean
+ output: {
+ id: string
+ success: boolean
+ created: boolean
+ metadata: {
+ operation: 'create_case'
+ }
+ }
+}
+
+export const salesforceCreateCaseTool: ToolConfig<
+ SalesforceCreateCaseParams,
+ SalesforceCreateCaseResponse
+> = {
+ id: 'salesforce_create_case',
+ name: 'Create Case in Salesforce',
+ description: 'Create a new case',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ subject: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Case subject (required)',
+ },
+ status: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Status (e.g., New, Working, Escalated)',
+ },
+ priority: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Priority (e.g., Low, Medium, High)',
+ },
+ origin: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Origin (e.g., Phone, Email, Web)',
+ },
+ contactId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Contact ID',
+ },
+ accountId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Account ID',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Case`,
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = { Subject: params.subject }
+ if (params.status) body.Status = params.status
+ if (params.priority) body.Priority = params.priority
+ if (params.origin) body.Origin = params.origin
+ if (params.contactId) body.ContactId = params.contactId
+ if (params.accountId) body.AccountId = params.accountId
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to create case')
+ return {
+ success: true,
+ output: {
+ id: data.id,
+ success: data.success,
+ created: true,
+ metadata: { operation: 'create_case' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Created case' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/create_contact.ts b/apps/sim/tools/salesforce/create_contact.ts
new file mode 100644
index 0000000000..72a62d9292
--- /dev/null
+++ b/apps/sim/tools/salesforce/create_contact.ts
@@ -0,0 +1,188 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceContacts')
+
+export interface SalesforceCreateContactParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ lastName: string
+ firstName?: string
+ email?: string
+ phone?: string
+ accountId?: string
+ title?: string
+ department?: string
+ mailingStreet?: string
+ mailingCity?: string
+ mailingState?: string
+ mailingPostalCode?: string
+ mailingCountry?: string
+ description?: string
+}
+
+export interface SalesforceCreateContactResponse {
+ success: boolean
+ output: {
+ id: string
+ success: boolean
+ created: boolean
+ metadata: { operation: 'create_contact' }
+ }
+}
+
+export const salesforceCreateContactTool: ToolConfig<
+ SalesforceCreateContactParams,
+ SalesforceCreateContactResponse
+> = {
+ id: 'salesforce_create_contact',
+ name: 'Create Contact in Salesforce',
+ description: 'Create a new contact in Salesforce CRM',
+ version: '1.0.0',
+
+ oauth: { required: true, provider: 'salesforce' },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ lastName: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Last name (required)',
+ },
+ firstName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'First name',
+ },
+ email: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Email address',
+ },
+ phone: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Phone number',
+ },
+ accountId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Account ID to associate contact with',
+ },
+ title: { type: 'string', required: false, visibility: 'user-only', description: 'Job title' },
+ department: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Department',
+ },
+ mailingStreet: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing street',
+ },
+ mailingCity: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing city',
+ },
+ mailingState: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing state',
+ },
+ mailingPostalCode: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing postal code',
+ },
+ mailingCountry: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing country',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Contact description',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/sobjects/Contact`
+ },
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = { LastName: params.lastName }
+
+ if (params.firstName) body.FirstName = params.firstName
+ if (params.email) body.Email = params.email
+ if (params.phone) body.Phone = params.phone
+ if (params.accountId) body.AccountId = params.accountId
+ if (params.title) body.Title = params.title
+ if (params.department) body.Department = params.department
+ if (params.mailingStreet) body.MailingStreet = params.mailingStreet
+ if (params.mailingCity) body.MailingCity = params.mailingCity
+ if (params.mailingState) body.MailingState = params.mailingState
+ if (params.mailingPostalCode) body.MailingPostalCode = params.mailingPostalCode
+ if (params.mailingCountry) body.MailingCountry = params.mailingCountry
+ if (params.description) body.Description = params.description
+
+ return body
+ },
+ },
+
+ transformResponse: async (response: Response) => {
+ const data = await response.json()
+
+ if (!response.ok) {
+ logger.error('Salesforce API request failed', { data, status: response.status })
+ throw new Error(data[0]?.message || data.message || 'Failed to create contact in Salesforce')
+ }
+
+ return {
+ success: true,
+ output: {
+ id: data.id,
+ success: data.success,
+ created: true,
+ metadata: { operation: 'create_contact' as const },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Operation success status' },
+ output: {
+ type: 'object',
+ description: 'Created contact data',
+ properties: {
+ id: { type: 'string', description: 'Created contact ID' },
+ success: { type: 'boolean', description: 'Salesforce operation success' },
+ created: { type: 'boolean', description: 'Whether contact was created' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/create_lead.ts b/apps/sim/tools/salesforce/create_lead.ts
new file mode 100644
index 0000000000..1ffd1b5a43
--- /dev/null
+++ b/apps/sim/tools/salesforce/create_lead.ts
@@ -0,0 +1,129 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceCreateLeadParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ lastName: string
+ company: string
+ firstName?: string
+ email?: string
+ phone?: string
+ status?: string
+ leadSource?: string
+ title?: string
+ description?: string
+}
+
+export interface SalesforceCreateLeadResponse {
+ success: boolean
+ output: {
+ id: string
+ success: boolean
+ created: boolean
+ metadata: {
+ operation: 'create_lead'
+ }
+ }
+}
+
+export const salesforceCreateLeadTool: ToolConfig<
+ SalesforceCreateLeadParams,
+ SalesforceCreateLeadResponse
+> = {
+ id: 'salesforce_create_lead',
+ name: 'Create Lead in Salesforce',
+ description: 'Create a new lead',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ lastName: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Last name (required)',
+ },
+ company: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Company (required)',
+ },
+ firstName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'First name',
+ },
+ email: { type: 'string', required: false, visibility: 'user-only', description: 'Email' },
+ phone: { type: 'string', required: false, visibility: 'user-only', description: 'Phone' },
+ status: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Lead status',
+ },
+ leadSource: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Lead source',
+ },
+ title: { type: 'string', required: false, visibility: 'user-only', description: 'Title' },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Lead`,
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = { LastName: params.lastName, Company: params.company }
+ if (params.firstName) body.FirstName = params.firstName
+ if (params.email) body.Email = params.email
+ if (params.phone) body.Phone = params.phone
+ if (params.status) body.Status = params.status
+ if (params.leadSource) body.LeadSource = params.leadSource
+ if (params.title) body.Title = params.title
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to create lead')
+ return {
+ success: true,
+ output: {
+ id: data.id,
+ success: data.success,
+ created: true,
+ metadata: { operation: 'create_lead' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Created lead' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/create_opportunity.ts b/apps/sim/tools/salesforce/create_opportunity.ts
new file mode 100644
index 0000000000..aebc55c7f8
--- /dev/null
+++ b/apps/sim/tools/salesforce/create_opportunity.ts
@@ -0,0 +1,132 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceCreateOpportunityParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ name: string
+ stageName: string
+ closeDate: string
+ accountId?: string
+ amount?: string
+ probability?: string
+ description?: string
+}
+
+export interface SalesforceCreateOpportunityResponse {
+ success: boolean
+ output: {
+ id: string
+ success: boolean
+ created: boolean
+ metadata: {
+ operation: 'create_opportunity'
+ }
+ }
+}
+
+export const salesforceCreateOpportunityTool: ToolConfig<
+ SalesforceCreateOpportunityParams,
+ SalesforceCreateOpportunityResponse
+> = {
+ id: 'salesforce_create_opportunity',
+ name: 'Create Opportunity in Salesforce',
+ description: 'Create a new opportunity',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ name: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Opportunity name (required)',
+ },
+ stageName: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Stage name (required)',
+ },
+ closeDate: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Close date YYYY-MM-DD (required)',
+ },
+ accountId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Account ID',
+ },
+ amount: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Amount (number)',
+ },
+ probability: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Probability (0-100)',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Opportunity`,
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {
+ Name: params.name,
+ StageName: params.stageName,
+ CloseDate: params.closeDate,
+ }
+ if (params.accountId) body.AccountId = params.accountId
+ if (params.amount) body.Amount = Number.parseFloat(params.amount)
+ if (params.probability) body.Probability = Number.parseInt(params.probability)
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok)
+ throw new Error(data[0]?.message || data.message || 'Failed to create opportunity')
+ return {
+ success: true,
+ output: {
+ id: data.id,
+ success: data.success,
+ created: true,
+ metadata: { operation: 'create_opportunity' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Created opportunity' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/create_task.ts b/apps/sim/tools/salesforce/create_task.ts
new file mode 100644
index 0000000000..b00ff719f3
--- /dev/null
+++ b/apps/sim/tools/salesforce/create_task.ts
@@ -0,0 +1,141 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceCreateTaskParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ subject: string
+ status?: string
+ priority?: string
+ activityDate?: string
+ whoId?: string
+ whatId?: string
+ description?: string
+}
+
+export interface SalesforceCreateTaskResponse {
+ success: boolean
+ output: {
+ id: string
+ success: boolean
+ created: boolean
+ metadata: {
+ operation: 'create_task'
+ }
+ }
+}
+
+export const salesforceCreateTaskTool: ToolConfig<
+ SalesforceCreateTaskParams,
+ SalesforceCreateTaskResponse
+> = {
+ id: 'salesforce_create_task',
+ name: 'Create Task in Salesforce',
+ description: 'Create a new task',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ subject: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Task subject (required)',
+ },
+ status: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Status (e.g., Not Started, In Progress, Completed)',
+ },
+ priority: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Priority (e.g., Low, Normal, High)',
+ },
+ activityDate: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Due date YYYY-MM-DD',
+ },
+ whoId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Related Contact/Lead ID',
+ },
+ whatId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Related Account/Opportunity ID',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Task`,
+ method: 'POST',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = { Subject: params.subject }
+ if (params.status) body.Status = params.status
+ if (params.priority) body.Priority = params.priority
+ if (params.activityDate) body.ActivityDate = params.activityDate
+ if (params.whoId) body.WhoId = params.whoId
+ if (params.whatId) body.WhatId = params.whatId
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to create task')
+ return {
+ success: true,
+ output: {
+ id: data.id,
+ success: data.success,
+ created: true,
+ metadata: { operation: 'create_task' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Created task' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/delete_case.ts b/apps/sim/tools/salesforce/delete_case.ts
new file mode 100644
index 0000000000..cefb38ed01
--- /dev/null
+++ b/apps/sim/tools/salesforce/delete_case.ts
@@ -0,0 +1,88 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceDeleteCaseParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ caseId: string
+}
+
+export interface SalesforceDeleteCaseResponse {
+ success: boolean
+ output: {
+ id: string
+ deleted: boolean
+ metadata: {
+ operation: 'delete_case'
+ }
+ }
+}
+
+export const salesforceDeleteCaseTool: ToolConfig<
+ SalesforceDeleteCaseParams,
+ SalesforceDeleteCaseResponse
+> = {
+ id: 'salesforce_delete_case',
+ name: 'Delete Case from Salesforce',
+ description: 'Delete a case',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ caseId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Case ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Case/${params.caseId}`,
+ method: 'DELETE',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json().catch(() => ({}))
+ throw new Error(data[0]?.message || data.message || 'Failed to delete case')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.caseId || '',
+ deleted: true,
+ metadata: { operation: 'delete_case' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Deleted case' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/delete_contact.ts b/apps/sim/tools/salesforce/delete_contact.ts
new file mode 100644
index 0000000000..a15c3a7dbb
--- /dev/null
+++ b/apps/sim/tools/salesforce/delete_contact.ts
@@ -0,0 +1,88 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceContacts')
+
+export interface SalesforceDeleteContactParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ contactId: string
+}
+
+export interface SalesforceDeleteContactResponse {
+ success: boolean
+ output: {
+ id: string
+ deleted: boolean
+ metadata: { operation: 'delete_contact' }
+ }
+}
+
+export const salesforceDeleteContactTool: ToolConfig<
+ SalesforceDeleteContactParams,
+ SalesforceDeleteContactResponse
+> = {
+ id: 'salesforce_delete_contact',
+ name: 'Delete Contact from Salesforce',
+ description: 'Delete a contact from Salesforce CRM',
+ version: '1.0.0',
+
+ oauth: { required: true, provider: 'salesforce' },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ contactId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Contact ID to delete (required)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/sobjects/Contact/${params.contactId}`
+ },
+ method: 'DELETE',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ }),
+ },
+
+ transformResponse: async (response: Response, params?) => {
+ if (!response.ok) {
+ const data = await response.json().catch(() => ({}))
+ logger.error('Salesforce API request failed', { data, status: response.status })
+ throw new Error(
+ data[0]?.message || data.message || 'Failed to delete contact from Salesforce'
+ )
+ }
+
+ return {
+ success: true,
+ output: {
+ id: params?.contactId || '',
+ deleted: true,
+ metadata: { operation: 'delete_contact' as const },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Operation success status' },
+ output: {
+ type: 'object',
+ description: 'Deleted contact data',
+ properties: {
+ id: { type: 'string', description: 'Deleted contact ID' },
+ deleted: { type: 'boolean', description: 'Whether contact was deleted' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/delete_lead.ts b/apps/sim/tools/salesforce/delete_lead.ts
new file mode 100644
index 0000000000..9f79b33940
--- /dev/null
+++ b/apps/sim/tools/salesforce/delete_lead.ts
@@ -0,0 +1,74 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceDeleteLeadParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ leadId: string
+}
+
+export interface SalesforceDeleteLeadResponse {
+ success: boolean
+ output: {
+ id: string
+ deleted: boolean
+ metadata: {
+ operation: 'delete_lead'
+ }
+ }
+}
+
+export const salesforceDeleteLeadTool: ToolConfig<
+ SalesforceDeleteLeadParams,
+ SalesforceDeleteLeadResponse
+> = {
+ id: 'salesforce_delete_lead',
+ name: 'Delete Lead from Salesforce',
+ description: 'Delete a lead',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ leadId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Lead ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Lead/${params.leadId}`,
+ method: 'DELETE',
+ headers: (params) => ({ Authorization: `Bearer ${params.accessToken}` }),
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json().catch(() => ({}))
+ throw new Error(data[0]?.message || data.message || 'Failed to delete lead')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.leadId || '',
+ deleted: true,
+ metadata: { operation: 'delete_lead' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Deleted lead' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/delete_opportunity.ts b/apps/sim/tools/salesforce/delete_opportunity.ts
new file mode 100644
index 0000000000..31258d8677
--- /dev/null
+++ b/apps/sim/tools/salesforce/delete_opportunity.ts
@@ -0,0 +1,74 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceDeleteOpportunityParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ opportunityId: string
+}
+
+export interface SalesforceDeleteOpportunityResponse {
+ success: boolean
+ output: {
+ id: string
+ deleted: boolean
+ metadata: {
+ operation: 'delete_opportunity'
+ }
+ }
+}
+
+export const salesforceDeleteOpportunityTool: ToolConfig<
+ SalesforceDeleteOpportunityParams,
+ SalesforceDeleteOpportunityResponse
+> = {
+ id: 'salesforce_delete_opportunity',
+ name: 'Delete Opportunity from Salesforce',
+ description: 'Delete an opportunity',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ opportunityId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Opportunity ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Opportunity/${params.opportunityId}`,
+ method: 'DELETE',
+ headers: (params) => ({ Authorization: `Bearer ${params.accessToken}` }),
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json().catch(() => ({}))
+ throw new Error(data[0]?.message || data.message || 'Failed to delete opportunity')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.opportunityId || '',
+ deleted: true,
+ metadata: { operation: 'delete_opportunity' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Deleted opportunity' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/delete_task.ts b/apps/sim/tools/salesforce/delete_task.ts
new file mode 100644
index 0000000000..6f6cc405b0
--- /dev/null
+++ b/apps/sim/tools/salesforce/delete_task.ts
@@ -0,0 +1,88 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceDeleteTaskParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ taskId: string
+}
+
+export interface SalesforceDeleteTaskResponse {
+ success: boolean
+ output: {
+ id: string
+ deleted: boolean
+ metadata: {
+ operation: 'delete_task'
+ }
+ }
+}
+
+export const salesforceDeleteTaskTool: ToolConfig<
+ SalesforceDeleteTaskParams,
+ SalesforceDeleteTaskResponse
+> = {
+ id: 'salesforce_delete_task',
+ name: 'Delete Task from Salesforce',
+ description: 'Delete a task',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ taskId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Task ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Task/${params.taskId}`,
+ method: 'DELETE',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json().catch(() => ({}))
+ throw new Error(data[0]?.message || data.message || 'Failed to delete task')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.taskId || '',
+ deleted: true,
+ metadata: { operation: 'delete_task' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Deleted task' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/describe_object.ts b/apps/sim/tools/salesforce/describe_object.ts
new file mode 100644
index 0000000000..a9087e0ee8
--- /dev/null
+++ b/apps/sim/tools/salesforce/describe_object.ts
@@ -0,0 +1,140 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceQuery')
+
+export interface SalesforceDescribeObjectParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ objectName: string
+}
+
+export interface SalesforceDescribeObjectResponse {
+ success: boolean
+ output: {
+ objectName: string
+ label?: string
+ labelPlural?: string
+ fields?: any[]
+ keyPrefix?: string
+ queryable?: boolean
+ createable?: boolean
+ updateable?: boolean
+ deletable?: boolean
+ childRelationships?: any[]
+ recordTypeInfos?: any[]
+ metadata: {
+ operation: 'describe_object'
+ fieldCount: number
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Describe a Salesforce object to get its metadata/fields
+ * Useful for discovering available fields for queries
+ */
+export const salesforceDescribeObjectTool: ToolConfig<
+ SalesforceDescribeObjectParams,
+ SalesforceDescribeObjectResponse
+> = {
+ id: 'salesforce_describe_object',
+ name: 'Describe Salesforce Object',
+ description: 'Get metadata and field information for a Salesforce object',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ objectName: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'API name of the object (e.g., Account, Contact, Lead, Custom_Object__c)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.objectName || params.objectName.trim() === '') {
+ throw new Error(
+ 'Object Name is required. Please provide a valid Salesforce object API name (e.g., Account, Contact, Lead).'
+ )
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/sobjects/${params.objectName}/describe`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ `Failed to describe object: ${params?.objectName}`
+ )
+ logger.error('Failed to describe object', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ return {
+ success: true,
+ output: {
+ objectName: params?.objectName || '',
+ label: data.label,
+ labelPlural: data.labelPlural,
+ fields: data.fields,
+ keyPrefix: data.keyPrefix,
+ queryable: data.queryable,
+ createable: data.createable,
+ updateable: data.updateable,
+ deletable: data.deletable,
+ childRelationships: data.childRelationships,
+ recordTypeInfos: data.recordTypeInfos,
+ metadata: {
+ operation: 'describe_object',
+ fieldCount: data.fields?.length || 0,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Object metadata',
+ properties: {
+ objectName: { type: 'string', description: 'API name of the object' },
+ label: { type: 'string', description: 'Display label' },
+ labelPlural: { type: 'string', description: 'Plural display label' },
+ fields: { type: 'array', description: 'Array of field definitions' },
+ keyPrefix: { type: 'string', description: 'ID prefix for this object type' },
+ queryable: { type: 'boolean', description: 'Whether object can be queried' },
+ createable: { type: 'boolean', description: 'Whether records can be created' },
+ updateable: { type: 'boolean', description: 'Whether records can be updated' },
+ deletable: { type: 'boolean', description: 'Whether records can be deleted' },
+ childRelationships: { type: 'array', description: 'Child relationship definitions' },
+ recordTypeInfos: { type: 'array', description: 'Record type information' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_cases.ts b/apps/sim/tools/salesforce/get_cases.ts
new file mode 100644
index 0000000000..cd65f84790
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_cases.ts
@@ -0,0 +1,128 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceGetCasesParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ caseId?: string
+ limit?: string
+ fields?: string
+ orderBy?: string
+}
+
+export interface SalesforceGetCasesResponse {
+ success: boolean
+ output: {
+ case?: any
+ cases?: any[]
+ paging?: {
+ nextRecordsUrl?: string
+ totalSize: number
+ done: boolean
+ }
+ metadata: {
+ operation: 'get_cases'
+ totalReturned?: number
+ hasMore?: boolean
+ }
+ success: boolean
+ }
+}
+
+export const salesforceGetCasesTool: ToolConfig<
+ SalesforceGetCasesParams,
+ SalesforceGetCasesResponse
+> = {
+ id: 'salesforce_get_cases',
+ name: 'Get Cases from Salesforce',
+ description: 'Get case(s) from Salesforce',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ caseId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Case ID (optional)',
+ },
+ limit: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Max results (default: 100)',
+ },
+ fields: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Comma-separated fields',
+ },
+ orderBy: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Order by field',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ if (params.caseId) {
+ const fields =
+ params.fields || 'Id,CaseNumber,Subject,Status,Priority,Origin,ContactId,AccountId'
+ return `${instanceUrl}/services/data/v59.0/sobjects/Case/${params.caseId}?fields=${fields}`
+ }
+ const limit = params.limit ? Number.parseInt(params.limit) : 100
+ const fields =
+ params.fields || 'Id,CaseNumber,Subject,Status,Priority,Origin,ContactId,AccountId'
+ const orderBy = params.orderBy || 'CreatedDate DESC'
+ const query = `SELECT ${fields} FROM Case ORDER BY ${orderBy} LIMIT ${limit}`
+ return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to fetch cases')
+ if (params?.caseId) {
+ return {
+ success: true,
+ output: { case: data, metadata: { operation: 'get_cases' }, success: true },
+ }
+ }
+ const cases = data.records || []
+ return {
+ success: true,
+ output: {
+ cases,
+ paging: {
+ nextRecordsUrl: data.nextRecordsUrl,
+ totalSize: data.totalSize || cases.length,
+ done: data.done !== false,
+ },
+ metadata: { operation: 'get_cases', totalReturned: cases.length, hasMore: !data.done },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Case data' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_contacts.ts b/apps/sim/tools/salesforce/get_contacts.ts
new file mode 100644
index 0000000000..679d3a32d6
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_contacts.ts
@@ -0,0 +1,169 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceContacts')
+
+export interface SalesforceGetContactsParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ contactId?: string
+ limit?: string
+ fields?: string
+ orderBy?: string
+}
+
+export interface SalesforceGetContactsResponse {
+ success: boolean
+ output: {
+ contacts?: any[]
+ contact?: any
+ paging?: {
+ nextRecordsUrl?: string
+ totalSize: number
+ done: boolean
+ }
+ metadata: {
+ operation: 'get_contacts'
+ totalReturned?: number
+ hasMore?: boolean
+ singleContact?: boolean
+ }
+ success: boolean
+ }
+}
+
+export const salesforceGetContactsTool: ToolConfig<
+ SalesforceGetContactsParams,
+ SalesforceGetContactsResponse
+> = {
+ id: 'salesforce_get_contacts',
+ name: 'Get Contacts from Salesforce',
+ description: 'Get contact(s) from Salesforce - single contact if ID provided, or list if not',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ contactId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Contact ID (if provided, returns single contact)',
+ },
+ limit: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Number of results (default: 100, max: 2000). Only for list query.',
+ },
+ fields: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Comma-separated fields (e.g., "Id,FirstName,LastName,Email,Phone")',
+ },
+ orderBy: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Order by field (e.g., "LastName ASC"). Only for list query.',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+
+ // Single contact by ID
+ if (params.contactId) {
+ const fields =
+ params.fields || 'Id,FirstName,LastName,Email,Phone,AccountId,Title,Department'
+ return `${instanceUrl}/services/data/v59.0/sobjects/Contact/${params.contactId}?fields=${fields}`
+ }
+
+ // List contacts with SOQL query
+ const limit = params.limit ? Number.parseInt(params.limit) : 100
+ const fields = params.fields || 'Id,FirstName,LastName,Email,Phone,AccountId,Title,Department'
+ const orderBy = params.orderBy || 'LastName ASC'
+ const query = `SELECT ${fields} FROM Contact ORDER BY ${orderBy} LIMIT ${limit}`
+ const encodedQuery = encodeURIComponent(query)
+
+ return `${instanceUrl}/services/data/v59.0/query?q=${encodedQuery}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response: Response, params?) => {
+ const data = await response.json()
+
+ if (!response.ok) {
+ logger.error('Salesforce API request failed', { data, status: response.status })
+ throw new Error(
+ data[0]?.message || data.message || 'Failed to fetch contacts from Salesforce'
+ )
+ }
+
+ // Single contact response
+ if (params?.contactId) {
+ return {
+ success: true,
+ output: {
+ contact: data,
+ metadata: {
+ operation: 'get_contacts' as const,
+ singleContact: true,
+ },
+ success: true,
+ },
+ }
+ }
+
+ // List contacts response
+ const contacts = data.records || []
+ return {
+ success: true,
+ output: {
+ contacts,
+ paging: {
+ nextRecordsUrl: data.nextRecordsUrl,
+ totalSize: data.totalSize || contacts.length,
+ done: data.done !== false,
+ },
+ metadata: {
+ operation: 'get_contacts' as const,
+ totalReturned: contacts.length,
+ hasMore: !data.done,
+ singleContact: false,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Operation success status' },
+ output: {
+ type: 'object',
+ description: 'Contact(s) data',
+ properties: {
+ contacts: { type: 'array', description: 'Array of contacts (list query)' },
+ contact: { type: 'object', description: 'Single contact (by ID)' },
+ paging: { type: 'object', description: 'Pagination info (list query)' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_dashboard.ts b/apps/sim/tools/salesforce/get_dashboard.ts
new file mode 100644
index 0000000000..b5824f26e0
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_dashboard.ts
@@ -0,0 +1,118 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceDashboards')
+
+export interface SalesforceGetDashboardParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ dashboardId: string
+}
+
+export interface SalesforceGetDashboardResponse {
+ success: boolean
+ output: {
+ dashboard: any
+ dashboardId: string
+ components: any[]
+ metadata: {
+ operation: 'get_dashboard'
+ dashboardName?: string
+ folderId?: string
+ runningUser?: any
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Get details for a specific dashboard
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_dashboard_results.htm
+ */
+export const salesforceGetDashboardTool: ToolConfig<
+ SalesforceGetDashboardParams,
+ SalesforceGetDashboardResponse
+> = {
+ id: 'salesforce_get_dashboard',
+ name: 'Get Dashboard from Salesforce',
+ description: 'Get details and results for a specific dashboard',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ dashboardId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Dashboard ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.dashboardId || params.dashboardId.trim() === '') {
+ throw new Error('Dashboard ID is required. Please provide a valid Salesforce Dashboard ID.')
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/analytics/dashboards/${params.dashboardId}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ `Failed to get dashboard ID: ${params?.dashboardId}`
+ )
+ logger.error('Failed to get dashboard', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ return {
+ success: true,
+ output: {
+ dashboard: data,
+ dashboardId: params?.dashboardId || '',
+ components: data.componentData || [],
+ metadata: {
+ operation: 'get_dashboard',
+ dashboardName: data.name,
+ folderId: data.folderId,
+ runningUser: data.runningUser,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Dashboard data',
+ properties: {
+ dashboard: { type: 'object', description: 'Dashboard details' },
+ dashboardId: { type: 'string', description: 'Dashboard ID' },
+ components: { type: 'array', description: 'Dashboard component data' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_leads.ts b/apps/sim/tools/salesforce/get_leads.ts
new file mode 100644
index 0000000000..93bda3453b
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_leads.ts
@@ -0,0 +1,132 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceGetLeadsParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ leadId?: string
+ limit?: string
+ fields?: string
+ orderBy?: string
+}
+
+export interface SalesforceGetLeadsResponse {
+ success: boolean
+ output: {
+ lead?: any
+ leads?: any[]
+ paging?: {
+ nextRecordsUrl?: string
+ totalSize: number
+ done: boolean
+ }
+ metadata: {
+ operation: 'get_leads'
+ totalReturned?: number
+ hasMore?: boolean
+ singleLead?: boolean
+ }
+ success: boolean
+ }
+}
+
+export const salesforceGetLeadsTool: ToolConfig<
+ SalesforceGetLeadsParams,
+ SalesforceGetLeadsResponse
+> = {
+ id: 'salesforce_get_leads',
+ name: 'Get Leads from Salesforce',
+ description: 'Get lead(s) from Salesforce',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ leadId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Lead ID (optional)',
+ },
+ limit: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Max results (default: 100)',
+ },
+ fields: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Comma-separated fields',
+ },
+ orderBy: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Order by field',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ if (params.leadId) {
+ const fields =
+ params.fields || 'Id,FirstName,LastName,Company,Email,Phone,Status,LeadSource'
+ return `${instanceUrl}/services/data/v59.0/sobjects/Lead/${params.leadId}?fields=${fields}`
+ }
+ const limit = params.limit ? Number.parseInt(params.limit) : 100
+ const fields = params.fields || 'Id,FirstName,LastName,Company,Email,Phone,Status,LeadSource'
+ const orderBy = params.orderBy || 'LastName ASC'
+ const query = `SELECT ${fields} FROM Lead ORDER BY ${orderBy} LIMIT ${limit}`
+ return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to fetch leads')
+ if (params?.leadId) {
+ return {
+ success: true,
+ output: {
+ lead: data,
+ metadata: { operation: 'get_leads', singleLead: true },
+ success: true,
+ },
+ }
+ }
+ const leads = data.records || []
+ return {
+ success: true,
+ output: {
+ leads,
+ paging: {
+ nextRecordsUrl: data.nextRecordsUrl,
+ totalSize: data.totalSize || leads.length,
+ done: data.done !== false,
+ },
+ metadata: { operation: 'get_leads', totalReturned: leads.length, hasMore: !data.done },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: { type: 'object', description: 'Lead data' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_opportunities.ts b/apps/sim/tools/salesforce/get_opportunities.ts
new file mode 100644
index 0000000000..0330abdd45
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_opportunities.ts
@@ -0,0 +1,131 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceGetOpportunitiesParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ opportunityId?: string
+ limit?: string
+ fields?: string
+ orderBy?: string
+}
+
+export interface SalesforceGetOpportunitiesResponse {
+ success: boolean
+ output: {
+ opportunity?: any
+ opportunities?: any[]
+ paging?: {
+ nextRecordsUrl?: string
+ totalSize: number
+ done: boolean
+ }
+ metadata: {
+ operation: 'get_opportunities'
+ totalReturned?: number
+ hasMore?: boolean
+ }
+ success: boolean
+ }
+}
+
+export const salesforceGetOpportunitiesTool: ToolConfig<
+ SalesforceGetOpportunitiesParams,
+ SalesforceGetOpportunitiesResponse
+> = {
+ id: 'salesforce_get_opportunities',
+ name: 'Get Opportunities from Salesforce',
+ description: 'Get opportunity(ies) from Salesforce',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ opportunityId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Opportunity ID (optional)',
+ },
+ limit: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Max results (default: 100)',
+ },
+ fields: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Comma-separated fields',
+ },
+ orderBy: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Order by field',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ if (params.opportunityId) {
+ const fields = params.fields || 'Id,Name,AccountId,Amount,StageName,CloseDate,Probability'
+ return `${instanceUrl}/services/data/v59.0/sobjects/Opportunity/${params.opportunityId}?fields=${fields}`
+ }
+ const limit = params.limit ? Number.parseInt(params.limit) : 100
+ const fields = params.fields || 'Id,Name,AccountId,Amount,StageName,CloseDate,Probability'
+ const orderBy = params.orderBy || 'CloseDate DESC'
+ const query = `SELECT ${fields} FROM Opportunity ORDER BY ${orderBy} LIMIT ${limit}`
+ return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok)
+ throw new Error(data[0]?.message || data.message || 'Failed to fetch opportunities')
+ if (params?.opportunityId) {
+ return {
+ success: true,
+ output: { opportunity: data, metadata: { operation: 'get_opportunities' }, success: true },
+ }
+ }
+ const opportunities = data.records || []
+ return {
+ success: true,
+ output: {
+ opportunities,
+ paging: {
+ nextRecordsUrl: data.nextRecordsUrl,
+ totalSize: data.totalSize || opportunities.length,
+ done: data.done !== false,
+ },
+ metadata: {
+ operation: 'get_opportunities',
+ totalReturned: opportunities.length,
+ hasMore: !data.done,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Opportunity data' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_report.ts b/apps/sim/tools/salesforce/get_report.ts
new file mode 100644
index 0000000000..e1f0c08dfd
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_report.ts
@@ -0,0 +1,109 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceReports')
+
+export interface SalesforceGetReportParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ reportId: string
+}
+
+export interface SalesforceGetReportResponse {
+ success: boolean
+ output: {
+ report: any
+ reportId: string
+ metadata: {
+ operation: 'get_report'
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Get metadata for a specific report
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_get_reportmetadata.htm
+ */
+export const salesforceGetReportTool: ToolConfig<
+ SalesforceGetReportParams,
+ SalesforceGetReportResponse
+> = {
+ id: 'salesforce_get_report',
+ name: 'Get Report Metadata from Salesforce',
+ description: 'Get metadata and describe information for a specific report',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ reportId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Report ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.reportId || params.reportId.trim() === '') {
+ throw new Error('Report ID is required. Please provide a valid Salesforce Report ID.')
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/analytics/reports/${params.reportId}/describe`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ `Failed to get report metadata for report ID: ${params?.reportId}`
+ )
+ logger.error('Failed to get report metadata', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ return {
+ success: true,
+ output: {
+ report: data,
+ reportId: params?.reportId || '',
+ metadata: {
+ operation: 'get_report',
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Report metadata',
+ properties: {
+ report: { type: 'object', description: 'Report metadata object' },
+ reportId: { type: 'string', description: 'Report ID' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/get_tasks.ts b/apps/sim/tools/salesforce/get_tasks.ts
new file mode 100644
index 0000000000..791a5ab211
--- /dev/null
+++ b/apps/sim/tools/salesforce/get_tasks.ts
@@ -0,0 +1,139 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceGetTasksParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ taskId?: string
+ limit?: string
+ fields?: string
+ orderBy?: string
+}
+
+export interface SalesforceGetTasksResponse {
+ success: boolean
+ output: {
+ task?: any
+ tasks?: any[]
+ paging?: {
+ nextRecordsUrl?: string
+ totalSize: number
+ done: boolean
+ }
+ metadata: {
+ operation: 'get_tasks'
+ totalReturned?: number
+ hasMore?: boolean
+ }
+ success: boolean
+ }
+}
+
+export const salesforceGetTasksTool: ToolConfig<
+ SalesforceGetTasksParams,
+ SalesforceGetTasksResponse
+> = {
+ id: 'salesforce_get_tasks',
+ name: 'Get Tasks from Salesforce',
+ description: 'Get task(s) from Salesforce',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ taskId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Task ID (optional)',
+ },
+ limit: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Max results (default: 100)',
+ },
+ fields: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Comma-separated fields',
+ },
+ orderBy: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Order by field',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ if (params.taskId) {
+ const fields =
+ params.fields || 'Id,Subject,Status,Priority,ActivityDate,WhoId,WhatId,OwnerId'
+ return `${instanceUrl}/services/data/v59.0/sobjects/Task/${params.taskId}?fields=${fields}`
+ }
+ const limit = params.limit ? Number.parseInt(params.limit) : 100
+ const fields = params.fields || 'Id,Subject,Status,Priority,ActivityDate,WhoId,WhatId,OwnerId'
+ const orderBy = params.orderBy || 'ActivityDate DESC'
+ const query = `SELECT ${fields} FROM Task ORDER BY ${orderBy} LIMIT ${limit}`
+ return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to fetch tasks')
+ if (params?.taskId) {
+ return {
+ success: true,
+ output: { task: data, metadata: { operation: 'get_tasks' }, success: true },
+ }
+ }
+ const tasks = data.records || []
+ return {
+ success: true,
+ output: {
+ tasks,
+ paging: {
+ nextRecordsUrl: data.nextRecordsUrl,
+ totalSize: data.totalSize || tasks.length,
+ done: data.done !== false,
+ },
+ metadata: { operation: 'get_tasks', totalReturned: tasks.length, hasMore: !data.done },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Task data' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/index.ts b/apps/sim/tools/salesforce/index.ts
index cbe2958df8..6ffc3adc68 100644
--- a/apps/sim/tools/salesforce/index.ts
+++ b/apps/sim/tools/salesforce/index.ts
@@ -1,34 +1,35 @@
-export {
- salesforceCreateCaseTool,
- salesforceDeleteCaseTool,
- salesforceGetCasesTool,
- salesforceUpdateCaseTool,
-} from './cases'
-export {
- salesforceCreateContactTool,
- salesforceDeleteContactTool,
- salesforceGetContactsTool,
- salesforceUpdateContactTool,
-} from './contacts'
export { salesforceCreateAccountTool } from './create_account'
+export { salesforceCreateCaseTool } from './create_case'
+export { salesforceCreateContactTool } from './create_contact'
+export { salesforceCreateLeadTool } from './create_lead'
+export { salesforceCreateOpportunityTool } from './create_opportunity'
+export { salesforceCreateTaskTool } from './create_task'
export { salesforceDeleteAccountTool } from './delete_account'
+export { salesforceDeleteCaseTool } from './delete_case'
+export { salesforceDeleteContactTool } from './delete_contact'
+export { salesforceDeleteLeadTool } from './delete_lead'
+export { salesforceDeleteOpportunityTool } from './delete_opportunity'
+export { salesforceDeleteTaskTool } from './delete_task'
+export { salesforceDescribeObjectTool } from './describe_object'
export { salesforceGetAccountsTool } from './get_accounts'
-export {
- salesforceCreateLeadTool,
- salesforceDeleteLeadTool,
- salesforceGetLeadsTool,
- salesforceUpdateLeadTool,
-} from './leads'
-export {
- salesforceCreateOpportunityTool,
- salesforceDeleteOpportunityTool,
- salesforceGetOpportunitiesTool,
- salesforceUpdateOpportunityTool,
-} from './opportunities'
-export {
- salesforceCreateTaskTool,
- salesforceDeleteTaskTool,
- salesforceGetTasksTool,
- salesforceUpdateTaskTool,
-} from './tasks'
+export { salesforceGetCasesTool } from './get_cases'
+export { salesforceGetContactsTool } from './get_contacts'
+export { salesforceGetDashboardTool } from './get_dashboard'
+export { salesforceGetLeadsTool } from './get_leads'
+export { salesforceGetOpportunitiesTool } from './get_opportunities'
+export { salesforceGetReportTool } from './get_report'
+export { salesforceGetTasksTool } from './get_tasks'
+export { salesforceListDashboardsTool } from './list_dashboards'
+export { salesforceListObjectsTool } from './list_objects'
+export { salesforceListReportTypesTool } from './list_report_types'
+export { salesforceListReportsTool } from './list_reports'
+export { salesforceQueryTool } from './query'
+export { salesforceQueryMoreTool } from './query_more'
+export { salesforceRefreshDashboardTool } from './refresh_dashboard'
+export { salesforceRunReportTool } from './run_report'
export { salesforceUpdateAccountTool } from './update_account'
+export { salesforceUpdateCaseTool } from './update_case'
+export { salesforceUpdateContactTool } from './update_contact'
+export { salesforceUpdateLeadTool } from './update_lead'
+export { salesforceUpdateOpportunityTool } from './update_opportunity'
+export { salesforceUpdateTaskTool } from './update_task'
diff --git a/apps/sim/tools/salesforce/leads.ts b/apps/sim/tools/salesforce/leads.ts
deleted file mode 100644
index 13cbfe4af3..0000000000
--- a/apps/sim/tools/salesforce/leads.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-import { createLogger } from '@/lib/logs/console/logger'
-import type { ToolConfig } from '@/tools/types'
-
-const logger = createLogger('SalesforceLeads')
-
-function getInstanceUrl(idToken?: string, instanceUrl?: string): string {
- if (instanceUrl) return instanceUrl
- if (idToken) {
- try {
- const base64Url = idToken.split('.')[1]
- const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
- const jsonPayload = decodeURIComponent(
- atob(base64)
- .split('')
- .map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`)
- .join('')
- )
- const decoded = JSON.parse(jsonPayload)
- if (decoded.profile) {
- const match = decoded.profile.match(/^(https:\/\/[^/]+)/)
- if (match) return match[1]
- } else if (decoded.sub) {
- const match = decoded.sub.match(/^(https:\/\/[^/]+)/)
- if (match && match[1] !== 'https://login.salesforce.com') return match[1]
- }
- } catch (error) {
- logger.error('Failed to decode Salesforce idToken', { error })
- }
- }
- throw new Error('Salesforce instance URL is required but not provided')
-}
-
-// Get Leads
-export interface SalesforceGetLeadsParams {
- accessToken: string
- idToken?: string
- instanceUrl?: string
- leadId?: string
- limit?: string
- fields?: string
- orderBy?: string
-}
-
-export const salesforceGetLeadsTool: ToolConfig = {
- id: 'salesforce_get_leads',
- name: 'Get Leads from Salesforce',
- description: 'Get lead(s) from Salesforce',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- leadId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Lead ID (optional)',
- },
- limit: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Max results (default: 100)',
- },
- fields: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Comma-separated fields',
- },
- orderBy: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Order by field',
- },
- },
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- if (params.leadId) {
- const fields =
- params.fields || 'Id,FirstName,LastName,Company,Email,Phone,Status,LeadSource'
- return `${instanceUrl}/services/data/v59.0/sobjects/Lead/${params.leadId}?fields=${fields}`
- }
- const limit = params.limit ? Number.parseInt(params.limit) : 100
- const fields = params.fields || 'Id,FirstName,LastName,Company,Email,Phone,Status,LeadSource'
- const orderBy = params.orderBy || 'LastName ASC'
- const query = `SELECT ${fields} FROM Lead ORDER BY ${orderBy} LIMIT ${limit}`
- return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
- },
- method: 'GET',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- },
- transformResponse: async (response, params) => {
- const data = await response.json()
- if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to fetch leads')
- if (params.leadId) {
- return {
- success: true,
- output: {
- lead: data,
- metadata: { operation: 'get_leads', singleLead: true },
- success: true,
- },
- }
- }
- const leads = data.records || []
- return {
- success: true,
- output: {
- leads,
- paging: {
- nextRecordsUrl: data.nextRecordsUrl,
- totalSize: data.totalSize || leads.length,
- done: data.done !== false,
- },
- metadata: { operation: 'get_leads', totalReturned: leads.length, hasMore: !data.done },
- success: true,
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success status' },
- output: { type: 'object', description: 'Lead data' },
- },
-}
-
-// Create Lead
-export const salesforceCreateLeadTool: ToolConfig = {
- id: 'salesforce_create_lead',
- name: 'Create Lead in Salesforce',
- description: 'Create a new lead',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- lastName: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Last name (required)',
- },
- company: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Company (required)',
- },
- firstName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'First name',
- },
- email: { type: 'string', required: false, visibility: 'user-only', description: 'Email' },
- phone: { type: 'string', required: false, visibility: 'user-only', description: 'Phone' },
- status: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Lead status',
- },
- leadSource: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Lead source',
- },
- title: { type: 'string', required: false, visibility: 'user-only', description: 'Title' },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Lead`,
- method: 'POST',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = { LastName: params.lastName, Company: params.company }
- if (params.firstName) body.FirstName = params.firstName
- if (params.email) body.Email = params.email
- if (params.phone) body.Phone = params.phone
- if (params.status) body.Status = params.status
- if (params.leadSource) body.LeadSource = params.leadSource
- if (params.title) body.Title = params.title
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response) => {
- const data = await response.json()
- if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to create lead')
- return {
- success: true,
- output: {
- id: data.id,
- success: data.success,
- created: true,
- metadata: { operation: 'create_lead' },
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Created lead' },
- },
-}
-
-// Update Lead
-export const salesforceUpdateLeadTool: ToolConfig = {
- id: 'salesforce_update_lead',
- name: 'Update Lead in Salesforce',
- description: 'Update an existing lead',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- leadId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Lead ID (required)',
- },
- lastName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Last name',
- },
- company: { type: 'string', required: false, visibility: 'user-only', description: 'Company' },
- firstName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'First name',
- },
- email: { type: 'string', required: false, visibility: 'user-only', description: 'Email' },
- phone: { type: 'string', required: false, visibility: 'user-only', description: 'Phone' },
- status: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Lead status',
- },
- leadSource: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Lead source',
- },
- title: { type: 'string', required: false, visibility: 'user-only', description: 'Title' },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Lead/${params.leadId}`,
- method: 'PATCH',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = {}
- if (params.lastName) body.LastName = params.lastName
- if (params.company) body.Company = params.company
- if (params.firstName) body.FirstName = params.firstName
- if (params.email) body.Email = params.email
- if (params.phone) body.Phone = params.phone
- if (params.status) body.Status = params.status
- if (params.leadSource) body.LeadSource = params.leadSource
- if (params.title) body.Title = params.title
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json()
- throw new Error(data[0]?.message || data.message || 'Failed to update lead')
- }
- return {
- success: true,
- output: { id: params.leadId, updated: true, metadata: { operation: 'update_lead' } },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Updated lead' },
- },
-}
-
-// Delete Lead
-export const salesforceDeleteLeadTool: ToolConfig = {
- id: 'salesforce_delete_lead',
- name: 'Delete Lead from Salesforce',
- description: 'Delete a lead',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- leadId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Lead ID (required)',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Lead/${params.leadId}`,
- method: 'DELETE',
- headers: (params) => ({ Authorization: `Bearer ${params.accessToken}` }),
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json().catch(() => ({}))
- throw new Error(data[0]?.message || data.message || 'Failed to delete lead')
- }
- return {
- success: true,
- output: { id: params.leadId, deleted: true, metadata: { operation: 'delete_lead' } },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Deleted lead' },
- },
-}
diff --git a/apps/sim/tools/salesforce/list_dashboards.ts b/apps/sim/tools/salesforce/list_dashboards.ts
new file mode 100644
index 0000000000..62a5fc42a1
--- /dev/null
+++ b/apps/sim/tools/salesforce/list_dashboards.ts
@@ -0,0 +1,114 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceDashboards')
+
+export interface SalesforceListDashboardsParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ folderName?: string
+}
+
+export interface SalesforceListDashboardsResponse {
+ success: boolean
+ output: {
+ dashboards: any[]
+ metadata: {
+ operation: 'list_dashboards'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+/**
+ * List all dashboards accessible by the current user
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_getbasic_dashboardlist.htm
+ */
+export const salesforceListDashboardsTool: ToolConfig<
+ SalesforceListDashboardsParams,
+ SalesforceListDashboardsResponse
+> = {
+ id: 'salesforce_list_dashboards',
+ name: 'List Dashboards from Salesforce',
+ description: 'Get a list of dashboards accessible by the current user',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ folderName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Filter by folder name',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/analytics/dashboards`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ 'Failed to list dashboards from Salesforce'
+ )
+ logger.error('Failed to list dashboards', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ let dashboards = data.dashboards || data || []
+
+ // Filter by folder name if provided
+ if (params?.folderName) {
+ dashboards = dashboards.filter((dashboard: any) =>
+ dashboard.folderName?.toLowerCase().includes(params.folderName!.toLowerCase())
+ )
+ }
+
+ return {
+ success: true,
+ output: {
+ dashboards,
+ metadata: {
+ operation: 'list_dashboards',
+ totalReturned: dashboards.length,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Dashboards data',
+ properties: {
+ dashboards: { type: 'array', description: 'Array of dashboard objects' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/list_objects.ts b/apps/sim/tools/salesforce/list_objects.ts
new file mode 100644
index 0000000000..4efedefa6e
--- /dev/null
+++ b/apps/sim/tools/salesforce/list_objects.ts
@@ -0,0 +1,106 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceQuery')
+
+export interface SalesforceListObjectsParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+}
+
+export interface SalesforceListObjectsResponse {
+ success: boolean
+ output: {
+ objects: any[]
+ encoding?: string
+ maxBatchSize?: number
+ metadata: {
+ operation: 'list_objects'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+/**
+ * List all available Salesforce objects
+ * Useful for discovering what objects are available
+ */
+export const salesforceListObjectsTool: ToolConfig<
+ SalesforceListObjectsParams,
+ SalesforceListObjectsResponse
+> = {
+ id: 'salesforce_list_objects',
+ name: 'List Salesforce Objects',
+ description: 'Get a list of all available Salesforce objects',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/sobjects`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ 'Failed to list Salesforce objects'
+ )
+ logger.error('Failed to list objects', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ const objects = data.sobjects || []
+
+ return {
+ success: true,
+ output: {
+ objects,
+ encoding: data.encoding,
+ maxBatchSize: data.maxBatchSize,
+ metadata: {
+ operation: 'list_objects',
+ totalReturned: objects.length,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Objects list',
+ properties: {
+ objects: { type: 'array', description: 'Array of available Salesforce objects' },
+ encoding: { type: 'string', description: 'Encoding used' },
+ maxBatchSize: { type: 'number', description: 'Maximum batch size' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/list_report_types.ts b/apps/sim/tools/salesforce/list_report_types.ts
new file mode 100644
index 0000000000..70f3c09167
--- /dev/null
+++ b/apps/sim/tools/salesforce/list_report_types.ts
@@ -0,0 +1,98 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceReports')
+
+export interface SalesforceListReportTypesParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+}
+
+export interface SalesforceListReportTypesResponse {
+ success: boolean
+ output: {
+ reportTypes: any[]
+ metadata: {
+ operation: 'list_report_types'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Get list of available report types
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_list_reporttypes.htm
+ */
+export const salesforceListReportTypesTool: ToolConfig<
+ SalesforceListReportTypesParams,
+ SalesforceListReportTypesResponse
+> = {
+ id: 'salesforce_list_report_types',
+ name: 'List Report Types from Salesforce',
+ description: 'Get a list of available report types',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/analytics/reportTypes`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ 'Failed to list report types from Salesforce'
+ )
+ logger.error('Failed to list report types', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ return {
+ success: true,
+ output: {
+ reportTypes: data,
+ metadata: {
+ operation: 'list_report_types',
+ totalReturned: Array.isArray(data) ? data.length : 0,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Report types data',
+ properties: {
+ reportTypes: { type: 'array', description: 'Array of report type objects' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/list_reports.ts b/apps/sim/tools/salesforce/list_reports.ts
new file mode 100644
index 0000000000..09550383aa
--- /dev/null
+++ b/apps/sim/tools/salesforce/list_reports.ts
@@ -0,0 +1,130 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceReports')
+
+export interface SalesforceListReportsParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ folderName?: string
+ searchTerm?: string
+}
+
+export interface SalesforceListReportsResponse {
+ success: boolean
+ output: {
+ reports: any[]
+ metadata: {
+ operation: 'list_reports'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+/**
+ * List all reports accessible by the current user
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_get_reportlist.htm
+ */
+export const salesforceListReportsTool: ToolConfig<
+ SalesforceListReportsParams,
+ SalesforceListReportsResponse
+> = {
+ id: 'salesforce_list_reports',
+ name: 'List Reports from Salesforce',
+ description: 'Get a list of reports accessible by the current user',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ folderName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Filter by folder name',
+ },
+ searchTerm: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Search term to filter reports by name',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/analytics/reports`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ 'Failed to list reports from Salesforce'
+ )
+ logger.error('Failed to list reports', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ let reports = data || []
+
+ // Filter by folder name if provided
+ if (params?.folderName) {
+ reports = reports.filter((report: any) =>
+ report.folderName?.toLowerCase().includes(params.folderName!.toLowerCase())
+ )
+ }
+
+ // Filter by search term if provided
+ if (params?.searchTerm) {
+ reports = reports.filter(
+ (report: any) =>
+ report.name?.toLowerCase().includes(params.searchTerm!.toLowerCase()) ||
+ report.description?.toLowerCase().includes(params.searchTerm!.toLowerCase())
+ )
+ }
+
+ return {
+ success: true,
+ output: {
+ reports,
+ metadata: {
+ operation: 'list_reports',
+ totalReturned: reports.length,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Reports data',
+ properties: {
+ reports: { type: 'array', description: 'Array of report objects' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/opportunities.ts b/apps/sim/tools/salesforce/opportunities.ts
deleted file mode 100644
index bf4df7bd42..0000000000
--- a/apps/sim/tools/salesforce/opportunities.ts
+++ /dev/null
@@ -1,355 +0,0 @@
-import { createLogger } from '@/lib/logs/console/logger'
-import type { ToolConfig } from '@/tools/types'
-
-const logger = createLogger('SalesforceOpportunities')
-
-function getInstanceUrl(idToken?: string, instanceUrl?: string): string {
- if (instanceUrl) return instanceUrl
- if (idToken) {
- try {
- const base64Url = idToken.split('.')[1]
- const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
- const jsonPayload = decodeURIComponent(
- atob(base64)
- .split('')
- .map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`)
- .join('')
- )
- const decoded = JSON.parse(jsonPayload)
- if (decoded.profile) {
- const match = decoded.profile.match(/^(https:\/\/[^/]+)/)
- if (match) return match[1]
- } else if (decoded.sub) {
- const match = decoded.sub.match(/^(https:\/\/[^/]+)/)
- if (match && match[1] !== 'https://login.salesforce.com') return match[1]
- }
- } catch (error) {
- logger.error('Failed to decode Salesforce idToken', { error })
- }
- }
- throw new Error('Salesforce instance URL is required but not provided')
-}
-
-// Get Opportunities
-export const salesforceGetOpportunitiesTool: ToolConfig = {
- id: 'salesforce_get_opportunities',
- name: 'Get Opportunities from Salesforce',
- description: 'Get opportunity(ies) from Salesforce',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- opportunityId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Opportunity ID (optional)',
- },
- limit: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Max results (default: 100)',
- },
- fields: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Comma-separated fields',
- },
- orderBy: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Order by field',
- },
- },
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- if (params.opportunityId) {
- const fields = params.fields || 'Id,Name,AccountId,Amount,StageName,CloseDate,Probability'
- return `${instanceUrl}/services/data/v59.0/sobjects/Opportunity/${params.opportunityId}?fields=${fields}`
- }
- const limit = params.limit ? Number.parseInt(params.limit) : 100
- const fields = params.fields || 'Id,Name,AccountId,Amount,StageName,CloseDate,Probability'
- const orderBy = params.orderBy || 'CloseDate DESC'
- const query = `SELECT ${fields} FROM Opportunity ORDER BY ${orderBy} LIMIT ${limit}`
- return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
- },
- method: 'GET',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- },
- transformResponse: async (response, params) => {
- const data = await response.json()
- if (!response.ok)
- throw new Error(data[0]?.message || data.message || 'Failed to fetch opportunities')
- if (params.opportunityId) {
- return {
- success: true,
- output: { opportunity: data, metadata: { operation: 'get_opportunities' }, success: true },
- }
- }
- const opportunities = data.records || []
- return {
- success: true,
- output: {
- opportunities,
- paging: {
- nextRecordsUrl: data.nextRecordsUrl,
- totalSize: data.totalSize || opportunities.length,
- done: data.done !== false,
- },
- metadata: {
- operation: 'get_opportunities',
- totalReturned: opportunities.length,
- hasMore: !data.done,
- },
- success: true,
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Opportunity data' },
- },
-}
-
-// Create Opportunity
-export const salesforceCreateOpportunityTool: ToolConfig = {
- id: 'salesforce_create_opportunity',
- name: 'Create Opportunity in Salesforce',
- description: 'Create a new opportunity',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- name: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Opportunity name (required)',
- },
- stageName: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Stage name (required)',
- },
- closeDate: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Close date YYYY-MM-DD (required)',
- },
- accountId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Account ID',
- },
- amount: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Amount (number)',
- },
- probability: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Probability (0-100)',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Opportunity`,
- method: 'POST',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = {
- Name: params.name,
- StageName: params.stageName,
- CloseDate: params.closeDate,
- }
- if (params.accountId) body.AccountId = params.accountId
- if (params.amount) body.Amount = Number.parseFloat(params.amount)
- if (params.probability) body.Probability = Number.parseInt(params.probability)
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response) => {
- const data = await response.json()
- if (!response.ok)
- throw new Error(data[0]?.message || data.message || 'Failed to create opportunity')
- return {
- success: true,
- output: {
- id: data.id,
- success: data.success,
- created: true,
- metadata: { operation: 'create_opportunity' },
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Created opportunity' },
- },
-}
-
-// Update Opportunity
-export const salesforceUpdateOpportunityTool: ToolConfig = {
- id: 'salesforce_update_opportunity',
- name: 'Update Opportunity in Salesforce',
- description: 'Update an existing opportunity',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- opportunityId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Opportunity ID (required)',
- },
- name: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Opportunity name',
- },
- stageName: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Stage name',
- },
- closeDate: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Close date YYYY-MM-DD',
- },
- accountId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Account ID',
- },
- amount: { type: 'string', required: false, visibility: 'user-only', description: 'Amount' },
- probability: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Probability (0-100)',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Opportunity/${params.opportunityId}`,
- method: 'PATCH',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = {}
- if (params.name) body.Name = params.name
- if (params.stageName) body.StageName = params.stageName
- if (params.closeDate) body.CloseDate = params.closeDate
- if (params.accountId) body.AccountId = params.accountId
- if (params.amount) body.Amount = Number.parseFloat(params.amount)
- if (params.probability) body.Probability = Number.parseInt(params.probability)
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json()
- throw new Error(data[0]?.message || data.message || 'Failed to update opportunity')
- }
- return {
- success: true,
- output: {
- id: params.opportunityId,
- updated: true,
- metadata: { operation: 'update_opportunity' },
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Updated opportunity' },
- },
-}
-
-// Delete Opportunity
-export const salesforceDeleteOpportunityTool: ToolConfig = {
- id: 'salesforce_delete_opportunity',
- name: 'Delete Opportunity from Salesforce',
- description: 'Delete an opportunity',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- opportunityId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Opportunity ID (required)',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Opportunity/${params.opportunityId}`,
- method: 'DELETE',
- headers: (params) => ({ Authorization: `Bearer ${params.accessToken}` }),
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json().catch(() => ({}))
- throw new Error(data[0]?.message || data.message || 'Failed to delete opportunity')
- }
- return {
- success: true,
- output: {
- id: params.opportunityId,
- deleted: true,
- metadata: { operation: 'delete_opportunity' },
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Deleted opportunity' },
- },
-}
diff --git a/apps/sim/tools/salesforce/query.ts b/apps/sim/tools/salesforce/query.ts
new file mode 100644
index 0000000000..29c5a9032b
--- /dev/null
+++ b/apps/sim/tools/salesforce/query.ts
@@ -0,0 +1,124 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceQuery')
+
+export interface SalesforceQueryParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ query: string
+}
+
+export interface SalesforceQueryResponse {
+ success: boolean
+ output: {
+ records: any[]
+ totalSize: number
+ done: boolean
+ nextRecordsUrl?: string
+ query: string
+ metadata: {
+ operation: 'query'
+ totalReturned: number
+ hasMore: boolean
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Execute a custom SOQL query
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_query.htm
+ */
+export const salesforceQueryTool: ToolConfig = {
+ id: 'salesforce_query',
+ name: 'Run SOQL Query in Salesforce',
+ description: 'Execute a custom SOQL query to retrieve data from Salesforce',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ query: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'SOQL query to execute (e.g., SELECT Id, Name FROM Account LIMIT 10)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.query || params.query.trim() === '') {
+ throw new Error(
+ 'SOQL Query is required. Please provide a valid SOQL query (e.g., SELECT Id, Name FROM Account LIMIT 10).'
+ )
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ const encodedQuery = encodeURIComponent(params.query)
+ return `${instanceUrl}/services/data/v59.0/query?q=${encodedQuery}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ 'Failed to execute SOQL query'
+ )
+ logger.error('Failed to execute SOQL query', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ const records = data.records || []
+
+ return {
+ success: true,
+ output: {
+ records,
+ totalSize: data.totalSize || records.length,
+ done: data.done !== false,
+ nextRecordsUrl: data.nextRecordsUrl,
+ query: params?.query || '',
+ metadata: {
+ operation: 'query',
+ totalReturned: records.length,
+ hasMore: !data.done,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Query results',
+ properties: {
+ records: { type: 'array', description: 'Array of record objects' },
+ totalSize: { type: 'number', description: 'Total number of records matching query' },
+ done: { type: 'boolean', description: 'Whether all records have been returned' },
+ nextRecordsUrl: { type: 'string', description: 'URL to fetch next batch of records' },
+ query: { type: 'string', description: 'The executed SOQL query' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/query_more.ts b/apps/sim/tools/salesforce/query_more.ts
new file mode 100644
index 0000000000..bae4b01474
--- /dev/null
+++ b/apps/sim/tools/salesforce/query_more.ts
@@ -0,0 +1,127 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceQuery')
+
+export interface SalesforceQueryMoreParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ nextRecordsUrl: string
+}
+
+export interface SalesforceQueryMoreResponse {
+ success: boolean
+ output: {
+ records: any[]
+ totalSize: number
+ done: boolean
+ nextRecordsUrl?: string
+ metadata: {
+ operation: 'query_more'
+ totalReturned: number
+ hasMore: boolean
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Retrieve additional query results using the nextRecordsUrl
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_query.htm
+ */
+export const salesforceQueryMoreTool: ToolConfig<
+ SalesforceQueryMoreParams,
+ SalesforceQueryMoreResponse
+> = {
+ id: 'salesforce_query_more',
+ name: 'Get More Query Results from Salesforce',
+ description: 'Retrieve additional query results using the nextRecordsUrl from a previous query',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ nextRecordsUrl: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'The nextRecordsUrl from a previous query response',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.nextRecordsUrl || params.nextRecordsUrl.trim() === '') {
+ throw new Error(
+ 'Next Records URL is required. This should be the nextRecordsUrl value from a previous query response.'
+ )
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ // nextRecordsUrl is typically a relative path like /services/data/v59.0/query/01g...
+ const nextUrl = params.nextRecordsUrl.startsWith('/')
+ ? params.nextRecordsUrl
+ : `/${params.nextRecordsUrl}`
+ return `${instanceUrl}${nextUrl}`
+ },
+ method: 'GET',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ },
+
+ transformResponse: async (response) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ 'Failed to get more query results'
+ )
+ logger.error('Failed to get more query results', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ const records = data.records || []
+
+ return {
+ success: true,
+ output: {
+ records,
+ totalSize: data.totalSize || records.length,
+ done: data.done !== false,
+ nextRecordsUrl: data.nextRecordsUrl,
+ metadata: {
+ operation: 'query_more',
+ totalReturned: records.length,
+ hasMore: !data.done,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Query results',
+ properties: {
+ records: { type: 'array', description: 'Array of record objects' },
+ totalSize: { type: 'number', description: 'Total number of records matching query' },
+ done: { type: 'boolean', description: 'Whether all records have been returned' },
+ nextRecordsUrl: { type: 'string', description: 'URL to fetch next batch of records' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/refresh_dashboard.ts b/apps/sim/tools/salesforce/refresh_dashboard.ts
new file mode 100644
index 0000000000..6fb355cafd
--- /dev/null
+++ b/apps/sim/tools/salesforce/refresh_dashboard.ts
@@ -0,0 +1,120 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceDashboards')
+
+export interface SalesforceRefreshDashboardParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ dashboardId: string
+}
+
+export interface SalesforceRefreshDashboardResponse {
+ success: boolean
+ output: {
+ dashboard: any
+ dashboardId: string
+ components: any[]
+ status?: any
+ metadata: {
+ operation: 'refresh_dashboard'
+ dashboardName?: string
+ refreshDate?: string
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Refresh a dashboard to get latest data
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_refresh_dashboard.htm
+ */
+export const salesforceRefreshDashboardTool: ToolConfig<
+ SalesforceRefreshDashboardParams,
+ SalesforceRefreshDashboardResponse
+> = {
+ id: 'salesforce_refresh_dashboard',
+ name: 'Refresh Dashboard in Salesforce',
+ description: 'Refresh a dashboard to get the latest data',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ dashboardId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Dashboard ID (required)',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.dashboardId || params.dashboardId.trim() === '') {
+ throw new Error('Dashboard ID is required. Please provide a valid Salesforce Dashboard ID.')
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/analytics/dashboards/${params.dashboardId}`
+ },
+ method: 'PUT',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: () => ({}),
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ `Failed to refresh dashboard ID: ${params?.dashboardId}`
+ )
+ logger.error('Failed to refresh dashboard', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ return {
+ success: true,
+ output: {
+ dashboard: data,
+ dashboardId: params?.dashboardId || '',
+ components: data.componentData || [],
+ status: data.status,
+ metadata: {
+ operation: 'refresh_dashboard',
+ dashboardName: data.name,
+ refreshDate: data.refreshDate,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Refreshed dashboard data',
+ properties: {
+ dashboard: { type: 'object', description: 'Dashboard details' },
+ dashboardId: { type: 'string', description: 'Dashboard ID' },
+ components: { type: 'array', description: 'Dashboard component data' },
+ status: { type: 'object', description: 'Dashboard status' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/run_report.ts b/apps/sim/tools/salesforce/run_report.ts
new file mode 100644
index 0000000000..cca98d1ed3
--- /dev/null
+++ b/apps/sim/tools/salesforce/run_report.ts
@@ -0,0 +1,162 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { extractErrorMessage, getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceReports')
+
+export interface SalesforceRunReportParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ reportId: string
+ includeDetails?: string
+ filters?: string
+}
+
+export interface SalesforceRunReportResponse {
+ success: boolean
+ output: {
+ reportId: string
+ reportMetadata?: any
+ reportExtendedMetadata?: any
+ factMap?: any
+ groupingsDown?: any
+ groupingsAcross?: any
+ hasDetailRows?: boolean
+ allData?: boolean
+ metadata: {
+ operation: 'run_report'
+ reportName?: string
+ reportFormat?: string
+ }
+ success: boolean
+ }
+}
+
+/**
+ * Run a report and return the results
+ * @see https://developer.salesforce.com/docs/atlas.en-us.api_analytics.meta/api_analytics/sforce_analytics_rest_api_get_reportdata.htm
+ */
+export const salesforceRunReportTool: ToolConfig<
+ SalesforceRunReportParams,
+ SalesforceRunReportResponse
+> = {
+ id: 'salesforce_run_report',
+ name: 'Run Report in Salesforce',
+ description: 'Execute a report and retrieve the results',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ reportId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Report ID (required)',
+ },
+ includeDetails: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Include detail rows (true/false, default: true)',
+ },
+ filters: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'JSON string of report filters to apply',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ if (!params.reportId || params.reportId.trim() === '') {
+ throw new Error('Report ID is required. Please provide a valid Salesforce Report ID.')
+ }
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ const includeDetails = params.includeDetails !== 'false'
+ return `${instanceUrl}/services/data/v59.0/analytics/reports/${params.reportId}?includeDetails=${includeDetails}`
+ },
+ // Use GET for simple report runs, POST only when filters are provided
+ method: (params) => (params.filters ? 'POST' : 'GET'),
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ // Only send a body when filters are provided (POST request)
+ if (params.filters) {
+ try {
+ const filters = JSON.parse(params.filters)
+ return { reportMetadata: { reportFilters: filters } }
+ } catch (e) {
+ throw new Error(
+ `Invalid report filters JSON: ${e instanceof Error ? e.message : 'Parse error'}. Please provide a valid JSON array of filter objects.`
+ )
+ }
+ }
+ // Return undefined for GET requests (no body)
+ return undefined as any
+ },
+ },
+
+ transformResponse: async (response, params?) => {
+ const data = await response.json()
+ if (!response.ok) {
+ const errorMessage = extractErrorMessage(
+ data,
+ response.status,
+ `Failed to run report ID: ${params?.reportId}`
+ )
+ logger.error('Failed to run report', { data, status: response.status })
+ throw new Error(errorMessage)
+ }
+
+ return {
+ success: true,
+ output: {
+ reportId: params?.reportId || '',
+ reportMetadata: data.reportMetadata,
+ reportExtendedMetadata: data.reportExtendedMetadata,
+ factMap: data.factMap,
+ groupingsDown: data.groupingsDown,
+ groupingsAcross: data.groupingsAcross,
+ hasDetailRows: data.hasDetailRows,
+ allData: data.allData,
+ metadata: {
+ operation: 'run_report',
+ reportName: data.reportMetadata?.name,
+ reportFormat: data.reportMetadata?.reportFormat,
+ },
+ success: true,
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success status' },
+ output: {
+ type: 'object',
+ description: 'Report results',
+ properties: {
+ reportId: { type: 'string', description: 'Report ID' },
+ reportMetadata: { type: 'object', description: 'Report metadata' },
+ reportExtendedMetadata: { type: 'object', description: 'Extended metadata' },
+ factMap: { type: 'object', description: 'Report data organized by groupings' },
+ groupingsDown: { type: 'object', description: 'Row groupings' },
+ groupingsAcross: { type: 'object', description: 'Column groupings' },
+ hasDetailRows: { type: 'boolean', description: 'Whether report has detail rows' },
+ allData: { type: 'boolean', description: 'Whether all data is returned' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ success: { type: 'boolean', description: 'Operation success status' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/tasks.ts b/apps/sim/tools/salesforce/tasks.ts
deleted file mode 100644
index 3f3d9cedc8..0000000000
--- a/apps/sim/tools/salesforce/tasks.ts
+++ /dev/null
@@ -1,321 +0,0 @@
-import { createLogger } from '@/lib/logs/console/logger'
-import type { ToolConfig } from '@/tools/types'
-
-const logger = createLogger('SalesforceTasks')
-
-function getInstanceUrl(idToken?: string, instanceUrl?: string): string {
- if (instanceUrl) return instanceUrl
- if (idToken) {
- try {
- const base64Url = idToken.split('.')[1]
- const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
- const jsonPayload = decodeURIComponent(
- atob(base64)
- .split('')
- .map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`)
- .join('')
- )
- const decoded = JSON.parse(jsonPayload)
- if (decoded.profile) {
- const match = decoded.profile.match(/^(https:\/\/[^/]+)/)
- if (match) return match[1]
- } else if (decoded.sub) {
- const match = decoded.sub.match(/^(https:\/\/[^/]+)/)
- if (match && match[1] !== 'https://login.salesforce.com') return match[1]
- }
- } catch (error) {
- logger.error('Failed to decode Salesforce idToken', { error })
- }
- }
- throw new Error('Salesforce instance URL is required but not provided')
-}
-
-// Get Tasks
-export const salesforceGetTasksTool: ToolConfig = {
- id: 'salesforce_get_tasks',
- name: 'Get Tasks from Salesforce',
- description: 'Get task(s) from Salesforce',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- taskId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Task ID (optional)',
- },
- limit: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Max results (default: 100)',
- },
- fields: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Comma-separated fields',
- },
- orderBy: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Order by field',
- },
- },
- request: {
- url: (params) => {
- const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
- if (params.taskId) {
- const fields =
- params.fields || 'Id,Subject,Status,Priority,ActivityDate,WhoId,WhatId,OwnerId'
- return `${instanceUrl}/services/data/v59.0/sobjects/Task/${params.taskId}?fields=${fields}`
- }
- const limit = params.limit ? Number.parseInt(params.limit) : 100
- const fields = params.fields || 'Id,Subject,Status,Priority,ActivityDate,WhoId,WhatId,OwnerId'
- const orderBy = params.orderBy || 'ActivityDate DESC'
- const query = `SELECT ${fields} FROM Task ORDER BY ${orderBy} LIMIT ${limit}`
- return `${instanceUrl}/services/data/v59.0/query?q=${encodeURIComponent(query)}`
- },
- method: 'GET',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- },
- transformResponse: async (response, params) => {
- const data = await response.json()
- if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to fetch tasks')
- if (params.taskId) {
- return {
- success: true,
- output: { task: data, metadata: { operation: 'get_tasks' }, success: true },
- }
- }
- const tasks = data.records || []
- return {
- success: true,
- output: {
- tasks,
- paging: {
- nextRecordsUrl: data.nextRecordsUrl,
- totalSize: data.totalSize || tasks.length,
- done: data.done !== false,
- },
- metadata: { operation: 'get_tasks', totalReturned: tasks.length, hasMore: !data.done },
- success: true,
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Task data' },
- },
-}
-
-// Create Task
-export const salesforceCreateTaskTool: ToolConfig = {
- id: 'salesforce_create_task',
- name: 'Create Task in Salesforce',
- description: 'Create a new task',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- subject: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Task subject (required)',
- },
- status: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Status (e.g., Not Started, In Progress, Completed)',
- },
- priority: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Priority (e.g., Low, Normal, High)',
- },
- activityDate: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Due date YYYY-MM-DD',
- },
- whoId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Related Contact/Lead ID',
- },
- whatId: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Related Account/Opportunity ID',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Task`,
- method: 'POST',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = { Subject: params.subject }
- if (params.status) body.Status = params.status
- if (params.priority) body.Priority = params.priority
- if (params.activityDate) body.ActivityDate = params.activityDate
- if (params.whoId) body.WhoId = params.whoId
- if (params.whatId) body.WhatId = params.whatId
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response) => {
- const data = await response.json()
- if (!response.ok) throw new Error(data[0]?.message || data.message || 'Failed to create task')
- return {
- success: true,
- output: {
- id: data.id,
- success: data.success,
- created: true,
- metadata: { operation: 'create_task' },
- },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Created task' },
- },
-}
-
-// Update Task
-export const salesforceUpdateTaskTool: ToolConfig = {
- id: 'salesforce_update_task',
- name: 'Update Task in Salesforce',
- description: 'Update an existing task',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- taskId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Task ID (required)',
- },
- subject: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Task subject',
- },
- status: { type: 'string', required: false, visibility: 'user-only', description: 'Status' },
- priority: { type: 'string', required: false, visibility: 'user-only', description: 'Priority' },
- activityDate: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Due date YYYY-MM-DD',
- },
- description: {
- type: 'string',
- required: false,
- visibility: 'user-only',
- description: 'Description',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Task/${params.taskId}`,
- method: 'PATCH',
- headers: (params) => ({
- Authorization: `Bearer ${params.accessToken}`,
- 'Content-Type': 'application/json',
- }),
- body: (params) => {
- const body: Record = {}
- if (params.subject) body.Subject = params.subject
- if (params.status) body.Status = params.status
- if (params.priority) body.Priority = params.priority
- if (params.activityDate) body.ActivityDate = params.activityDate
- if (params.description) body.Description = params.description
- return body
- },
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json()
- throw new Error(data[0]?.message || data.message || 'Failed to update task')
- }
- return {
- success: true,
- output: { id: params.taskId, updated: true, metadata: { operation: 'update_task' } },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Updated task' },
- },
-}
-
-// Delete Task
-export const salesforceDeleteTaskTool: ToolConfig = {
- id: 'salesforce_delete_task',
- name: 'Delete Task from Salesforce',
- description: 'Delete a task',
- version: '1.0.0',
- oauth: { required: true, provider: 'salesforce' },
- params: {
- accessToken: { type: 'string', required: true, visibility: 'hidden' },
- idToken: { type: 'string', required: false, visibility: 'hidden' },
- instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
- taskId: {
- type: 'string',
- required: true,
- visibility: 'user-only',
- description: 'Task ID (required)',
- },
- },
- request: {
- url: (params) =>
- `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Task/${params.taskId}`,
- method: 'DELETE',
- headers: (params) => ({ Authorization: `Bearer ${params.accessToken}` }),
- },
- transformResponse: async (response, params) => {
- if (!response.ok) {
- const data = await response.json().catch(() => ({}))
- throw new Error(data[0]?.message || data.message || 'Failed to delete task')
- }
- return {
- success: true,
- output: { id: params.taskId, deleted: true, metadata: { operation: 'delete_task' } },
- }
- },
- outputs: {
- success: { type: 'boolean', description: 'Success' },
- output: { type: 'object', description: 'Deleted task' },
- },
-}
diff --git a/apps/sim/tools/salesforce/types.ts b/apps/sim/tools/salesforce/types.ts
index 6f195e7040..17cb41c04c 100644
--- a/apps/sim/tools/salesforce/types.ts
+++ b/apps/sim/tools/salesforce/types.ts
@@ -137,6 +137,178 @@ export interface SalesforceDeleteContactResponse {
}
}
+// Report types
+export interface SalesforceListReportsResponse {
+ success: boolean
+ output: {
+ reports: any[]
+ metadata: {
+ operation: 'list_reports'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceGetReportResponse {
+ success: boolean
+ output: {
+ report: any
+ reportId: string
+ metadata: {
+ operation: 'get_report'
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceRunReportResponse {
+ success: boolean
+ output: {
+ reportId: string
+ reportMetadata: any
+ reportExtendedMetadata: any
+ factMap: any
+ groupingsDown: any
+ groupingsAcross: any
+ hasDetailRows: boolean
+ allData: boolean
+ metadata: {
+ operation: 'run_report'
+ reportName: string
+ reportFormat: string
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceListReportTypesResponse {
+ success: boolean
+ output: {
+ reportTypes: any[]
+ metadata: {
+ operation: 'list_report_types'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+// Dashboard types
+export interface SalesforceListDashboardsResponse {
+ success: boolean
+ output: {
+ dashboards: any[]
+ metadata: {
+ operation: 'list_dashboards'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceGetDashboardResponse {
+ success: boolean
+ output: {
+ dashboard: any
+ dashboardId: string
+ components: any[]
+ metadata: {
+ operation: 'get_dashboard'
+ dashboardName: string
+ folderId: string
+ runningUser: any
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceRefreshDashboardResponse {
+ success: boolean
+ output: {
+ dashboard: any
+ dashboardId: string
+ components: any[]
+ status: any
+ metadata: {
+ operation: 'refresh_dashboard'
+ dashboardName: string
+ refreshDate: string
+ }
+ success: boolean
+ }
+}
+
+// Query types
+export interface SalesforceQueryResponse {
+ success: boolean
+ output: {
+ records: any[]
+ totalSize: number
+ done: boolean
+ nextRecordsUrl?: string
+ query: string
+ metadata: {
+ operation: 'query'
+ totalReturned: number
+ hasMore: boolean
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceQueryMoreResponse {
+ success: boolean
+ output: {
+ records: any[]
+ totalSize: number
+ done: boolean
+ nextRecordsUrl?: string
+ metadata: {
+ operation: 'query_more'
+ totalReturned: number
+ hasMore: boolean
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceDescribeObjectResponse {
+ success: boolean
+ output: {
+ objectName: string
+ label: string
+ labelPlural: string
+ fields: any[]
+ keyPrefix: string
+ queryable: boolean
+ createable: boolean
+ updateable: boolean
+ deletable: boolean
+ childRelationships: any[]
+ recordTypeInfos: any[]
+ metadata: {
+ operation: 'describe_object'
+ fieldCount: number
+ }
+ success: boolean
+ }
+}
+
+export interface SalesforceListObjectsResponse {
+ success: boolean
+ output: {
+ objects: any[]
+ encoding: string
+ maxBatchSize: number
+ metadata: {
+ operation: 'list_objects'
+ totalReturned: number
+ }
+ success: boolean
+ }
+}
+
// Generic Salesforce response type for the block
export type SalesforceResponse =
| SalesforceGetAccountsResponse
@@ -147,4 +319,15 @@ export type SalesforceResponse =
| SalesforceCreateContactResponse
| SalesforceUpdateContactResponse
| SalesforceDeleteContactResponse
+ | SalesforceListReportsResponse
+ | SalesforceGetReportResponse
+ | SalesforceRunReportResponse
+ | SalesforceListReportTypesResponse
+ | SalesforceListDashboardsResponse
+ | SalesforceGetDashboardResponse
+ | SalesforceRefreshDashboardResponse
+ | SalesforceQueryResponse
+ | SalesforceQueryMoreResponse
+ | SalesforceDescribeObjectResponse
+ | SalesforceListObjectsResponse
| { success: boolean; output: any } // Generic for leads, opportunities, cases, tasks
diff --git a/apps/sim/tools/salesforce/update_case.ts b/apps/sim/tools/salesforce/update_case.ts
new file mode 100644
index 0000000000..67f5bdf6cb
--- /dev/null
+++ b/apps/sim/tools/salesforce/update_case.ts
@@ -0,0 +1,125 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceUpdateCaseParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ caseId: string
+ subject?: string
+ status?: string
+ priority?: string
+ description?: string
+}
+
+export interface SalesforceUpdateCaseResponse {
+ success: boolean
+ output: {
+ id: string
+ updated: boolean
+ metadata: {
+ operation: 'update_case'
+ }
+ }
+}
+
+export const salesforceUpdateCaseTool: ToolConfig<
+ SalesforceUpdateCaseParams,
+ SalesforceUpdateCaseResponse
+> = {
+ id: 'salesforce_update_case',
+ name: 'Update Case in Salesforce',
+ description: 'Update an existing case',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ caseId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Case ID (required)',
+ },
+ subject: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Case subject',
+ },
+ status: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Status',
+ },
+ priority: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Priority',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Case/${params.caseId}`,
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {}
+ if (params.subject) body.Subject = params.subject
+ if (params.status) body.Status = params.status
+ if (params.priority) body.Priority = params.priority
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json()
+ throw new Error(data[0]?.message || data.message || 'Failed to update case')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.caseId || '',
+ updated: true,
+ metadata: { operation: 'update_case' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Updated case' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/update_contact.ts b/apps/sim/tools/salesforce/update_contact.ts
new file mode 100644
index 0000000000..6d64c705fc
--- /dev/null
+++ b/apps/sim/tools/salesforce/update_contact.ts
@@ -0,0 +1,192 @@
+import { createLogger } from '@/lib/logs/console/logger'
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+const logger = createLogger('SalesforceContacts')
+
+export interface SalesforceUpdateContactParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ contactId: string
+ lastName?: string
+ firstName?: string
+ email?: string
+ phone?: string
+ accountId?: string
+ title?: string
+ department?: string
+ mailingStreet?: string
+ mailingCity?: string
+ mailingState?: string
+ mailingPostalCode?: string
+ mailingCountry?: string
+ description?: string
+}
+
+export interface SalesforceUpdateContactResponse {
+ success: boolean
+ output: {
+ id: string
+ updated: boolean
+ metadata: { operation: 'update_contact' }
+ }
+}
+
+export const salesforceUpdateContactTool: ToolConfig<
+ SalesforceUpdateContactParams,
+ SalesforceUpdateContactResponse
+> = {
+ id: 'salesforce_update_contact',
+ name: 'Update Contact in Salesforce',
+ description: 'Update an existing contact in Salesforce CRM',
+ version: '1.0.0',
+
+ oauth: { required: true, provider: 'salesforce' },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ contactId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Contact ID to update (required)',
+ },
+ lastName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Last name',
+ },
+ firstName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'First name',
+ },
+ email: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Email address',
+ },
+ phone: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Phone number',
+ },
+ accountId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Account ID to associate with',
+ },
+ title: { type: 'string', required: false, visibility: 'user-only', description: 'Job title' },
+ department: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Department',
+ },
+ mailingStreet: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing street',
+ },
+ mailingCity: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing city',
+ },
+ mailingState: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing state',
+ },
+ mailingPostalCode: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing postal code',
+ },
+ mailingCountry: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Mailing country',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) => {
+ const instanceUrl = getInstanceUrl(params.idToken, params.instanceUrl)
+ return `${instanceUrl}/services/data/v59.0/sobjects/Contact/${params.contactId}`
+ },
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {}
+
+ if (params.lastName) body.LastName = params.lastName
+ if (params.firstName) body.FirstName = params.firstName
+ if (params.email) body.Email = params.email
+ if (params.phone) body.Phone = params.phone
+ if (params.accountId) body.AccountId = params.accountId
+ if (params.title) body.Title = params.title
+ if (params.department) body.Department = params.department
+ if (params.mailingStreet) body.MailingStreet = params.mailingStreet
+ if (params.mailingCity) body.MailingCity = params.mailingCity
+ if (params.mailingState) body.MailingState = params.mailingState
+ if (params.mailingPostalCode) body.MailingPostalCode = params.mailingPostalCode
+ if (params.mailingCountry) body.MailingCountry = params.mailingCountry
+ if (params.description) body.Description = params.description
+
+ return body
+ },
+ },
+
+ transformResponse: async (response: Response, params?) => {
+ if (!response.ok) {
+ const data = await response.json()
+ logger.error('Salesforce API request failed', { data, status: response.status })
+ throw new Error(data[0]?.message || data.message || 'Failed to update contact in Salesforce')
+ }
+
+ return {
+ success: true,
+ output: {
+ id: params?.contactId || '',
+ updated: true,
+ metadata: { operation: 'update_contact' as const },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Operation success status' },
+ output: {
+ type: 'object',
+ description: 'Updated contact data',
+ properties: {
+ id: { type: 'string', description: 'Updated contact ID' },
+ updated: { type: 'boolean', description: 'Whether contact was updated' },
+ metadata: { type: 'object', description: 'Operation metadata' },
+ },
+ },
+ },
+}
diff --git a/apps/sim/tools/salesforce/update_lead.ts b/apps/sim/tools/salesforce/update_lead.ts
new file mode 100644
index 0000000000..612189a7b5
--- /dev/null
+++ b/apps/sim/tools/salesforce/update_lead.ts
@@ -0,0 +1,133 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceUpdateLeadParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ leadId: string
+ lastName?: string
+ company?: string
+ firstName?: string
+ email?: string
+ phone?: string
+ status?: string
+ leadSource?: string
+ title?: string
+ description?: string
+}
+
+export interface SalesforceUpdateLeadResponse {
+ success: boolean
+ output: {
+ id: string
+ updated: boolean
+ metadata: {
+ operation: 'update_lead'
+ }
+ }
+}
+
+export const salesforceUpdateLeadTool: ToolConfig<
+ SalesforceUpdateLeadParams,
+ SalesforceUpdateLeadResponse
+> = {
+ id: 'salesforce_update_lead',
+ name: 'Update Lead in Salesforce',
+ description: 'Update an existing lead',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ leadId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Lead ID (required)',
+ },
+ lastName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Last name',
+ },
+ company: { type: 'string', required: false, visibility: 'user-only', description: 'Company' },
+ firstName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'First name',
+ },
+ email: { type: 'string', required: false, visibility: 'user-only', description: 'Email' },
+ phone: { type: 'string', required: false, visibility: 'user-only', description: 'Phone' },
+ status: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Lead status',
+ },
+ leadSource: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Lead source',
+ },
+ title: { type: 'string', required: false, visibility: 'user-only', description: 'Title' },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Lead/${params.leadId}`,
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {}
+ if (params.lastName) body.LastName = params.lastName
+ if (params.company) body.Company = params.company
+ if (params.firstName) body.FirstName = params.firstName
+ if (params.email) body.Email = params.email
+ if (params.phone) body.Phone = params.phone
+ if (params.status) body.Status = params.status
+ if (params.leadSource) body.LeadSource = params.leadSource
+ if (params.title) body.Title = params.title
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json()
+ throw new Error(data[0]?.message || data.message || 'Failed to update lead')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.leadId || '',
+ updated: true,
+ metadata: { operation: 'update_lead' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Updated lead' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/update_opportunity.ts b/apps/sim/tools/salesforce/update_opportunity.ts
new file mode 100644
index 0000000000..70b2dce0d2
--- /dev/null
+++ b/apps/sim/tools/salesforce/update_opportunity.ts
@@ -0,0 +1,132 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceUpdateOpportunityParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ opportunityId: string
+ name?: string
+ stageName?: string
+ closeDate?: string
+ accountId?: string
+ amount?: string
+ probability?: string
+ description?: string
+}
+
+export interface SalesforceUpdateOpportunityResponse {
+ success: boolean
+ output: {
+ id: string
+ updated: boolean
+ metadata: {
+ operation: 'update_opportunity'
+ }
+ }
+}
+
+export const salesforceUpdateOpportunityTool: ToolConfig<
+ SalesforceUpdateOpportunityParams,
+ SalesforceUpdateOpportunityResponse
+> = {
+ id: 'salesforce_update_opportunity',
+ name: 'Update Opportunity in Salesforce',
+ description: 'Update an existing opportunity',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: { type: 'string', required: true, visibility: 'hidden' },
+ idToken: { type: 'string', required: false, visibility: 'hidden' },
+ instanceUrl: { type: 'string', required: false, visibility: 'hidden' },
+ opportunityId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Opportunity ID (required)',
+ },
+ name: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Opportunity name',
+ },
+ stageName: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Stage name',
+ },
+ closeDate: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Close date YYYY-MM-DD',
+ },
+ accountId: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Account ID',
+ },
+ amount: { type: 'string', required: false, visibility: 'user-only', description: 'Amount' },
+ probability: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Probability (0-100)',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Opportunity/${params.opportunityId}`,
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {}
+ if (params.name) body.Name = params.name
+ if (params.stageName) body.StageName = params.stageName
+ if (params.closeDate) body.CloseDate = params.closeDate
+ if (params.accountId) body.AccountId = params.accountId
+ if (params.amount) body.Amount = Number.parseFloat(params.amount)
+ if (params.probability) body.Probability = Number.parseInt(params.probability)
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json()
+ throw new Error(data[0]?.message || data.message || 'Failed to update opportunity')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.opportunityId || '',
+ updated: true,
+ metadata: { operation: 'update_opportunity' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Updated opportunity' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/update_task.ts b/apps/sim/tools/salesforce/update_task.ts
new file mode 100644
index 0000000000..0dd62f824a
--- /dev/null
+++ b/apps/sim/tools/salesforce/update_task.ts
@@ -0,0 +1,133 @@
+import type { ToolConfig } from '@/tools/types'
+import { getInstanceUrl } from './utils'
+
+export interface SalesforceUpdateTaskParams {
+ accessToken: string
+ idToken?: string
+ instanceUrl?: string
+ taskId: string
+ subject?: string
+ status?: string
+ priority?: string
+ activityDate?: string
+ description?: string
+}
+
+export interface SalesforceUpdateTaskResponse {
+ success: boolean
+ output: {
+ id: string
+ updated: boolean
+ metadata: {
+ operation: 'update_task'
+ }
+ }
+}
+
+export const salesforceUpdateTaskTool: ToolConfig<
+ SalesforceUpdateTaskParams,
+ SalesforceUpdateTaskResponse
+> = {
+ id: 'salesforce_update_task',
+ name: 'Update Task in Salesforce',
+ description: 'Update an existing task',
+ version: '1.0.0',
+
+ oauth: {
+ required: true,
+ provider: 'salesforce',
+ },
+
+ params: {
+ accessToken: {
+ type: 'string',
+ required: true,
+ visibility: 'hidden',
+ },
+ idToken: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ instanceUrl: {
+ type: 'string',
+ required: false,
+ visibility: 'hidden',
+ },
+ taskId: {
+ type: 'string',
+ required: true,
+ visibility: 'user-only',
+ description: 'Task ID (required)',
+ },
+ subject: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Task subject',
+ },
+ status: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Status',
+ },
+ priority: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Priority',
+ },
+ activityDate: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Due date YYYY-MM-DD',
+ },
+ description: {
+ type: 'string',
+ required: false,
+ visibility: 'user-only',
+ description: 'Description',
+ },
+ },
+
+ request: {
+ url: (params) =>
+ `${getInstanceUrl(params.idToken, params.instanceUrl)}/services/data/v59.0/sobjects/Task/${params.taskId}`,
+ method: 'PATCH',
+ headers: (params) => ({
+ Authorization: `Bearer ${params.accessToken}`,
+ 'Content-Type': 'application/json',
+ }),
+ body: (params) => {
+ const body: Record = {}
+ if (params.subject) body.Subject = params.subject
+ if (params.status) body.Status = params.status
+ if (params.priority) body.Priority = params.priority
+ if (params.activityDate) body.ActivityDate = params.activityDate
+ if (params.description) body.Description = params.description
+ return body
+ },
+ },
+
+ transformResponse: async (response, params?) => {
+ if (!response.ok) {
+ const data = await response.json()
+ throw new Error(data[0]?.message || data.message || 'Failed to update task')
+ }
+ return {
+ success: true,
+ output: {
+ id: params?.taskId || '',
+ updated: true,
+ metadata: { operation: 'update_task' },
+ },
+ }
+ },
+
+ outputs: {
+ success: { type: 'boolean', description: 'Success' },
+ output: { type: 'object', description: 'Updated task' },
+ },
+}
diff --git a/apps/sim/tools/salesforce/utils.ts b/apps/sim/tools/salesforce/utils.ts
new file mode 100644
index 0000000000..74dbaeba30
--- /dev/null
+++ b/apps/sim/tools/salesforce/utils.ts
@@ -0,0 +1,70 @@
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('SalesforceUtils')
+
+/**
+ * Extracts Salesforce instance URL from ID token or uses provided instance URL
+ * @param idToken - The Salesforce ID token containing instance URL
+ * @param instanceUrl - Direct instance URL if provided
+ * @returns The Salesforce instance URL
+ * @throws Error if instance URL cannot be determined
+ */
+export function getInstanceUrl(idToken?: string, instanceUrl?: string): string {
+ if (instanceUrl) return instanceUrl
+ if (idToken) {
+ try {
+ const base64Url = idToken.split('.')[1]
+ const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
+ const jsonPayload = decodeURIComponent(
+ atob(base64)
+ .split('')
+ .map((c) => `%${(`00${c.charCodeAt(0).toString(16)}`).slice(-2)}`)
+ .join('')
+ )
+ const decoded = JSON.parse(jsonPayload)
+ if (decoded.profile) {
+ const match = decoded.profile.match(/^(https:\/\/[^/]+)/)
+ if (match) return match[1]
+ } else if (decoded.sub) {
+ const match = decoded.sub.match(/^(https:\/\/[^/]+)/)
+ if (match && match[1] !== 'https://login.salesforce.com') return match[1]
+ }
+ } catch (error) {
+ logger.error('Failed to decode Salesforce idToken', { error })
+ }
+ }
+ throw new Error('Salesforce instance URL is required but not provided')
+}
+
+/**
+ * Extracts a descriptive error message from Salesforce API responses
+ * @param data - The response data from Salesforce API
+ * @param status - HTTP status code
+ * @param defaultMessage - Default message to use if no specific error found
+ * @returns Formatted error message
+ */
+export function extractErrorMessage(data: any, status: number, defaultMessage: string): string {
+ if (Array.isArray(data) && data[0]?.message) {
+ return `Salesforce API Error (${status}): ${data[0].message}${data[0].errorCode ? ` [${data[0].errorCode}]` : ''}`
+ }
+ if (data?.message) {
+ return `Salesforce API Error (${status}): ${data.message}`
+ }
+ if (data?.error) {
+ return `Salesforce API Error (${status}): ${data.error}${data.error_description ? ` - ${data.error_description}` : ''}`
+ }
+ switch (status) {
+ case 400:
+ return `Salesforce API Error (400): Bad Request - The request was malformed or missing required parameters`
+ case 401:
+ return `Salesforce API Error (401): Unauthorized - Invalid or expired access token. Please re-authenticate.`
+ case 403:
+ return `Salesforce API Error (403): Forbidden - You do not have permission to access this resource.`
+ case 404:
+ return `Salesforce API Error (404): Not Found - The requested resource does not exist or you do not have access to it.`
+ case 500:
+ return `Salesforce API Error (500): Internal Server Error - An error occurred on Salesforce's servers.`
+ default:
+ return `${defaultMessage} (HTTP ${status})`
+ }
+}
diff --git a/apps/sim/tools/serper/index.ts b/apps/sim/tools/serper/index.ts
index e8a3473076..d6b405b2a9 100644
--- a/apps/sim/tools/serper/index.ts
+++ b/apps/sim/tools/serper/index.ts
@@ -1,3 +1,3 @@
-import { searchTool } from '@/tools/serper/search'
+import { searchTool } from './search'
-export { searchTool }
+export const serperSearchTool = searchTool
diff --git a/apps/sim/tools/ssh/index.ts b/apps/sim/tools/ssh/index.ts
index be79a5e0ed..4c33182f87 100644
--- a/apps/sim/tools/ssh/index.ts
+++ b/apps/sim/tools/ssh/index.ts
@@ -1,14 +1,27 @@
-export { checkCommandExistsTool } from './check_command_exists'
-export { checkFileExistsTool } from './check_file_exists'
-export { createDirectoryTool } from './create_directory'
-export { deleteFileTool } from './delete_file'
-export { downloadFileTool } from './download_file'
-export { executeCommandTool } from './execute_command'
-export { executeScriptTool } from './execute_script'
-export { getSystemInfoTool } from './get_system_info'
-export { listDirectoryTool } from './list_directory'
-export { moveRenameTool } from './move_rename'
-export { readFileContentTool } from './read_file_content'
-export * from './types'
-export { uploadFileTool } from './upload_file'
-export { writeFileContentTool } from './write_file_content'
+import { checkCommandExistsTool } from './check_command_exists'
+import { checkFileExistsTool } from './check_file_exists'
+import { createDirectoryTool } from './create_directory'
+import { deleteFileTool } from './delete_file'
+import { downloadFileTool } from './download_file'
+import { executeCommandTool } from './execute_command'
+import { executeScriptTool } from './execute_script'
+import { getSystemInfoTool } from './get_system_info'
+import { listDirectoryTool } from './list_directory'
+import { moveRenameTool } from './move_rename'
+import { readFileContentTool } from './read_file_content'
+import { uploadFileTool } from './upload_file'
+import { writeFileContentTool } from './write_file_content'
+
+export const sshCheckCommandExistsTool = checkCommandExistsTool
+export const sshCheckFileExistsTool = checkFileExistsTool
+export const sshCreateDirectoryTool = createDirectoryTool
+export const sshDeleteFileTool = deleteFileTool
+export const sshDownloadFileTool = downloadFileTool
+export const sshExecuteCommandTool = executeCommandTool
+export const sshExecuteScriptTool = executeScriptTool
+export const sshGetSystemInfoTool = getSystemInfoTool
+export const sshListDirectoryTool = listDirectoryTool
+export const sshMoveRenameTool = moveRenameTool
+export const sshReadFileContentTool = readFileContentTool
+export const sshUploadFileTool = uploadFileTool
+export const sshWriteFileContentTool = writeFileContentTool
diff --git a/apps/sim/triggers/consts.ts b/apps/sim/triggers/constants.ts
similarity index 100%
rename from apps/sim/triggers/consts.ts
rename to apps/sim/triggers/constants.ts
diff --git a/apps/sim/vitest.config.ts b/apps/sim/vitest.config.ts
index 8c8a210915..145943a2b7 100644
--- a/apps/sim/vitest.config.ts
+++ b/apps/sim/vitest.config.ts
@@ -1,4 +1,4 @@
-import path, { resolve } from 'path'
+import path from 'path'
///
-
+
+
)
}
diff --git a/apps/sim/blocks/blocks/cursor.ts b/apps/sim/blocks/blocks/cursor.ts
new file mode 100644
index 0000000000..a57856b1a9
--- /dev/null
+++ b/apps/sim/blocks/blocks/cursor.ts
@@ -0,0 +1,171 @@
+import { CursorIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import { AuthMode } from '@/blocks/types'
+import type { CursorResponse } from '@/tools/cursor/types'
+
+export const CursorBlock: BlockConfig
+
-
+
+
+ +
+ The Sim Team +
- {showGutter && (
-
- )
-}
-
-export const VirtualizedCodeViewer = memo(function VirtualizedCodeViewer({
- code,
- showGutter = true,
- language = 'json',
- className,
- paddingLeft = 0,
- gutterStyle,
- wrapText = false,
- searchQuery,
- currentMatchIndex = 0,
- onMatchCountChange,
- contentRef,
-}: VirtualizedCodeViewerProps) {
- const containerRef = useRef
- {line.lineNumber}
-
- )}
-
-
-
- )
-})
diff --git a/apps/sim/components/emcn/components/code/code.tsx b/apps/sim/components/emcn/components/code/code.tsx
index d4390ff8a8..096ed82600 100644
--- a/apps/sim/components/emcn/components/code/code.tsx
+++ b/apps/sim/components/emcn/components/code/code.tsx
@@ -1,5 +1,17 @@
-import { Fragment, type ReactNode, useEffect, useMemo } from 'react'
+'use client'
+
+import {
+ Fragment,
+ memo,
+ type ReactNode,
+ useCallback,
+ useEffect,
+ useMemo,
+ useRef,
+ useState,
+} from 'react'
import { highlight, languages } from 'prismjs'
+import { List, type RowComponentProps, useDynamicRowHeight, useListRef } from 'react-window'
import 'prismjs/components/prism-javascript'
import 'prismjs/components/prism-python'
import 'prismjs/components/prism-json'
@@ -254,6 +266,89 @@ function Placeholder({ children, gutterWidth, show, className }: CodePlaceholder
)
}
+/**
+ * Props for virtualized row rendering.
+ */
+interface HighlightedLine {
+ lineNumber: number
+ html: string
+}
+
+interface CodeRowProps {
+ lines: HighlightedLine[]
+ gutterWidth: number
+ showGutter: boolean
+ gutterStyle?: React.CSSProperties
+ leftOffset: number
+ wrapText: boolean
+}
+
+/**
+ * Row component for virtualized code viewer.
+ */
+function CodeRow({ index, style, ...props }: RowComponentProps
+ {showGutter && (
+
+ )
+}
+
+/**
+ * Applies search highlighting to a single line for virtualized rendering.
+ */
+function applySearchHighlightingToLine(
+ html: string,
+ searchQuery: string,
+ currentMatchIndex: number,
+ globalMatchOffset: number
+): { html: string; matchesInLine: number } {
+ if (!searchQuery.trim()) return { html, matchesInLine: 0 }
+
+ const escaped = escapeRegex(searchQuery)
+ const regex = new RegExp(`(${escaped})`, 'gi')
+ const parts = html.split(/(<[^>]+>)/g)
+ let matchesInLine = 0
+
+ const result = parts
+ .map((part) => {
+ if (part.startsWith('<') && part.endsWith('>')) {
+ return part
+ }
+ return part.replace(regex, (match) => {
+ const globalIndex = globalMatchOffset + matchesInLine
+ const isCurrentMatch = globalIndex === currentMatchIndex
+ matchesInLine++
+
+ const bgClass = isCurrentMatch
+ ? 'bg-[#F6AD55] text-[#1a1a1a] dark:bg-[#F6AD55] dark:text-[#1a1a1a]'
+ : 'bg-[#FCD34D]/40 dark:bg-[#FCD34D]/30'
+
+ return `${match}`
+ })
+ })
+ .join('')
+
+ return { html: result, matchesInLine }
+}
+
/**
* Props for the Code.Viewer component (readonly code display).
*/
@@ -280,6 +375,8 @@ interface CodeViewerProps {
onMatchCountChange?: (count: number) => void
/** Ref for the content container (for scrolling to matches) */
contentRef?: React.RefObject
+ {line.lineNumber}
+
+ )}
+
+
+
+ )
+})
+
/**
* Readonly code viewer with optional gutter and syntax highlighting.
* Handles all complexity internally - line numbers, gutter width calculation, and highlighting.
@@ -360,6 +638,7 @@ function countSearchMatches(code: string, searchQuery: string): number {
*
* @example
* ```tsx
+ * // Standard rendering
*