From 3e2f991855e90e54e80bec809f2b439cd29b7bd6 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 19:00:15 -0700
Subject: [PATCH 01/20] feat(analytics): add PostHog product analytics

---
 apps/sim/app/(home)/landing-analytics.tsx     |  19 ++
 .../app/_shell/providers/session-provider.tsx |   5 +
 apps/sim/app/api/a2a/agents/route.ts          |  11 +
 apps/sim/app/api/billing/switch-plan/route.ts |   8 +
 apps/sim/app/api/copilot/chat/route.ts        |  17 ++
 apps/sim/app/api/copilot/feedback/route.ts    |   7 +
 apps/sim/app/api/credentials/[id]/route.ts    |  35 +++
 apps/sim/app/api/credentials/route.ts         |  11 +
 .../[id]/connectors/[connectorId]/route.ts    |  13 +
 .../connectors/[connectorId]/sync/route.ts    |  12 +
 .../api/knowledge/[id]/connectors/route.ts    |  16 +
 .../app/api/knowledge/[id]/documents/route.ts |  33 +++
 apps/sim/app/api/knowledge/route.ts           |  15 +
 apps/sim/app/api/mcp/servers/route.ts         |  18 ++
 apps/sim/app/api/table/[tableId]/route.ts     |   8 +
 apps/sim/app/api/table/route.ts               |  15 +
 apps/sim/app/api/tools/custom/route.ts        |  19 ++
 .../app/api/workflows/[id]/deploy/route.ts    |  11 +
 .../deployments/[version]/revert/route.ts     |  12 +
 .../app/api/workflows/[id]/duplicate/route.ts |  12 +
 .../executions/[executionId]/cancel/route.ts  |  11 +
 apps/sim/app/api/workflows/[id]/route.ts      |   8 +
 apps/sim/app/api/workflows/route.ts           |   8 +
 .../workspaces/[id]/api-keys/[keyId]/route.ts |   8 +
 .../app/api/workspaces/[id]/api-keys/route.ts |  14 +-
 .../api/workspaces/[id]/byok-keys/route.ts    |  18 ++
 .../app/api/workspaces/[id]/files/route.ts    |   8 +
 .../workspaces/[id]/notifications/route.ts    |  12 +
 .../api/workspaces/[id]/permissions/route.ts  |   8 +
 .../app/api/workspaces/invitations/route.ts   |  11 +
 .../app/api/workspaces/members/[id]/route.ts  |   8 +
 apps/sim/app/api/workspaces/route.ts          |  11 +
 .../template-prompts/template-prompts.tsx     |  10 +-
 .../app/workspace/[workspaceId]/home/home.tsx |   9 +-
 .../[workspaceId]/knowledge/[id]/base.tsx     |  10 +
 .../settings/[section]/settings.tsx           |   8 +
 .../create-api-key-modal.tsx                  |   3 +
 .../components/deploy-modal/deploy-modal.tsx  |   1 +
 apps/sim/hooks/queries/api-keys.ts            |   8 +-
 apps/sim/lib/auth/auth.ts                     |   8 +
 apps/sim/lib/billing/webhooks/subscription.ts |  24 ++
 apps/sim/lib/posthog/client.ts                |  27 ++
 apps/sim/lib/posthog/events.ts                | 279 ++++++++++++++++++
 apps/sim/lib/posthog/server.ts                | 110 +++++++
 .../workflows/executor/execute-workflow.ts    |  42 +++
 apps/sim/stores/panel/store.ts                |   5 +
 apps/sim/stores/workflows/workflow/store.ts   |  26 ++
 47 files changed, 987 insertions(+), 5 deletions(-)
 create mode 100644 apps/sim/app/(home)/landing-analytics.tsx
 create mode 100644 apps/sim/lib/posthog/client.ts
 create mode 100644 apps/sim/lib/posthog/events.ts
 create mode 100644 apps/sim/lib/posthog/server.ts

diff --git a/apps/sim/app/(home)/landing-analytics.tsx b/apps/sim/app/(home)/landing-analytics.tsx
new file mode 100644
index 00000000000..446fbdcf622
--- /dev/null
+++ b/apps/sim/app/(home)/landing-analytics.tsx
@@ -0,0 +1,19 @@
+'use client'
+
+import { useEffect } from 'react'
+import { usePostHog } from 'posthog-js/react'
+
+/**
+ * Fires a `landing_page_viewed` PostHog event on mount.
+ * Renders nothing — exists only to bridge the server/client boundary
+ * so the server-rendered landing page can emit analytics.
+ */
+export function LandingAnalytics() {
+  const posthog = usePostHog()
+
+  useEffect(() => {
+    posthog?.capture('landing_page_viewed', {})
+  }, [posthog])
+
+  return null
+}
diff --git a/apps/sim/app/_shell/providers/session-provider.tsx b/apps/sim/app/_shell/providers/session-provider.tsx
index b2fe1fb43f2..c7a2ac19b96 100644
--- a/apps/sim/app/_shell/providers/session-provider.tsx
+++ b/apps/sim/app/_shell/providers/session-provider.tsx
@@ -92,6 +92,11 @@ export function SessionProvider({ children }: { children: React.ReactNode }) {
               email_verified: data.user.emailVerified,
               created_at: data.user.createdAt,
             })
+
+            const workspaceId = data.session?.activeOrganizationId
+            if (workspaceId && typeof posthog.group === 'function') {
+              posthog.group('workspace', workspaceId)
+            }
           } else {
             posthog.reset()
           }
diff --git a/apps/sim/app/api/a2a/agents/route.ts b/apps/sim/app/api/a2a/agents/route.ts
index bd3615e1ae1..dee8bb59979 100644
--- a/apps/sim/app/api/a2a/agents/route.ts
+++ b/apps/sim/app/api/a2a/agents/route.ts
@@ -14,6 +14,7 @@ import { generateSkillsFromWorkflow } from '@/lib/a2a/agent-card'
 import { A2A_DEFAULT_CAPABILITIES } from '@/lib/a2a/constants'
 import { sanitizeAgentName } from '@/lib/a2a/utils'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { hasValidStartBlockInState } from '@/lib/workflows/triggers/trigger-utils'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
@@ -201,6 +202,16 @@ export async function POST(request: NextRequest) {
 
     logger.info(`Created A2A agent ${agentId} for workflow ${workflowId}`)
 
+    captureServerEvent(
+      auth.userId,
+      'a2a_agent_created',
+      { agent_id: agentId, workflow_id: workflowId, workspace_id: workspaceId },
+      {
+        groups: { workspace: workspaceId },
+        setOnce: { first_a2a_agent_created_at: new Date().toISOString() },
+      }
+    )
+
     return NextResponse.json({ success: true, agent }, { status: 201 })
   } catch (error) {
     logger.error('Error creating agent:', error)
diff --git a/apps/sim/app/api/billing/switch-plan/route.ts b/apps/sim/app/api/billing/switch-plan/route.ts
index b668335db2a..4bb7dbb366c 100644
--- a/apps/sim/app/api/billing/switch-plan/route.ts
+++ b/apps/sim/app/api/billing/switch-plan/route.ts
@@ -17,6 +17,7 @@ import {
   hasUsableSubscriptionStatus,
 } from '@/lib/billing/subscriptions/utils'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('SwitchPlan')
 
@@ -173,6 +174,13 @@ export async function POST(request: NextRequest) {
       interval: targetInterval,
     })
 
+    captureServerEvent(
+      userId,
+      'subscription_changed',
+      { from_plan: sub.plan ?? 'unknown', to_plan: targetPlanName, interval: targetInterval },
+      { set: { plan: targetPlanName } }
+    )
+
     return NextResponse.json({ success: true, plan: targetPlanName, interval: targetInterval })
   } catch (error) {
     logger.error('Failed to switch subscription', {
diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts
index c1938b5f06c..b0e001e4e8e 100644
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -27,6 +27,7 @@ import {
   createRequestTracker,
   createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
+import { captureServerEvent } from '@/lib/posthog/server'
 import {
   authorizeWorkflowByWorkspacePermission,
   resolveWorkflowIdForUser,
@@ -188,6 +189,22 @@ export async function POST(req: NextRequest) {
         .warn('Failed to resolve workspaceId from workflow')
     }
 
+    captureServerEvent(
+      authenticatedUserId,
+      'copilot_chat_sent',
+      {
+        workflow_id: workflowId,
+        workspace_id: resolvedWorkspaceId ?? '',
+        has_file_attachments: Array.isArray(fileAttachments) && fileAttachments.length > 0,
+        has_contexts: Array.isArray(contexts) && contexts.length > 0,
+        mode,
+      },
+      {
+        groups: { workspace: resolvedWorkspaceId ?? '' },
+        setOnce: { first_copilot_use_at: new Date().toISOString() },
+      }
+    )
+
     const userMessageIdToUse = userMessageId || crypto.randomUUID()
     const reqLogger = logger.withMetadata({
       requestId: tracker.requestId,
diff --git a/apps/sim/app/api/copilot/feedback/route.ts b/apps/sim/app/api/copilot/feedback/route.ts
index 4786d1d7d86..92abaa1c3e9 100644
--- a/apps/sim/app/api/copilot/feedback/route.ts
+++ b/apps/sim/app/api/copilot/feedback/route.ts
@@ -11,6 +11,7 @@ import {
   createRequestTracker,
   createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('CopilotFeedbackAPI')
 
@@ -76,6 +77,12 @@ export async function POST(req: NextRequest) {
       duration: tracker.getDuration(),
     })
 
+    captureServerEvent(authenticatedUserId, 'copilot_feedback_submitted', {
+      is_positive: isPositiveFeedback,
+      has_text_feedback: !!feedback,
+      has_workflow_yaml: !!workflowYaml,
+    })
+
     return NextResponse.json({
       success: true,
       feedbackId: feedbackRecord.feedbackId,
diff --git a/apps/sim/app/api/credentials/[id]/route.ts b/apps/sim/app/api/credentials/[id]/route.ts
index ac992c067df..b86031bf2f3 100644
--- a/apps/sim/app/api/credentials/[id]/route.ts
+++ b/apps/sim/app/api/credentials/[id]/route.ts
@@ -11,6 +11,7 @@ import {
   syncPersonalEnvCredentialsForUser,
   syncWorkspaceEnvCredentials,
 } from '@/lib/credentials/environment'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('CredentialByIdAPI')
 
@@ -236,6 +237,17 @@ export async function DELETE(
         envKeys: Object.keys(current),
       })
 
+      captureServerEvent(
+        session.user.id,
+        'credential_deleted',
+        {
+          credential_type: 'env_personal',
+          provider_id: access.credential.envKey,
+          workspace_id: access.credential.workspaceId,
+        },
+        { groups: { workspace: access.credential.workspaceId } }
+      )
+
       return NextResponse.json({ success: true }, { status: 200 })
     }
 
@@ -278,10 +290,33 @@ export async function DELETE(
         actingUserId: session.user.id,
       })
 
+      captureServerEvent(
+        session.user.id,
+        'credential_deleted',
+        {
+          credential_type: 'env_workspace',
+          provider_id: access.credential.envKey,
+          workspace_id: access.credential.workspaceId,
+        },
+        { groups: { workspace: access.credential.workspaceId } }
+      )
+
       return NextResponse.json({ success: true }, { status: 200 })
     }
 
     await db.delete(credential).where(eq(credential.id, id))
+
+    captureServerEvent(
+      session.user.id,
+      'credential_deleted',
+      {
+        credential_type: access.credential.type as 'oauth' | 'service_account',
+        provider_id: access.credential.providerId ?? id,
+        workspace_id: access.credential.workspaceId,
+      },
+      { groups: { workspace: access.credential.workspaceId } }
+    )
+
     return NextResponse.json({ success: true }, { status: 200 })
   } catch (error) {
     logger.error('Failed to delete credential', error)
diff --git a/apps/sim/app/api/credentials/route.ts b/apps/sim/app/api/credentials/route.ts
index 3184a82ba9f..9242a620fa2 100644
--- a/apps/sim/app/api/credentials/route.ts
+++ b/apps/sim/app/api/credentials/route.ts
@@ -10,6 +10,7 @@ import { generateRequestId } from '@/lib/core/utils/request'
 import { getWorkspaceMemberUserIds } from '@/lib/credentials/environment'
 import { syncWorkspaceOAuthCredentialsForUser } from '@/lib/credentials/oauth'
 import { getServiceConfigByProviderId } from '@/lib/oauth'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 import { isValidEnvVarName } from '@/executor/constants'
 
@@ -600,6 +601,16 @@ export async function POST(request: NextRequest) {
       .where(eq(credential.id, credentialId))
       .limit(1)
 
+    captureServerEvent(
+      session.user.id,
+      'credential_connected',
+      { credential_type: type, provider_id: resolvedProviderId ?? type, workspace_id: workspaceId },
+      {
+        groups: { workspace: workspaceId },
+        setOnce: { first_credential_connected_at: new Date().toISOString() },
+      }
+    )
+
     return NextResponse.json({ credential: created }, { status: 201 })
   } catch (error: any) {
     if (error?.code === '23505') {
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts
index d1b7e1054d7..0533582ed34 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts
@@ -16,6 +16,7 @@ import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { deleteDocumentStorageFiles } from '@/lib/knowledge/documents/service'
 import { cleanupUnusedTagDefinitions } from '@/lib/knowledge/tags/service'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 import { checkKnowledgeBaseAccess, checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 import { CONNECTOR_REGISTRY } from '@/connectors/registry'
@@ -351,6 +352,18 @@ export async function DELETE(request: NextRequest, { params }: RouteParams) {
       `[${requestId}] Deleted connector ${connectorId}${deleteDocuments ? ` and ${docCount} documents` : `, kept ${docCount} documents`}`
     )
 
+    captureServerEvent(
+      auth.userId,
+      'knowledge_base_connector_removed',
+      {
+        knowledge_base_id: knowledgeBaseId,
+        workspace_id: writeCheck.knowledgeBase.workspaceId,
+        connector_type: existingConnector[0].connectorType,
+        documents_deleted: deleteDocuments ? docCount : 0,
+      },
+      { groups: { workspace: writeCheck.knowledgeBase.workspaceId } }
+    )
+
     recordAudit({
       workspaceId: writeCheck.knowledgeBase.workspaceId,
       actorId: auth.userId,
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts
index 4faa2013698..9c08175c926 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts
@@ -7,6 +7,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { dispatchSync } from '@/lib/knowledge/connectors/sync-engine'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 
 const logger = createLogger('ConnectorManualSyncAPI')
@@ -55,6 +56,17 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
 
     logger.info(`[${requestId}] Manual sync triggered for connector ${connectorId}`)
 
+    captureServerEvent(
+      auth.userId,
+      'knowledge_base_connector_synced',
+      {
+        knowledge_base_id: knowledgeBaseId,
+        workspace_id: writeCheck.knowledgeBase.workspaceId,
+        connector_type: connectorRows[0].connectorType,
+      },
+      { groups: { workspace: writeCheck.knowledgeBase.workspaceId } }
+    )
+
     recordAudit({
       workspaceId: writeCheck.knowledgeBase.workspaceId,
       actorId: auth.userId,
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/route.ts
index 989d6056ba5..48ebb5efc70 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/route.ts
@@ -11,6 +11,7 @@ import { generateRequestId } from '@/lib/core/utils/request'
 import { dispatchSync } from '@/lib/knowledge/connectors/sync-engine'
 import { allocateTagSlots } from '@/lib/knowledge/constants'
 import { createTagDefinition } from '@/lib/knowledge/tags/service'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getCredential } from '@/app/api/auth/oauth/utils'
 import { checkKnowledgeBaseAccess, checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 import { CONNECTOR_REGISTRY } from '@/connectors/registry'
@@ -227,6 +228,21 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     logger.info(`[${requestId}] Created connector ${connectorId} for KB ${knowledgeBaseId}`)
 
+    captureServerEvent(
+      auth.userId,
+      'knowledge_base_connector_added',
+      {
+        knowledge_base_id: knowledgeBaseId,
+        workspace_id: writeCheck.knowledgeBase.workspaceId,
+        connector_type: connectorType,
+        sync_interval_minutes: syncIntervalMinutes,
+      },
+      {
+        groups: { workspace: writeCheck.knowledgeBase.workspaceId },
+        setOnce: { first_connector_added_at: new Date().toISOString() },
+      }
+    )
+
     recordAudit({
       workspaceId: writeCheck.knowledgeBase.workspaceId,
       actorId: auth.userId,
diff --git a/apps/sim/app/api/knowledge/[id]/documents/route.ts b/apps/sim/app/api/knowledge/[id]/documents/route.ts
index c65507d81f7..183ac757125 100644
--- a/apps/sim/app/api/knowledge/[id]/documents/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/documents/route.ts
@@ -16,6 +16,7 @@ import {
   type TagFilterCondition,
 } from '@/lib/knowledge/documents/service'
 import type { DocumentSortField, SortOrder } from '@/lib/knowledge/documents/types'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
 import { checkKnowledgeBaseAccess, checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 
@@ -214,6 +215,8 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
+    const kbWorkspaceId = accessCheck.knowledgeBase?.workspaceId
+
     if (body.bulk === true) {
       try {
         const validatedData = BulkCreateDocumentsSchema.parse(body)
@@ -240,6 +243,21 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
           // Silently fail
         }
 
+        captureServerEvent(
+          userId,
+          'knowledge_base_document_uploaded',
+          {
+            knowledge_base_id: knowledgeBaseId,
+            workspace_id: kbWorkspaceId ?? '',
+            document_count: createdDocuments.length,
+            upload_type: 'bulk',
+          },
+          {
+            ...(kbWorkspaceId ? { groups: { workspace: kbWorkspaceId } } : {}),
+            setOnce: { first_document_uploaded_at: new Date().toISOString() },
+          }
+        )
+
         processDocumentsWithQueue(
           createdDocuments,
           knowledgeBaseId,
@@ -314,6 +332,21 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
           // Silently fail
         }
 
+        captureServerEvent(
+          userId,
+          'knowledge_base_document_uploaded',
+          {
+            knowledge_base_id: knowledgeBaseId,
+            workspace_id: kbWorkspaceId ?? '',
+            document_count: 1,
+            upload_type: 'single',
+          },
+          {
+            ...(kbWorkspaceId ? { groups: { workspace: kbWorkspaceId } } : {}),
+            setOnce: { first_document_uploaded_at: new Date().toISOString() },
+          }
+        )
+
         recordAudit({
           workspaceId: accessCheck.knowledgeBase?.workspaceId ?? null,
           actorId: userId,
diff --git a/apps/sim/app/api/knowledge/route.ts b/apps/sim/app/api/knowledge/route.ts
index 28fe86ef016..31951276176 100644
--- a/apps/sim/app/api/knowledge/route.ts
+++ b/apps/sim/app/api/knowledge/route.ts
@@ -11,6 +11,7 @@ import {
   KnowledgeBaseConflictError,
   type KnowledgeBaseScope,
 } from '@/lib/knowledge/service'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('KnowledgeBaseAPI')
 
@@ -115,6 +116,20 @@ export async function POST(req: NextRequest) {
         // Telemetry should not fail the operation
       }
 
+      captureServerEvent(
+        session.user.id,
+        'knowledge_base_created',
+        {
+          knowledge_base_id: newKnowledgeBase.id,
+          workspace_id: validatedData.workspaceId,
+          name: validatedData.name,
+        },
+        {
+          groups: { workspace: validatedData.workspaceId },
+          setOnce: { first_kb_created_at: new Date().toISOString() },
+        }
+      )
+
       logger.info(
         `[${requestId}] Knowledge base created: ${newKnowledgeBase.id} for user ${session.user.id}`
       )
diff --git a/apps/sim/app/api/mcp/servers/route.ts b/apps/sim/app/api/mcp/servers/route.ts
index ff08085d1ec..3be0aaa9694 100644
--- a/apps/sim/app/api/mcp/servers/route.ts
+++ b/apps/sim/app/api/mcp/servers/route.ts
@@ -18,6 +18,7 @@ import {
   createMcpSuccessResponse,
   generateMcpServerId,
 } from '@/lib/mcp/utils'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('McpServersAPI')
 
@@ -180,6 +181,16 @@ export const POST = withMcpAuth('write')(
         // Silently fail
       }
 
+      captureServerEvent(
+        userId,
+        'mcp_server_connected',
+        { workspace_id: workspaceId, server_name: body.name, transport: body.transport },
+        {
+          groups: { workspace: workspaceId },
+          setOnce: { first_mcp_connected_at: new Date().toISOString() },
+        }
+      )
+
       recordAudit({
         workspaceId,
         actorId: userId,
@@ -242,6 +253,13 @@ export const DELETE = withMcpAuth('admin')(
 
       logger.info(`[${requestId}] Successfully deleted MCP server: ${serverId}`)
 
+      captureServerEvent(
+        userId,
+        'mcp_server_disconnected',
+        { workspace_id: workspaceId, server_name: deletedServer.name },
+        { groups: { workspace: workspaceId } }
+      )
+
       recordAudit({
         workspaceId,
         actorId: userId,
diff --git a/apps/sim/app/api/table/[tableId]/route.ts b/apps/sim/app/api/table/[tableId]/route.ts
index 30a99c951b3..1e84313c028 100644
--- a/apps/sim/app/api/table/[tableId]/route.ts
+++ b/apps/sim/app/api/table/[tableId]/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import {
   deleteTable,
   NAME_PATTERN,
@@ -183,6 +184,13 @@ export async function DELETE(request: NextRequest, { params }: TableRouteParams)
 
     await deleteTable(tableId, requestId)
 
+    captureServerEvent(
+      authResult.userId,
+      'table_deleted',
+      { table_id: tableId, workspace_id: table.workspaceId },
+      { groups: { workspace: table.workspaceId } }
+    )
+
     return NextResponse.json({
       success: true,
       data: {
diff --git a/apps/sim/app/api/table/route.ts b/apps/sim/app/api/table/route.ts
index 18387ea80d8..bac9965766f 100644
--- a/apps/sim/app/api/table/route.ts
+++ b/apps/sim/app/api/table/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import {
   createTable,
   getWorkspaceTableLimits,
@@ -141,6 +142,20 @@ export async function POST(request: NextRequest) {
       requestId
     )
 
+    captureServerEvent(
+      authResult.userId,
+      'table_created',
+      {
+        table_id: table.id,
+        workspace_id: params.workspaceId,
+        column_count: params.schema.columns.length,
+      },
+      {
+        groups: { workspace: params.workspaceId },
+        setOnce: { first_table_created_at: new Date().toISOString() },
+      }
+    )
+
     return NextResponse.json({
       success: true,
       data: {
diff --git a/apps/sim/app/api/tools/custom/route.ts b/apps/sim/app/api/tools/custom/route.ts
index 6bcbf553067..521b239467a 100644
--- a/apps/sim/app/api/tools/custom/route.ts
+++ b/apps/sim/app/api/tools/custom/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { upsertCustomTools } from '@/lib/workflows/custom-tools/operations'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -168,6 +169,16 @@ export async function POST(req: NextRequest) {
       })
 
       for (const tool of resultTools) {
+        captureServerEvent(
+          userId,
+          'custom_tool_saved',
+          { tool_id: tool.id, workspace_id: workspaceId, tool_name: tool.title },
+          {
+            groups: { workspace: workspaceId },
+            setOnce: { first_custom_tool_saved_at: new Date().toISOString() },
+          }
+        )
+
         recordAudit({
           workspaceId,
           actorId: userId,
@@ -278,6 +289,14 @@ export async function DELETE(request: NextRequest) {
     // Delete the tool
     await db.delete(customTools).where(eq(customTools.id, toolId))
 
+    const toolWorkspaceId = tool.workspaceId ?? workspaceId ?? ''
+    captureServerEvent(
+      userId,
+      'custom_tool_deleted',
+      { tool_id: toolId, workspace_id: toolWorkspaceId },
+      toolWorkspaceId ? { groups: { workspace: toolWorkspaceId } } : undefined
+    )
+
     recordAudit({
       workspaceId: tool.workspaceId || undefined,
       actorId: userId,
diff --git a/apps/sim/app/api/workflows/[id]/deploy/route.ts b/apps/sim/app/api/workflows/[id]/deploy/route.ts
index c4f6d0087af..ff6eac774c6 100644
--- a/apps/sim/app/api/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deploy/route.ts
@@ -3,6 +3,7 @@ import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { performFullDeploy, performFullUndeploy } from '@/lib/workflows/orchestration'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import {
@@ -96,6 +97,16 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     logger.info(`[${requestId}] Workflow deployed successfully: ${id}`)
 
+    captureServerEvent(
+      actorUserId,
+      'workflow_deployed',
+      { workflow_id: id, workspace_id: workflowData!.workspaceId ?? '' },
+      {
+        groups: { workspace: workflowData!.workspaceId ?? '' },
+        setOnce: { first_workflow_deployed_at: new Date().toISOString() },
+      }
+    )
+
     const responseApiKeyInfo = workflowData!.workspaceId
       ? 'Workspace API keys'
       : 'Personal API keys'
diff --git a/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts b/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts
index d3762c9181f..3dac9d2d6bd 100644
--- a/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts
@@ -5,6 +5,7 @@ import type { NextRequest } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { env } from '@/lib/core/config/env'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
@@ -104,6 +105,17 @@ export async function POST(
       logger.error('Error sending workflow reverted event to socket server', e)
     }
 
+    captureServerEvent(
+      session!.user.id,
+      'workflow_deployment_reverted',
+      {
+        workflow_id: id,
+        workspace_id: workflowRecord?.workspaceId ?? '',
+        version,
+      },
+      { groups: { workspace: workflowRecord?.workspaceId ?? '' } }
+    )
+
     recordAudit({
       workspaceId: workflowRecord?.workspaceId ?? null,
       actorId: session!.user.id,
diff --git a/apps/sim/app/api/workflows/[id]/duplicate/route.ts b/apps/sim/app/api/workflows/[id]/duplicate/route.ts
index cc00c0c0b7c..157dd4a924b 100644
--- a/apps/sim/app/api/workflows/[id]/duplicate/route.ts
+++ b/apps/sim/app/api/workflows/[id]/duplicate/route.ts
@@ -5,6 +5,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { duplicateWorkflow } from '@/lib/workflows/persistence/duplicate'
 
 const logger = createLogger('WorkflowDuplicateAPI')
@@ -60,6 +61,17 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
       // Telemetry should not fail the operation
     }
 
+    captureServerEvent(
+      userId,
+      'workflow_duplicated',
+      {
+        source_workflow_id: sourceWorkflowId,
+        new_workflow_id: result.id,
+        workspace_id: workspaceId ?? '',
+      },
+      { groups: { workspace: workspaceId ?? '' } }
+    )
+
     const elapsed = Date.now() - startTime
     logger.info(
       `[${requestId}] Successfully duplicated workflow ${sourceWorkflowId} to ${result.id} in ${elapsed}ms`
diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
index 81d3afdb202..a6eed00a80a 100644
--- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
+++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { markExecutionCancelled } from '@/lib/execution/cancellation'
 import { abortManualExecution } from '@/lib/execution/manual-cancellation'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
 
 const logger = createLogger('CancelExecutionAPI')
@@ -60,6 +61,16 @@ export async function POST(
       })
     }
 
+    if (cancellation.durablyRecorded || locallyAborted) {
+      const workspaceId = workflowAuthorization.workflow?.workspaceId ?? ''
+      captureServerEvent(
+        auth.userId,
+        'workflow_execution_cancelled',
+        { workflow_id: workflowId, workspace_id: workspaceId },
+        { groups: { workspace: workspaceId } }
+      )
+    }
+
     return NextResponse.json({
       success: cancellation.durablyRecorded || locallyAborted,
       executionId,
diff --git a/apps/sim/app/api/workflows/[id]/route.ts b/apps/sim/app/api/workflows/[id]/route.ts
index c746d394db2..c610a54d8d4 100644
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -6,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuthType, checkHybridAuth, checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { performDeleteWorkflow } from '@/lib/workflows/orchestration'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { authorizeWorkflowByWorkspacePermission, getWorkflowById } from '@/lib/workflows/utils'
@@ -225,6 +226,13 @@ export async function DELETE(
       return NextResponse.json({ error: result.error }, { status })
     }
 
+    captureServerEvent(
+      userId,
+      'workflow_deleted',
+      { workflow_id: workflowId, workspace_id: workflowData.workspaceId ?? '' },
+      { groups: { workspace: workflowData.workspaceId ?? '' } }
+    )
+
     const elapsed = Date.now() - startTime
     logger.info(`[${requestId}] Successfully archived workflow ${workflowId} in ${elapsed}ms`)
 
diff --git a/apps/sim/app/api/workflows/route.ts b/apps/sim/app/api/workflows/route.ts
index a9aba1bcc44..19cb28f5ce3 100644
--- a/apps/sim/app/api/workflows/route.ts
+++ b/apps/sim/app/api/workflows/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
@@ -249,6 +250,13 @@ export async function POST(req: NextRequest) {
         // Silently fail
       })
 
+    captureServerEvent(
+      userId,
+      'workflow_created',
+      { workflow_id: workflowId, workspace_id: workspaceId ?? '', name },
+      { groups: { workspace: workspaceId ?? '' } }
+    )
+
     const { workflowState, subBlockValues, startBlockId } = buildDefaultWorkflowArtifacts()
 
     await db.transaction(async (tx) => {
diff --git a/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.ts b/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.ts
index bb9a5ff6989..42711f1fa8c 100644
--- a/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('WorkspaceApiKeyAPI')
@@ -145,6 +146,13 @@ export async function DELETE(
 
     const deletedKey = deletedRows[0]
 
+    captureServerEvent(
+      userId,
+      'api_key_revoked',
+      { workspace_id: workspaceId, key_name: deletedKey.name },
+      { groups: { workspace: workspaceId } }
+    )
+
     recordAudit({
       workspaceId,
       actorId: userId,
diff --git a/apps/sim/app/api/workspaces/[id]/api-keys/route.ts b/apps/sim/app/api/workspaces/[id]/api-keys/route.ts
index 631037089d6..62638bbb47a 100644
--- a/apps/sim/app/api/workspaces/[id]/api-keys/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/api-keys/route.ts
@@ -10,12 +10,14 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions, getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('WorkspaceApiKeysAPI')
 
 const CreateKeySchema = z.object({
   name: z.string().trim().min(1, 'Name is required'),
+  source: z.enum(['settings', 'deploy_modal']).optional(),
 })
 
 const DeleteKeysSchema = z.object({
@@ -101,7 +103,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     }
 
     const body = await request.json()
-    const { name } = CreateKeySchema.parse(body)
+    const { name, source } = CreateKeySchema.parse(body)
 
     const existingKey = await db
       .select()
@@ -158,6 +160,16 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       // Telemetry should not fail the operation
     }
 
+    captureServerEvent(
+      userId,
+      'api_key_created',
+      { workspace_id: workspaceId, key_name: name, source },
+      {
+        groups: { workspace: workspaceId },
+        setOnce: { first_api_key_created_at: new Date().toISOString() },
+      }
+    )
+
     logger.info(`[${requestId}] Created workspace API key: ${name} in workspace ${workspaceId}`)
 
     recordAudit({
diff --git a/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts b/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
index b16d67257b4..49efb08d59f 100644
--- a/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
@@ -9,6 +9,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions, getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('WorkspaceBYOKKeysAPI')
@@ -201,6 +202,16 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     logger.info(`[${requestId}] Created BYOK key for ${providerId} in workspace ${workspaceId}`)
 
+    captureServerEvent(
+      userId,
+      'byok_key_added',
+      { workspace_id: workspaceId, provider_id: providerId },
+      {
+        groups: { workspace: workspaceId },
+        setOnce: { first_byok_key_added_at: new Date().toISOString() },
+      }
+    )
+
     recordAudit({
       workspaceId,
       actorId: userId,
@@ -272,6 +283,13 @@ export async function DELETE(
 
     logger.info(`[${requestId}] Deleted BYOK key for ${providerId} from workspace ${workspaceId}`)
 
+    captureServerEvent(
+      userId,
+      'byok_key_removed',
+      { workspace_id: workspaceId, provider_id: providerId },
+      { groups: { workspace: workspaceId } }
+    )
+
     recordAudit({
       workspaceId,
       actorId: userId,
diff --git a/apps/sim/app/api/workspaces/[id]/files/route.ts b/apps/sim/app/api/workspaces/[id]/files/route.ts
index 9c1bc89cbc5..5c887442796 100644
--- a/apps/sim/app/api/workspaces/[id]/files/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/files/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import {
   FileConflictError,
   listWorkspaceFiles,
@@ -116,6 +117,13 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     logger.info(`[${requestId}] Uploaded workspace file: ${fileName}`)
 
+    captureServerEvent(
+      session.user.id,
+      'file_uploaded',
+      { workspace_id: workspaceId, file_type: rawFile.type || 'application/octet-stream' },
+      { groups: { workspace: workspaceId } }
+    )
+
     recordAudit({
       workspaceId,
       actorId: session.user.id,
diff --git a/apps/sim/app/api/workspaces/[id]/notifications/route.ts b/apps/sim/app/api/workspaces/[id]/notifications/route.ts
index 6c46cef900a..c49c451752f 100644
--- a/apps/sim/app/api/workspaces/[id]/notifications/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/notifications/route.ts
@@ -8,6 +8,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { encryptSecret } from '@/lib/core/security/encryption'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import { MAX_EMAIL_RECIPIENTS, MAX_NOTIFICATIONS_PER_TYPE, MAX_WORKFLOW_IDS } from './constants'
 
@@ -256,6 +257,17 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       type: data.notificationType,
     })
 
+    captureServerEvent(
+      session.user.id,
+      'notification_channel_created',
+      {
+        workspace_id: workspaceId,
+        notification_type: data.notificationType,
+        alert_rule: data.alertConfig?.rule ?? null,
+      },
+      { groups: { workspace: workspaceId } }
+    )
+
     recordAudit({
       workspaceId,
       actorId: session.user.id,
diff --git a/apps/sim/app/api/workspaces/[id]/permissions/route.ts b/apps/sim/app/api/workspaces/[id]/permissions/route.ts
index 067256b3dbd..01d5a01ae9d 100644
--- a/apps/sim/app/api/workspaces/[id]/permissions/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/permissions/route.ts
@@ -8,6 +8,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
+import { captureServerEvent } from '@/lib/posthog/server'
 import {
   getUsersWithPermissions,
   hasWorkspaceAdminAccess,
@@ -188,6 +189,13 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
     const updatedUsers = await getUsersWithPermissions(workspaceId)
 
     for (const update of body.updates) {
+      captureServerEvent(
+        session.user.id,
+        'workspace_member_role_changed',
+        { workspace_id: workspaceId, new_role: update.permissions },
+        { groups: { workspace: workspaceId } }
+      )
+
       recordAudit({
         workspaceId,
         actorId: session.user.id,
diff --git a/apps/sim/app/api/workspaces/invitations/route.ts b/apps/sim/app/api/workspaces/invitations/route.ts
index 208e0a0e267..4dbcc3152e7 100644
--- a/apps/sim/app/api/workspaces/invitations/route.ts
+++ b/apps/sim/app/api/workspaces/invitations/route.ts
@@ -19,6 +19,7 @@ import { PlatformEvents } from '@/lib/core/telemetry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 import {
   InvitationsNotAllowedError,
@@ -214,6 +215,16 @@ export async function POST(req: NextRequest) {
       // Telemetry should not fail the operation
     }
 
+    captureServerEvent(
+      session.user.id,
+      'workspace_member_invited',
+      { workspace_id: workspaceId, invitee_role: permission },
+      {
+        groups: { workspace: workspaceId },
+        setOnce: { first_invitation_sent_at: new Date().toISOString() },
+      }
+    )
+
     await sendInvitationEmail({
       to: email,
       inviterName: session.user.name || session.user.email || 'A user',
diff --git a/apps/sim/app/api/workspaces/members/[id]/route.ts b/apps/sim/app/api/workspaces/members/[id]/route.ts
index 937c9fa5da0..ca918712946 100644
--- a/apps/sim/app/api/workspaces/members/[id]/route.ts
+++ b/apps/sim/app/api/workspaces/members/[id]/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { revokeWorkspaceCredentialMemberships } from '@/lib/credentials/access'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { hasWorkspaceAdminAccess } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('WorkspaceMemberAPI')
@@ -105,6 +106,13 @@ export async function DELETE(req: NextRequest, { params }: { params: Promise<{ i
 
     await revokeWorkspaceCredentialMemberships(workspaceId, userId)
 
+    captureServerEvent(
+      session.user.id,
+      'workspace_member_removed',
+      { workspace_id: workspaceId, is_self_removal: isSelf },
+      { groups: { workspace: workspaceId } }
+    )
+
     recordAudit({
       workspaceId,
       actorId: session.user.id,
diff --git a/apps/sim/app/api/workspaces/route.ts b/apps/sim/app/api/workspaces/route.ts
index f6f51fee7b7..686d6a0a1a2 100644
--- a/apps/sim/app/api/workspaces/route.ts
+++ b/apps/sim/app/api/workspaces/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { getRandomWorkspaceColor } from '@/lib/workspaces/colors'
@@ -96,6 +97,16 @@ export async function POST(req: Request) {
 
     const newWorkspace = await createWorkspace(session.user.id, name, skipDefaultWorkflow, color)
 
+    captureServerEvent(
+      session.user.id,
+      'workspace_created',
+      { workspace_id: newWorkspace.id, name: newWorkspace.name },
+      {
+        groups: { workspace: newWorkspace.id },
+        setOnce: { first_workspace_created_at: new Date().toISOString() },
+      }
+    )
+
     recordAudit({
       workspaceId: newWorkspace.id,
       actorId: session.user.id,
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx
index c0593aebc1f..057821b1e08 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx
@@ -2,6 +2,7 @@
 
 import { type ComponentType, memo, type SVGProps } from 'react'
 import Image from 'next/image'
+import { usePostHog } from 'posthog-js/react'
 import { AgentIcon, ScheduleIcon, StartIcon } from '@/components/icons'
 import type { Category, ModuleTag } from './consts'
 import { CATEGORY_META, TEMPLATES } from './consts'
@@ -349,11 +350,18 @@ interface TemplateCardProps {
 
 const TemplateCard = memo(function TemplateCard({ template, onSelect }: TemplateCardProps) {
   const Icon = template.icon
+  const posthog = usePostHog()
 
   return (
     <button
       type='button'
-      onClick={() => onSelect(template.prompt)}
+      onClick={() => {
+        posthog?.capture('template_used', {
+          template_title: template.title,
+          template_modules: template.modules.join(' '),
+        })
+        onSelect(template.prompt)
+      }}
       aria-label={`Select template: ${template.title}`}
       className='group flex cursor-pointer flex-col text-left'
     >
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 87e8f126b80..a176376c538 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -3,6 +3,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { useParams, useRouter } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import { PanelLeft } from '@/components/emcn/icons'
 import { useSession } from '@/lib/auth/auth-client'
 import {
@@ -27,6 +28,7 @@ export function Home({ chatId }: HomeProps = {}) {
   const { workspaceId } = useParams<{ workspaceId: string }>()
   const router = useRouter()
   const { data: session } = useSession()
+  const posthog = usePostHog()
   const [initialPrompt, setInitialPrompt] = useState('')
   const hasCheckedLandingStorageRef = useRef(false)
   const initialViewInputRef = useRef<HTMLDivElement>(null)
@@ -204,13 +206,18 @@ export function Home({ chatId }: HomeProps = {}) {
       const trimmed = text.trim()
       if (!trimmed && !(fileAttachments && fileAttachments.length > 0)) return
 
+      posthog?.capture('message_sent', {
+        has_attachments: !!(fileAttachments && fileAttachments.length > 0),
+        has_contexts: !!(contexts && contexts.length > 0),
+      })
+
       if (initialViewInputRef.current) {
         setIsInputEntering(true)
       }
 
       sendMessage(trimmed || 'Analyze the attached file(s).', fileAttachments, contexts)
     },
-    [sendMessage]
+    [sendMessage, posthog]
   )
 
   useEffect(() => {
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
index 69150737971..7bb54a0b544 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
@@ -5,6 +5,7 @@ import { createLogger } from '@sim/logger'
 import { format } from 'date-fns'
 import { AlertCircle, Loader2, Pencil, Plus, Tag, X } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import {
   Badge,
   Button,
@@ -190,6 +191,15 @@ export function KnowledgeBase({
 }: KnowledgeBaseProps) {
   const params = useParams()
   const workspaceId = propWorkspaceId || (params.workspaceId as string)
+  const posthog = usePostHog()
+
+  useEffect(() => {
+    posthog?.capture('knowledge_base_opened', {
+      knowledge_base_id: id,
+      knowledge_base_name: passedKnowledgeBaseName ?? 'Unknown',
+    })
+  }, [id, posthog])
+
   useOAuthReturnForKBConnectors(id)
   const { removeKnowledgeBase } = useKnowledgeBasesList(workspaceId, { enabled: false })
   const userPermissions = useUserPermissionsContext()
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
index 02fcbad3a4f..5506ec95781 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
@@ -1,7 +1,9 @@
 'use client'
 
+import { useEffect } from 'react'
 import dynamic from 'next/dynamic'
 import { useSearchParams } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import { Skeleton } from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
 import { AdminSkeleton } from '@/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton'
@@ -160,6 +162,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
   const searchParams = useSearchParams()
   const mcpServerId = searchParams.get('mcpServerId')
   const { data: session, isPending: sessionLoading } = useSession()
+  const posthog = usePostHog()
 
   const isAdminRole = session?.user?.role === 'admin'
   const effectiveSection =
@@ -174,6 +177,11 @@ export function SettingsPage({ section }: SettingsPageProps) {
   const label =
     allNavigationItems.find((item) => item.id === effectiveSection)?.label ?? effectiveSection
 
+  useEffect(() => {
+    if (sessionLoading) return
+    posthog?.capture('settings_tab_viewed', { section: effectiveSection })
+  }, [effectiveSection, sessionLoading, posthog])
+
   return (
     <div>
       <h2 className='mb-7 font-medium text-[22px] text-[var(--text-primary)]'>{label}</h2>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/components/create-api-key-modal/create-api-key-modal.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/components/create-api-key-modal/create-api-key-modal.tsx
index ad64805a2e8..5b6e32aa1c3 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/components/create-api-key-modal/create-api-key-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/components/create-api-key-modal/create-api-key-modal.tsx
@@ -26,6 +26,7 @@ interface CreateApiKeyModalProps {
   allowPersonalApiKeys?: boolean
   canManageWorkspaceKeys?: boolean
   defaultKeyType?: 'personal' | 'workspace'
+  source?: 'settings' | 'deploy_modal'
   onKeyCreated?: (key: ApiKey) => void
 }
 
@@ -41,6 +42,7 @@ export function CreateApiKeyModal({
   allowPersonalApiKeys = true,
   canManageWorkspaceKeys = false,
   defaultKeyType = 'personal',
+  source = 'settings',
   onKeyCreated,
 }: CreateApiKeyModalProps) {
   const [keyName, setKeyName] = useState('')
@@ -74,6 +76,7 @@ export function CreateApiKeyModal({
         workspaceId,
         name: trimmedName,
         keyType,
+        source,
       })
 
       setNewKey(data.key)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
index 6e228f22c39..f6ce4e95c2b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -915,6 +915,7 @@ export function DeployModal({
         allowPersonalApiKeys={allowPersonalApiKeys}
         canManageWorkspaceKeys={canManageWorkspaceKeys}
         defaultKeyType={defaultKeyType}
+        source='deploy_modal'
       />
 
       {workflowId && (
diff --git a/apps/sim/hooks/queries/api-keys.ts b/apps/sim/hooks/queries/api-keys.ts
index ebc025a4cfb..59804a2cba2 100644
--- a/apps/sim/hooks/queries/api-keys.ts
+++ b/apps/sim/hooks/queries/api-keys.ts
@@ -89,6 +89,7 @@ interface CreateApiKeyParams {
   workspaceId: string
   name: string
   keyType: 'personal' | 'workspace'
+  source?: 'settings' | 'deploy_modal'
 }
 
 /**
@@ -98,16 +99,19 @@ export function useCreateApiKey() {
   const queryClient = useQueryClient()
 
   return useMutation({
-    mutationFn: async ({ workspaceId, name, keyType }: CreateApiKeyParams) => {
+    mutationFn: async ({ workspaceId, name, keyType, source }: CreateApiKeyParams) => {
       const url =
         keyType === 'workspace'
           ? `/api/workspaces/${workspaceId}/api-keys`
           : '/api/users/me/api-keys'
 
+      const body: Record<string, unknown> = { name: name.trim() }
+      if (keyType === 'workspace' && source) body.source = source
+
       const response = await fetch(url, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ name: name.trim() }),
+        body: JSON.stringify(body),
       })
 
       if (!response.ok) {
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 26f8f6fe0f9..31d69ca908f 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -76,6 +76,7 @@ import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress, getPersonalEmailFrom } from '@/lib/messaging/email/utils'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { scheduleLifecycleEmail } from '@/lib/messaging/lifecycle'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { syncAllWebhooksForCredentialSet } from '@/lib/webhooks/utils.server'
 import { SSO_TRUSTED_PROVIDERS } from '@/ee/sso/constants'
 import { createAnonymousSession, ensureAnonymousUserExists } from './anonymous'
@@ -190,6 +191,13 @@ export const auth = betterAuth({
             // Telemetry should not fail the operation
           }
 
+          captureServerEvent(
+            user.id,
+            'user_created',
+            { auth_method: 'email' },
+            { setOnce: { signup_at: new Date().toISOString() } }
+          )
+
           try {
             await handleNewUser(user.id)
           } catch (error) {
diff --git a/apps/sim/lib/billing/webhooks/subscription.ts b/apps/sim/lib/billing/webhooks/subscription.ts
index 50ab3419784..1b54a0f11d5 100644
--- a/apps/sim/lib/billing/webhooks/subscription.ts
+++ b/apps/sim/lib/billing/webhooks/subscription.ts
@@ -13,6 +13,7 @@ import {
   getBilledOverageForSubscription,
   resetUsageForSubscription,
 } from '@/lib/billing/webhooks/invoices'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('StripeSubscriptionWebhooks')
 
@@ -155,6 +156,19 @@ export async function handleSubscriptionCreated(subscriptionData: {
         otherActiveSubscriptionsCount: otherActiveSubscriptions.length,
       })
     }
+
+    if (wasFreePreviously && isPaidPlan) {
+      captureServerEvent(
+        subscriptionData.referenceId,
+        'subscription_created',
+        {
+          plan: subscriptionData.plan ?? 'unknown',
+          status: subscriptionData.status,
+          reference_id: subscriptionData.referenceId,
+        },
+        { set: { plan: subscriptionData.plan ?? 'unknown' } }
+      )
+    }
   } catch (error) {
     logger.error('Failed to handle subscription creation usage reset', {
       subscriptionId: subscriptionData.id,
@@ -337,6 +351,16 @@ export async function handleSubscriptionDeleted(subscription: {
       organizationDeleted,
       membersSynced,
     })
+
+    captureServerEvent(
+      subscription.referenceId,
+      'subscription_cancelled',
+      {
+        plan: subscription.plan ?? 'unknown',
+        reference_id: subscription.referenceId,
+      },
+      { set: { plan: 'free' } }
+    )
   } catch (error) {
     logger.error('Failed to handle subscription deletion', {
       subscriptionId: subscription.id,
diff --git a/apps/sim/lib/posthog/client.ts b/apps/sim/lib/posthog/client.ts
new file mode 100644
index 00000000000..7c346fc07eb
--- /dev/null
+++ b/apps/sim/lib/posthog/client.ts
@@ -0,0 +1,27 @@
+import type { PostHogEventMap, PostHogEventName } from '@/lib/posthog/events'
+
+/**
+ * Capture a client-side PostHog event from a non-React context (e.g. Zustand stores).
+ *
+ * Uses the same dynamic `import('posthog-js')` pattern as `session-provider.tsx`.
+ * Fully fire-and-forget — never throws, never blocks.
+ *
+ * React components should use `usePostHog()` from `posthog-js/react` instead.
+ *
+ * @param event      - Typed event name from {@link PostHogEventMap}.
+ * @param properties - Strongly-typed property bag for this event.
+ */
+export function captureClientEvent<E extends PostHogEventName>(
+  event: E,
+  properties: PostHogEventMap[E]
+): void {
+  import('posthog-js')
+    .then(({ default: posthog }) => {
+      try {
+        if (typeof posthog.capture === 'function') {
+          posthog.capture(event, properties)
+        }
+      } catch {}
+    })
+    .catch(() => {})
+}
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
new file mode 100644
index 00000000000..983b9113aca
--- /dev/null
+++ b/apps/sim/lib/posthog/events.ts
@@ -0,0 +1,279 @@
+/**
+ * PostHog product analytics event catalog.
+ *
+ * Type-only module — zero runtime overhead. All event names and property shapes
+ * are defined here as a single source of truth for compile-time safety at every
+ * capture call site.
+ */
+
+export interface PostHogEventMap {
+  user_created: {
+    auth_method: 'email' | 'oauth' | 'sso'
+    provider?: string
+  }
+
+  landing_page_viewed: Record<string, never>
+
+  signup_page_viewed: Record<string, never>
+
+  subscription_created: {
+    plan: string
+    status: string
+    reference_id: string
+  }
+
+  subscription_cancelled: {
+    plan: string
+    reference_id: string
+  }
+
+  subscription_changed: {
+    from_plan: string
+    to_plan: string
+    interval: string
+  }
+
+  workspace_created: {
+    workspace_id: string
+    name: string
+  }
+
+  workspace_member_invited: {
+    workspace_id: string
+    invitee_role: string
+  }
+
+  workspace_member_removed: {
+    workspace_id: string
+    is_self_removal: boolean
+  }
+
+  workspace_member_role_changed: {
+    workspace_id: string
+    new_role: string
+  }
+
+  workflow_created: {
+    workflow_id: string
+    workspace_id: string
+    name: string
+  }
+
+  workflow_deployed: {
+    workflow_id: string
+    workspace_id: string
+  }
+
+  /** `block_types` is a comma-separated deduped list of block types that ran. */
+  workflow_executed: {
+    workflow_id: string
+    workspace_id: string
+    trigger_type: string
+    success: boolean
+    block_count: number
+    block_types: string
+    duration_ms: number
+  }
+
+  workflow_execution_failed: {
+    workflow_id: string
+    workspace_id: string
+    trigger_type: string
+    error_message: string
+  }
+
+  workflow_duplicated: {
+    source_workflow_id: string
+    new_workflow_id: string
+    workspace_id: string
+  }
+
+  workflow_deleted: {
+    workflow_id: string
+    workspace_id: string
+  }
+
+  /** Fired server-side when a user reverts a workflow canvas to a prior deployment snapshot. */
+  workflow_deployment_reverted: {
+    workflow_id: string
+    workspace_id: string
+    version: string
+  }
+
+  workflow_execution_cancelled: {
+    workflow_id: string
+    workspace_id: string
+  }
+
+  /** Fired server-side when a workflow is exposed as an A2A agent. */
+  a2a_agent_created: {
+    agent_id: string
+    workflow_id: string
+    workspace_id: string
+  }
+
+  block_added: {
+    block_type: string
+    workflow_id: string
+  }
+
+  block_removed: {
+    block_type: string
+    workflow_id: string
+  }
+
+  knowledge_base_created: {
+    knowledge_base_id: string
+    workspace_id: string
+    name: string
+  }
+
+  knowledge_base_document_uploaded: {
+    knowledge_base_id: string
+    workspace_id: string
+    document_count: number
+    upload_type: 'single' | 'bulk'
+  }
+
+  knowledge_base_connector_added: {
+    knowledge_base_id: string
+    workspace_id: string
+    connector_type: string
+    sync_interval_minutes: number
+  }
+
+  knowledge_base_connector_removed: {
+    knowledge_base_id: string
+    workspace_id: string
+    connector_type: string
+    documents_deleted: number
+  }
+
+  knowledge_base_connector_synced: {
+    knowledge_base_id: string
+    workspace_id: string
+    connector_type: string
+  }
+
+  knowledge_base_opened: {
+    knowledge_base_id: string
+    knowledge_base_name: string
+  }
+
+  file_uploaded: {
+    workspace_id: string
+    file_type: string
+  }
+
+  api_key_created: {
+    workspace_id: string
+    key_name: string
+    source?: 'settings' | 'deploy_modal'
+  }
+
+  api_key_revoked: {
+    workspace_id: string
+    key_name: string
+  }
+
+  mcp_server_connected: {
+    workspace_id: string
+    server_name: string
+    transport: string
+  }
+
+  mcp_server_disconnected: {
+    workspace_id: string
+    server_name: string
+  }
+
+  credential_connected: {
+    credential_type: 'oauth' | 'env_workspace' | 'env_personal' | 'service_account'
+    provider_id: string
+    workspace_id: string
+  }
+
+  credential_deleted: {
+    credential_type: 'oauth' | 'env_workspace' | 'env_personal' | 'service_account'
+    provider_id: string
+    workspace_id: string
+  }
+
+  copilot_chat_sent: {
+    workflow_id: string
+    workspace_id: string
+    has_file_attachments: boolean
+    has_contexts: boolean
+    mode: string
+  }
+
+  copilot_panel_opened: Record<string, never>
+
+  copilot_feedback_submitted: {
+    is_positive: boolean
+    has_text_feedback: boolean
+    has_workflow_yaml: boolean
+  }
+
+  /** `template_modules` is a space-separated list of module tags, e.g. `"agent tables knowledge-base"`. */
+  template_used: {
+    template_title: string
+    template_modules: string
+  }
+
+  settings_tab_viewed: {
+    section: string
+  }
+
+  table_opened: {
+    table_id: string
+    workspace_id: string
+  }
+
+  table_created: {
+    table_id: string
+    workspace_id: string
+    column_count: number
+  }
+
+  table_deleted: {
+    table_id: string
+    workspace_id: string
+  }
+
+  /** Fired server-side when a custom tool is created or updated. */
+  custom_tool_saved: {
+    tool_id: string
+    workspace_id: string
+    tool_name: string
+  }
+
+  custom_tool_deleted: {
+    tool_id: string
+    workspace_id: string
+  }
+
+  /** Fired server-side when a new BYOK (bring-your-own-key) provider key is added. */
+  byok_key_added: {
+    workspace_id: string
+    provider_id: string
+  }
+
+  byok_key_removed: {
+    workspace_id: string
+    provider_id: string
+  }
+
+  notification_channel_created: {
+    workspace_id: string
+    notification_type: 'webhook' | 'email' | 'slack'
+    alert_rule: string | null
+  }
+
+  message_sent: {
+    has_attachments: boolean
+    has_contexts: boolean
+  }
+}
+
+export type PostHogEventName = keyof PostHogEventMap
diff --git a/apps/sim/lib/posthog/server.ts b/apps/sim/lib/posthog/server.ts
new file mode 100644
index 00000000000..c2e44c34fe6
--- /dev/null
+++ b/apps/sim/lib/posthog/server.ts
@@ -0,0 +1,110 @@
+import { createLogger } from '@sim/logger'
+import type { PostHogEventMap, PostHogEventName } from '@/lib/posthog/events'
+
+const logger = createLogger('PostHogServer')
+
+let _client: import('posthog-node').PostHog | null = null
+let _disabled = false
+
+function getClient(): import('posthog-node').PostHog | null {
+  if (_disabled) return null
+  if (_client) return _client
+
+  const key = process.env.NEXT_PUBLIC_POSTHOG_KEY
+  const enabled = process.env.NEXT_PUBLIC_POSTHOG_ENABLED
+
+  if (!key || !enabled || enabled === 'false' || enabled === '0') {
+    _disabled = true
+    return null
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { PostHog } = require('posthog-node') as typeof import('posthog-node')
+  _client = new PostHog(key, {
+    host: 'https://us.i.posthog.com',
+    flushAt: 20,
+    flushInterval: 10_000,
+  })
+  return _client
+}
+
+type PersonProperties = Record<string, string | number | boolean>
+
+interface CaptureOptions {
+  /**
+   * Associate this event with workspace-level group analytics.
+   * Pass `{ workspace: workspaceId }`.
+   */
+  groups?: Record<string, string>
+  /**
+   * Person properties to update on every capture (`$set`).
+   * Use for mutable state like `plan`, `total_workflows`.
+   */
+  set?: PersonProperties
+  /**
+   * Person properties to set only once (`$set_once`).
+   * Use for immutable milestones like `first_execution_at`.
+   */
+  setOnce?: PersonProperties
+}
+
+/**
+ * Capture a server-side PostHog event. Fire-and-forget — never throws.
+ *
+ * @param distinctId - The user (or workspace/org) ID to associate the event with.
+ * @param event      - Typed event name from {@link PostHogEventMap}.
+ * @param properties - Strongly-typed property bag for this event.
+ * @param options    - Optional groups, $set, and $set_once person properties.
+ */
+export function captureServerEvent<E extends PostHogEventName>(
+  distinctId: string,
+  event: E,
+  properties: PostHogEventMap[E],
+  options?: CaptureOptions
+): void {
+  try {
+    const client = getClient()
+    if (!client) return
+
+    client.capture({
+      distinctId,
+      event,
+      properties: {
+        ...properties,
+        ...(options?.groups ? { $groups: options.groups } : {}),
+        ...(options?.set ? { $set: options.set } : {}),
+        ...(options?.setOnce ? { $set_once: options.setOnce } : {}),
+      },
+    })
+  } catch (error) {
+    logger.warn('Failed to capture PostHog server event', { event, error })
+  }
+}
+
+/**
+ * Update person properties without firing an event.
+ * Use when a property change happens independently of any trackable action.
+ *
+ * @param distinctId - The user ID to update.
+ * @param set        - Properties to update (mutable state like `plan`).
+ * @param setOnce    - Properties to set only once (milestones like `first_execution_at`).
+ */
+export function identifyServerPerson(
+  distinctId: string,
+  set?: PersonProperties,
+  setOnce?: PersonProperties
+): void {
+  try {
+    const client = getClient()
+    if (!client) return
+    client.identify({
+      distinctId,
+      properties: {
+        ...(set ?? {}),
+        ...(setOnce ? { $set_once: setOnce } : {}),
+      },
+    })
+  } catch (error) {
+    logger.warn('Failed to identify PostHog server person', { error })
+  }
+}
diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts
index 6381d694fd1..65ed5ca9d5f 100644
--- a/apps/sim/lib/workflows/executor/execute-workflow.ts
+++ b/apps/sim/lib/workflows/executor/execute-workflow.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { v4 as uuidv4 } from 'uuid'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
@@ -79,6 +80,8 @@ export async function executeWorkflow(
       streamConfig?.selectedOutputs || []
     )
 
+    const executionStartMs = Date.now()
+
     const result = await executeWorkflowCore({
       snapshot,
       callbacks: {
@@ -97,6 +100,31 @@ export async function executeWorkflow(
       runFromBlock: streamConfig?.runFromBlock,
     })
 
+    const blockTypes = [
+      ...new Set(
+        (result.logs ?? [])
+          .map((log) => log.blockType)
+          .filter((t): t is string => typeof t === 'string')
+      ),
+    ]
+    captureServerEvent(
+      actorUserId,
+      'workflow_executed',
+      {
+        workflow_id: workflowId,
+        workspace_id: workspaceId,
+        trigger_type: triggerType,
+        success: result.success,
+        block_count: result.logs?.length ?? 0,
+        block_types: blockTypes.join(','),
+        duration_ms: Date.now() - executionStartMs,
+      },
+      {
+        groups: { workspace: workspaceId },
+        setOnce: { first_execution_at: new Date().toISOString() },
+      }
+    )
+
     if (result.status === 'paused') {
       if (!result.snapshotSeed) {
         logger.error(`[${requestId}] Missing snapshot seed for paused execution`, {
@@ -139,6 +167,20 @@ export async function executeWorkflow(
     return result
   } catch (error: unknown) {
     logger.error(`[${requestId}] Workflow execution failed:`, error)
+
+    const workspaceId = workflow.workspaceId
+    captureServerEvent(
+      actorUserId,
+      'workflow_execution_failed',
+      {
+        workflow_id: workflow.id,
+        workspace_id: workspaceId ?? '',
+        trigger_type: streamConfig?.workflowTriggerType || 'api',
+        error_message: error instanceof Error ? error.message : String(error),
+      },
+      workspaceId ? { groups: { workspace: workspaceId } } : undefined
+    )
+
     throw error
   }
 }
diff --git a/apps/sim/stores/panel/store.ts b/apps/sim/stores/panel/store.ts
index 5e7d0c74015..a57e922d1d1 100644
--- a/apps/sim/stores/panel/store.ts
+++ b/apps/sim/stores/panel/store.ts
@@ -28,6 +28,11 @@ export const usePanelStore = create<PanelState>()(
         if (typeof document !== 'undefined') {
           document.documentElement.removeAttribute('data-panel-active-tab')
         }
+        if (tab === 'copilot') {
+          import('@/lib/posthog/client')
+            .then(({ captureClientEvent }) => captureClientEvent('copilot_panel_opened', {}))
+            .catch(() => {})
+        }
       },
       isResizing: false,
       setIsResizing: (isResizing) => {
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 0ddbf8d420b..53bac38bd26 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -316,6 +316,17 @@ export const useWorkflowStore = create<WorkflowStore>()(
           }
         }
 
+        if (blocks.length === 1) {
+          import('@/lib/posthog/client')
+            .then(({ captureClientEvent }) => {
+              captureClientEvent('block_added', {
+                block_type: blocks[0].type,
+                workflow_id: get().currentWorkflowId ?? 'unknown',
+              })
+            })
+            .catch(() => {})
+        }
+
         get().updateLastSaved()
       },
 
@@ -368,6 +379,10 @@ export const useWorkflowStore = create<WorkflowStore>()(
           }
         }
 
+        const removedBlockTypes = [...blocksToRemove]
+          .map((id) => currentBlocks[id]?.type)
+          .filter((t): t is string => typeof t === 'string')
+
         set({
           blocks: newBlocks,
           edges: newEdges,
@@ -375,6 +390,17 @@ export const useWorkflowStore = create<WorkflowStore>()(
           parallels: generateParallelBlocks(newBlocks),
         })
 
+        if (removedBlockTypes.length === 1) {
+          import('@/lib/posthog/client')
+            .then(({ captureClientEvent }) => {
+              captureClientEvent('block_removed', {
+                block_type: removedBlockTypes[0],
+                workflow_id: get().currentWorkflowId ?? 'unknown',
+              })
+            })
+            .catch(() => {})
+        }
+
         get().updateLastSaved()
       },
 

From 4595e69646e2bd6e697b71e2a7e47e58609fe048 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 19:13:41 -0700
Subject: [PATCH 02/20] fix(posthog): fix workspace group via URL params, type
 errors, and clean up comments

---
 apps/sim/app/(auth)/signup/signup-form.tsx                | 8 +++++++-
 apps/sim/app/(home)/landing-analytics.tsx                 | 5 -----
 apps/sim/app/(home)/landing.tsx                           | 2 ++
 apps/sim/app/_shell/providers/session-provider.tsx        | 5 -----
 .../api/knowledge/[id]/connectors/[connectorId]/route.ts  | 5 +++--
 .../knowledge/[id]/connectors/[connectorId]/sync/route.ts | 5 +++--
 apps/sim/app/api/knowledge/[id]/connectors/route.ts       | 5 +++--
 .../[workspaceId]/providers/workspace-scope-sync.tsx      | 7 +++++++
 .../tables/[tableId]/components/table/table.tsx           | 7 +++++++
 apps/sim/lib/posthog/events.ts                            | 4 ----
 10 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/apps/sim/app/(auth)/signup/signup-form.tsx b/apps/sim/app/(auth)/signup/signup-form.tsx
index c3db07b511e..f51280c9247 100644
--- a/apps/sim/app/(auth)/signup/signup-form.tsx
+++ b/apps/sim/app/(auth)/signup/signup-form.tsx
@@ -1,11 +1,12 @@
 'use client'
 
-import { Suspense, useMemo, useRef, useState } from 'react'
+import { Suspense, useEffect, useMemo, useRef, useState } from 'react'
 import { Turnstile, type TurnstileInstance } from '@marsidev/react-turnstile'
 import { createLogger } from '@sim/logger'
 import { Eye, EyeOff, Loader2 } from 'lucide-react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import { Input, Label } from '@/components/emcn'
 import { client, useSession } from '@/lib/auth/auth-client'
 import { getEnv, isFalsy, isTruthy } from '@/lib/core/config/env'
@@ -81,7 +82,12 @@ function SignupFormContent({
   const router = useRouter()
   const searchParams = useSearchParams()
   const { refetch: refetchSession } = useSession()
+  const posthog = usePostHog()
   const [isLoading, setIsLoading] = useState(false)
+
+  useEffect(() => {
+    posthog?.capture('signup_page_viewed', {})
+  }, [posthog])
   const [showPassword, setShowPassword] = useState(false)
   const [password, setPassword] = useState('')
   const [passwordErrors, setPasswordErrors] = useState<string[]>([])
diff --git a/apps/sim/app/(home)/landing-analytics.tsx b/apps/sim/app/(home)/landing-analytics.tsx
index 446fbdcf622..652aaba5da5 100644
--- a/apps/sim/app/(home)/landing-analytics.tsx
+++ b/apps/sim/app/(home)/landing-analytics.tsx
@@ -3,11 +3,6 @@
 import { useEffect } from 'react'
 import { usePostHog } from 'posthog-js/react'
 
-/**
- * Fires a `landing_page_viewed` PostHog event on mount.
- * Renders nothing — exists only to bridge the server/client boundary
- * so the server-rendered landing page can emit analytics.
- */
 export function LandingAnalytics() {
   const posthog = usePostHog()
 
diff --git a/apps/sim/app/(home)/landing.tsx b/apps/sim/app/(home)/landing.tsx
index 43a1d665a13..31e17a118d7 100644
--- a/apps/sim/app/(home)/landing.tsx
+++ b/apps/sim/app/(home)/landing.tsx
@@ -13,6 +13,7 @@ import {
   Templates,
   Testimonials,
 } from '@/app/(home)/components'
+import { LandingAnalytics } from '@/app/(home)/landing-analytics'
 
 /**
  * Landing page root component.
@@ -45,6 +46,7 @@ export default async function Landing() {
       >
         Skip to main content
       </a>
+      <LandingAnalytics />
       <StructuredData />
       <header>
         <Navbar blogPosts={blogPosts} />
diff --git a/apps/sim/app/_shell/providers/session-provider.tsx b/apps/sim/app/_shell/providers/session-provider.tsx
index c7a2ac19b96..b2fe1fb43f2 100644
--- a/apps/sim/app/_shell/providers/session-provider.tsx
+++ b/apps/sim/app/_shell/providers/session-provider.tsx
@@ -92,11 +92,6 @@ export function SessionProvider({ children }: { children: React.ReactNode }) {
               email_verified: data.user.emailVerified,
               created_at: data.user.createdAt,
             })
-
-            const workspaceId = data.session?.activeOrganizationId
-            if (workspaceId && typeof posthog.group === 'function') {
-              posthog.group('workspace', workspaceId)
-            }
           } else {
             posthog.reset()
           }
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts
index 0533582ed34..f09f3365373 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/route.ts
@@ -352,16 +352,17 @@ export async function DELETE(request: NextRequest, { params }: RouteParams) {
       `[${requestId}] Deleted connector ${connectorId}${deleteDocuments ? ` and ${docCount} documents` : `, kept ${docCount} documents`}`
     )
 
+    const kbWorkspaceId = writeCheck.knowledgeBase.workspaceId ?? ''
     captureServerEvent(
       auth.userId,
       'knowledge_base_connector_removed',
       {
         knowledge_base_id: knowledgeBaseId,
-        workspace_id: writeCheck.knowledgeBase.workspaceId,
+        workspace_id: kbWorkspaceId,
         connector_type: existingConnector[0].connectorType,
         documents_deleted: deleteDocuments ? docCount : 0,
       },
-      { groups: { workspace: writeCheck.knowledgeBase.workspaceId } }
+      kbWorkspaceId ? { groups: { workspace: kbWorkspaceId } } : undefined
     )
 
     recordAudit({
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts
index 9c08175c926..df7057fc904 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/[connectorId]/sync/route.ts
@@ -56,15 +56,16 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
 
     logger.info(`[${requestId}] Manual sync triggered for connector ${connectorId}`)
 
+    const kbWorkspaceId = writeCheck.knowledgeBase.workspaceId ?? ''
     captureServerEvent(
       auth.userId,
       'knowledge_base_connector_synced',
       {
         knowledge_base_id: knowledgeBaseId,
-        workspace_id: writeCheck.knowledgeBase.workspaceId,
+        workspace_id: kbWorkspaceId,
         connector_type: connectorRows[0].connectorType,
       },
-      { groups: { workspace: writeCheck.knowledgeBase.workspaceId } }
+      kbWorkspaceId ? { groups: { workspace: kbWorkspaceId } } : undefined
     )
 
     recordAudit({
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/route.ts
index 48ebb5efc70..5105d23b217 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/route.ts
@@ -228,17 +228,18 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     logger.info(`[${requestId}] Created connector ${connectorId} for KB ${knowledgeBaseId}`)
 
+    const kbWorkspaceId = writeCheck.knowledgeBase.workspaceId ?? ''
     captureServerEvent(
       auth.userId,
       'knowledge_base_connector_added',
       {
         knowledge_base_id: knowledgeBaseId,
-        workspace_id: writeCheck.knowledgeBase.workspaceId,
+        workspace_id: kbWorkspaceId,
         connector_type: connectorType,
         sync_interval_minutes: syncIntervalMinutes,
       },
       {
-        groups: { workspace: writeCheck.knowledgeBase.workspaceId },
+        groups: kbWorkspaceId ? { workspace: kbWorkspaceId } : undefined,
         setOnce: { first_connector_added_at: new Date().toISOString() },
       }
     )
diff --git a/apps/sim/app/workspace/[workspaceId]/providers/workspace-scope-sync.tsx b/apps/sim/app/workspace/[workspaceId]/providers/workspace-scope-sync.tsx
index 6ffcb96facc..72c859a4a56 100644
--- a/apps/sim/app/workspace/[workspaceId]/providers/workspace-scope-sync.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/providers/workspace-scope-sync.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect } from 'react'
 import { useParams } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 /**
@@ -11,6 +12,12 @@ export function WorkspaceScopeSync() {
   const { workspaceId } = useParams<{ workspaceId: string }>()
   const hydrationWorkspaceId = useWorkflowRegistry((state) => state.hydration.workspaceId)
   const switchToWorkspace = useWorkflowRegistry((state) => state.switchToWorkspace)
+  const posthog = usePostHog()
+
+  useEffect(() => {
+    if (!workspaceId) return
+    posthog?.group('workspace', workspaceId)
+  }, [posthog, workspaceId])
 
   useEffect(() => {
     if (!workspaceId || hydrationWorkspaceId === workspaceId) {
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
index 28086ac8869..233518084d4 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
@@ -3,6 +3,7 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { GripVertical } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import {
   Button,
   Checkbox,
@@ -177,6 +178,12 @@ export function Table({
   const router = useRouter()
   const workspaceId = propWorkspaceId || (params.workspaceId as string)
   const tableId = propTableId || (params.tableId as string)
+  const posthog = usePostHog()
+
+  useEffect(() => {
+    if (!tableId || !workspaceId) return
+    posthog?.capture('table_opened', { table_id: tableId, workspace_id: workspaceId })
+  }, [tableId, workspaceId, posthog])
 
   const [queryOptions, setQueryOptions] = useState<QueryOptions>({
     filter: null,
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
index 983b9113aca..fc7dde61647 100644
--- a/apps/sim/lib/posthog/events.ts
+++ b/apps/sim/lib/posthog/events.ts
@@ -93,7 +93,6 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
-  /** Fired server-side when a user reverts a workflow canvas to a prior deployment snapshot. */
   workflow_deployment_reverted: {
     workflow_id: string
     workspace_id: string
@@ -105,7 +104,6 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
-  /** Fired server-side when a workflow is exposed as an A2A agent. */
   a2a_agent_created: {
     agent_id: string
     workflow_id: string
@@ -241,7 +239,6 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
-  /** Fired server-side when a custom tool is created or updated. */
   custom_tool_saved: {
     tool_id: string
     workspace_id: string
@@ -253,7 +250,6 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
-  /** Fired server-side when a new BYOK (bring-your-own-key) provider key is added. */
   byok_key_added: {
     workspace_id: string
     provider_id: string

From 2f187ea6001cd944b592a9b3caca0c7ce3fdbf72 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 19:20:40 -0700
Subject: [PATCH 03/20] fix(posthog): address PR review - fix pre-tx event,
 auth_method, paused executions, enterprise cancellation, settings double-fire

---
 apps/sim/app/api/workflows/route.ts           | 17 +++++----
 .../settings/[section]/settings.tsx           | 10 +++--
 apps/sim/lib/auth/auth.ts                     | 37 +++++++++++++++----
 apps/sim/lib/billing/webhooks/subscription.ts | 11 ++++++
 .../workflows/executor/execute-workflow.ts    | 36 +++++++++---------
 5 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/apps/sim/app/api/workflows/route.ts b/apps/sim/app/api/workflows/route.ts
index 19cb28f5ce3..22a778da22e 100644
--- a/apps/sim/app/api/workflows/route.ts
+++ b/apps/sim/app/api/workflows/route.ts
@@ -250,13 +250,6 @@ export async function POST(req: NextRequest) {
         // Silently fail
       })
 
-    captureServerEvent(
-      userId,
-      'workflow_created',
-      { workflow_id: workflowId, workspace_id: workspaceId ?? '', name },
-      { groups: { workspace: workspaceId ?? '' } }
-    )
-
     const { workflowState, subBlockValues, startBlockId } = buildDefaultWorkflowArtifacts()
 
     await db.transaction(async (tx) => {
@@ -282,6 +275,16 @@ export async function POST(req: NextRequest) {
 
     logger.info(`[${requestId}] Successfully created workflow ${workflowId} with default blocks`)
 
+    captureServerEvent(
+      userId,
+      'workflow_created',
+      { workflow_id: workflowId, workspace_id: workspaceId ?? '', name },
+      {
+        groups: { workspace: workspaceId ?? '' },
+        setOnce: { first_workflow_created_at: new Date().toISOString() },
+      }
+    )
+
     recordAudit({
       workspaceId,
       actorId: userId,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
index 5506ec95781..f54038c8035 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect } from 'react'
+import { useEffect, useRef } from 'react'
 import dynamic from 'next/dynamic'
 import { useSearchParams } from 'next/navigation'
 import { usePostHog } from 'posthog-js/react'
@@ -163,6 +163,10 @@ export function SettingsPage({ section }: SettingsPageProps) {
   const mcpServerId = searchParams.get('mcpServerId')
   const { data: session, isPending: sessionLoading } = useSession()
   const posthog = usePostHog()
+  const posthogRef = useRef(posthog)
+  useEffect(() => {
+    posthogRef.current = posthog
+  }, [posthog])
 
   const isAdminRole = session?.user?.role === 'admin'
   const effectiveSection =
@@ -179,8 +183,8 @@ export function SettingsPage({ section }: SettingsPageProps) {
 
   useEffect(() => {
     if (sessionLoading) return
-    posthog?.capture('settings_tab_viewed', { section: effectiveSection })
-  }, [effectiveSection, sessionLoading, posthog])
+    posthogRef.current?.capture('settings_tab_viewed', { section: effectiveSection })
+  }, [effectiveSection, sessionLoading])
 
   return (
     <div>
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 31d69ca908f..9a853e32850 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -20,7 +20,7 @@ import {
   organization,
 } from 'better-auth/plugins'
 import { emailHarmony } from 'better-auth-harmony'
-import { and, eq, inArray, sql } from 'drizzle-orm'
+import { and, count, eq, inArray, sql } from 'drizzle-orm'
 import { headers } from 'next/headers'
 import Stripe from 'stripe'
 import {
@@ -191,13 +191,6 @@ export const auth = betterAuth({
             // Telemetry should not fail the operation
           }
 
-          captureServerEvent(
-            user.id,
-            'user_created',
-            { auth_method: 'email' },
-            { setOnce: { signup_at: new Date().toISOString() } }
-          )
-
           try {
             await handleNewUser(user.id)
           } catch (error) {
@@ -377,6 +370,34 @@ export const auth = betterAuth({
             })
           }
 
+          try {
+            const [{ value: accountCount }] = await db
+              .select({ value: count() })
+              .from(schema.account)
+              .where(eq(schema.account.userId, account.userId))
+
+            if (accountCount === 1) {
+              const isOAuth = account.providerId !== 'credential'
+              captureServerEvent(
+                account.userId,
+                'user_created',
+                {
+                  auth_method: isOAuth ? 'oauth' : 'email',
+                  ...(isOAuth ? { provider: account.providerId } : {}),
+                },
+                { setOnce: { signup_at: new Date().toISOString() } }
+              )
+            }
+          } catch (error) {
+            logger.error(
+              '[databaseHooks.account.create.after] Failed to capture user_created event',
+              {
+                userId: account.userId,
+                error,
+              }
+            )
+          }
+
           if (account.providerId === 'salesforce') {
             const updates: {
               accessTokenExpiresAt?: Date
diff --git a/apps/sim/lib/billing/webhooks/subscription.ts b/apps/sim/lib/billing/webhooks/subscription.ts
index 1b54a0f11d5..00be3f7f633 100644
--- a/apps/sim/lib/billing/webhooks/subscription.ts
+++ b/apps/sim/lib/billing/webhooks/subscription.ts
@@ -219,6 +219,17 @@ export async function handleSubscriptionDeleted(subscription: {
         organizationDeleted,
         membersSynced,
       })
+
+      captureServerEvent(
+        subscription.referenceId,
+        'subscription_cancelled',
+        {
+          plan: subscription.plan ?? 'unknown',
+          reference_id: subscription.referenceId,
+        },
+        { set: { plan: 'free' } }
+      )
+
       return
     }
 
diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts
index 65ed5ca9d5f..7bc2db7b053 100644
--- a/apps/sim/lib/workflows/executor/execute-workflow.ts
+++ b/apps/sim/lib/workflows/executor/execute-workflow.ts
@@ -107,23 +107,25 @@ export async function executeWorkflow(
           .filter((t): t is string => typeof t === 'string')
       ),
     ]
-    captureServerEvent(
-      actorUserId,
-      'workflow_executed',
-      {
-        workflow_id: workflowId,
-        workspace_id: workspaceId,
-        trigger_type: triggerType,
-        success: result.success,
-        block_count: result.logs?.length ?? 0,
-        block_types: blockTypes.join(','),
-        duration_ms: Date.now() - executionStartMs,
-      },
-      {
-        groups: { workspace: workspaceId },
-        setOnce: { first_execution_at: new Date().toISOString() },
-      }
-    )
+    if (result.status !== 'paused') {
+      captureServerEvent(
+        actorUserId,
+        'workflow_executed',
+        {
+          workflow_id: workflowId,
+          workspace_id: workspaceId,
+          trigger_type: triggerType,
+          success: result.success,
+          block_count: result.logs?.length ?? 0,
+          block_types: blockTypes.join(','),
+          duration_ms: Date.now() - executionStartMs,
+        },
+        {
+          groups: { workspace: workspaceId },
+          setOnce: { first_execution_at: new Date().toISOString() },
+        }
+      )
+    }
 
     if (result.status === 'paused') {
       if (!result.snapshotSeed) {

From 51d728f3a377f2761eb9d7848d3ce66261ac1d15 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 19:22:29 -0700
Subject: [PATCH 04/20] chore(posthog): remove unused identifyServerPerson

---
 apps/sim/lib/posthog/server.ts | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/apps/sim/lib/posthog/server.ts b/apps/sim/lib/posthog/server.ts
index c2e44c34fe6..f2c1947ec39 100644
--- a/apps/sim/lib/posthog/server.ts
+++ b/apps/sim/lib/posthog/server.ts
@@ -80,31 +80,3 @@ export function captureServerEvent<E extends PostHogEventName>(
     logger.warn('Failed to capture PostHog server event', { event, error })
   }
 }
-
-/**
- * Update person properties without firing an event.
- * Use when a property change happens independently of any trackable action.
- *
- * @param distinctId - The user ID to update.
- * @param set        - Properties to update (mutable state like `plan`).
- * @param setOnce    - Properties to set only once (milestones like `first_execution_at`).
- */
-export function identifyServerPerson(
-  distinctId: string,
-  set?: PersonProperties,
-  setOnce?: PersonProperties
-): void {
-  try {
-    const client = getClient()
-    if (!client) return
-    client.identify({
-      distinctId,
-      properties: {
-        ...(set ?? {}),
-        ...(setOnce ? { $set_once: setOnce } : {}),
-      },
-    })
-  } catch (error) {
-    logger.warn('Failed to identify PostHog server person', { error })
-  }
-}

From 419b1f5c95a68eeea5da188b772e627b3a4eb826 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 20:07:05 -0700
Subject: [PATCH 05/20] fix(posthog): isolate processQueuedResumes errors,
 simplify settings posthog deps

---
 .../[workspaceId]/settings/[section]/settings.tsx      | 10 +++-------
 apps/sim/lib/workflows/executor/execute-workflow.ts    |  9 ++++++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
index f54038c8035..5506ec95781 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useRef } from 'react'
+import { useEffect } from 'react'
 import dynamic from 'next/dynamic'
 import { useSearchParams } from 'next/navigation'
 import { usePostHog } from 'posthog-js/react'
@@ -163,10 +163,6 @@ export function SettingsPage({ section }: SettingsPageProps) {
   const mcpServerId = searchParams.get('mcpServerId')
   const { data: session, isPending: sessionLoading } = useSession()
   const posthog = usePostHog()
-  const posthogRef = useRef(posthog)
-  useEffect(() => {
-    posthogRef.current = posthog
-  }, [posthog])
 
   const isAdminRole = session?.user?.role === 'admin'
   const effectiveSection =
@@ -183,8 +179,8 @@ export function SettingsPage({ section }: SettingsPageProps) {
 
   useEffect(() => {
     if (sessionLoading) return
-    posthogRef.current?.capture('settings_tab_viewed', { section: effectiveSection })
-  }, [effectiveSection, sessionLoading])
+    posthog?.capture('settings_tab_viewed', { section: effectiveSection })
+  }, [effectiveSection, sessionLoading, posthog])
 
   return (
     <div>
diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts
index 7bc2db7b053..e24520e1380 100644
--- a/apps/sim/lib/workflows/executor/execute-workflow.ts
+++ b/apps/sim/lib/workflows/executor/execute-workflow.ts
@@ -153,7 +153,14 @@ export async function executeWorkflow(
         }
       }
     } else {
-      await PauseResumeManager.processQueuedResumes(executionId)
+      try {
+        await PauseResumeManager.processQueuedResumes(executionId)
+      } catch (resumeError) {
+        logger.error(`[${requestId}] Failed to process queued resumes`, {
+          executionId,
+          error: resumeError instanceof Error ? resumeError.message : String(resumeError),
+        })
+      }
     }
 
     if (streamConfig?.skipLoggingComplete) {

From 1209cd7eb9eafb9e3b0efb24d2f2c4e61eb50ef7 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 20:13:34 -0700
Subject: [PATCH 06/20] fix(posthog): correctly classify SSO auth_method, fix
 phantom empty-string workspace groups

---
 apps/sim/app/api/workflows/[id]/duplicate/route.ts |  2 +-
 apps/sim/app/api/workflows/route.ts                |  2 +-
 apps/sim/lib/auth/auth.ts                          | 12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/sim/app/api/workflows/[id]/duplicate/route.ts b/apps/sim/app/api/workflows/[id]/duplicate/route.ts
index 157dd4a924b..63c230f686b 100644
--- a/apps/sim/app/api/workflows/[id]/duplicate/route.ts
+++ b/apps/sim/app/api/workflows/[id]/duplicate/route.ts
@@ -69,7 +69,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
         new_workflow_id: result.id,
         workspace_id: workspaceId ?? '',
       },
-      { groups: { workspace: workspaceId ?? '' } }
+      workspaceId ? { groups: { workspace: workspaceId } } : undefined
     )
 
     const elapsed = Date.now() - startTime
diff --git a/apps/sim/app/api/workflows/route.ts b/apps/sim/app/api/workflows/route.ts
index 22a778da22e..cab2bbb2324 100644
--- a/apps/sim/app/api/workflows/route.ts
+++ b/apps/sim/app/api/workflows/route.ts
@@ -280,7 +280,7 @@ export async function POST(req: NextRequest) {
       'workflow_created',
       { workflow_id: workflowId, workspace_id: workspaceId ?? '', name },
       {
-        groups: { workspace: workspaceId ?? '' },
+        groups: workspaceId ? { workspace: workspaceId } : undefined,
         setOnce: { first_workflow_created_at: new Date().toISOString() },
       }
     )
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 9a853e32850..67fcb60cfbd 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -377,13 +377,19 @@ export const auth = betterAuth({
               .where(eq(schema.account.userId, account.userId))
 
             if (accountCount === 1) {
-              const isOAuth = account.providerId !== 'credential'
+              const { providerId } = account
+              const authMethod =
+                providerId === 'credential'
+                  ? 'email'
+                  : SSO_TRUSTED_PROVIDERS.includes(providerId)
+                    ? 'sso'
+                    : 'oauth'
               captureServerEvent(
                 account.userId,
                 'user_created',
                 {
-                  auth_method: isOAuth ? 'oauth' : 'email',
-                  ...(isOAuth ? { provider: account.providerId } : {}),
+                  auth_method: authMethod,
+                  ...(providerId !== 'credential' ? { provider: providerId } : {}),
                 },
                 { setOnce: { signup_at: new Date().toISOString() } }
               )

From efec6d92581c97d4611a6f0f518bde0ffa6ead5e Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 22:35:00 -0700
Subject: [PATCH 07/20] fix(posthog): remove usePostHog from memo'd
 TemplateCard, fix copilot chat phantom workspace group

---
 apps/sim/app/api/copilot/chat/route.ts             |  2 +-
 .../template-prompts/template-prompts.tsx          | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts
index b0e001e4e8e..647f0058528 100644
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -200,7 +200,7 @@ export async function POST(req: NextRequest) {
         mode,
       },
       {
-        groups: { workspace: resolvedWorkspaceId ?? '' },
+        groups: resolvedWorkspaceId ? { workspace: resolvedWorkspaceId } : undefined,
         setOnce: { first_copilot_use_at: new Date().toISOString() },
       }
     )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx
index 057821b1e08..b0bf8532f99 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/template-prompts/template-prompts.tsx
@@ -2,7 +2,6 @@
 
 import { type ComponentType, memo, type SVGProps } from 'react'
 import Image from 'next/image'
-import { usePostHog } from 'posthog-js/react'
 import { AgentIcon, ScheduleIcon, StartIcon } from '@/components/icons'
 import type { Category, ModuleTag } from './consts'
 import { CATEGORY_META, TEMPLATES } from './consts'
@@ -350,16 +349,19 @@ interface TemplateCardProps {
 
 const TemplateCard = memo(function TemplateCard({ template, onSelect }: TemplateCardProps) {
   const Icon = template.icon
-  const posthog = usePostHog()
 
   return (
     <button
       type='button'
       onClick={() => {
-        posthog?.capture('template_used', {
-          template_title: template.title,
-          template_modules: template.modules.join(' '),
-        })
+        import('@/lib/posthog/client')
+          .then(({ captureClientEvent }) => {
+            captureClientEvent('template_used', {
+              template_title: template.title,
+              template_modules: template.modules.join(' '),
+            })
+          })
+          .catch(() => {})
         onSelect(template.prompt)
       }}
       aria-label={`Select template: ${template.title}`}

From f0fdda0aa18feb437b89f0e8196333170d4eefa8 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 22:39:08 -0700
Subject: [PATCH 08/20] fix(posthog): eliminate all remaining phantom
 empty-string workspace groups

---
 apps/sim/app/api/workflows/[id]/deploy/route.ts               | 2 +-
 .../api/workflows/[id]/deployments/[version]/revert/route.ts  | 4 +++-
 apps/sim/app/api/workflows/[id]/route.ts                      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/sim/app/api/workflows/[id]/deploy/route.ts b/apps/sim/app/api/workflows/[id]/deploy/route.ts
index ff6eac774c6..b7a651042bb 100644
--- a/apps/sim/app/api/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deploy/route.ts
@@ -102,7 +102,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       'workflow_deployed',
       { workflow_id: id, workspace_id: workflowData!.workspaceId ?? '' },
       {
-        groups: { workspace: workflowData!.workspaceId ?? '' },
+        groups: workflowData!.workspaceId ? { workspace: workflowData!.workspaceId } : undefined,
         setOnce: { first_workflow_deployed_at: new Date().toISOString() },
       }
     )
diff --git a/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts b/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts
index 3dac9d2d6bd..618a1de8f94 100644
--- a/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts
@@ -113,7 +113,9 @@ export async function POST(
         workspace_id: workflowRecord?.workspaceId ?? '',
         version,
       },
-      { groups: { workspace: workflowRecord?.workspaceId ?? '' } }
+      workflowRecord?.workspaceId
+        ? { groups: { workspace: workflowRecord.workspaceId } }
+        : undefined
     )
 
     recordAudit({
diff --git a/apps/sim/app/api/workflows/[id]/route.ts b/apps/sim/app/api/workflows/[id]/route.ts
index c610a54d8d4..95a6ee43dc7 100644
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -230,7 +230,7 @@ export async function DELETE(
       userId,
       'workflow_deleted',
       { workflow_id: workflowId, workspace_id: workflowData.workspaceId ?? '' },
-      { groups: { workspace: workflowData.workspaceId ?? '' } }
+      workflowData.workspaceId ? { groups: { workspace: workflowData.workspaceId } } : undefined
     )
 
     const elapsed = Date.now() - startTime

From 408133039121550820f3a9531be5a9bf072af762 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 22:46:11 -0700
Subject: [PATCH 09/20] fix(posthog): fix cancel route phantom group, remove
 redundant workspaceId shadow in catch block

---
 .../workflows/[id]/executions/[executionId]/cancel/route.ts | 6 +++---
 apps/sim/lib/workflows/executor/execute-workflow.ts         | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
index a6eed00a80a..4fb045c5816 100644
--- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
+++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/cancel/route.ts
@@ -62,12 +62,12 @@ export async function POST(
     }
 
     if (cancellation.durablyRecorded || locallyAborted) {
-      const workspaceId = workflowAuthorization.workflow?.workspaceId ?? ''
+      const workspaceId = workflowAuthorization.workflow?.workspaceId
       captureServerEvent(
         auth.userId,
         'workflow_execution_cancelled',
-        { workflow_id: workflowId, workspace_id: workspaceId },
-        { groups: { workspace: workspaceId } }
+        { workflow_id: workflowId, workspace_id: workspaceId ?? '' },
+        workspaceId ? { groups: { workspace: workspaceId } } : undefined
       )
     }
 
diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts
index e24520e1380..3101ef9f860 100644
--- a/apps/sim/lib/workflows/executor/execute-workflow.ts
+++ b/apps/sim/lib/workflows/executor/execute-workflow.ts
@@ -177,17 +177,16 @@ export async function executeWorkflow(
   } catch (error: unknown) {
     logger.error(`[${requestId}] Workflow execution failed:`, error)
 
-    const workspaceId = workflow.workspaceId
     captureServerEvent(
       actorUserId,
       'workflow_execution_failed',
       {
         workflow_id: workflow.id,
-        workspace_id: workspaceId ?? '',
+        workspace_id: workspaceId,
         trigger_type: streamConfig?.workflowTriggerType || 'api',
         error_message: error instanceof Error ? error.message : String(error),
       },
-      workspaceId ? { groups: { workspace: workspaceId } } : undefined
+      { groups: { workspace: workspaceId } }
     )
 
     throw error

From c0fe910848c4fb60ada636428813cd7ec556bfa0 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 23:10:03 -0700
Subject: [PATCH 10/20] fix(posthog): use ids.length for block_removed guard to
 handle container blocks with descendants

---
 apps/sim/stores/workflows/workflow/store.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 53bac38bd26..583173d24d6 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -390,15 +390,18 @@ export const useWorkflowStore = create<WorkflowStore>()(
           parallels: generateParallelBlocks(newBlocks),
         })
 
-        if (removedBlockTypes.length === 1) {
-          import('@/lib/posthog/client')
-            .then(({ captureClientEvent }) => {
-              captureClientEvent('block_removed', {
-                block_type: removedBlockTypes[0],
-                workflow_id: get().currentWorkflowId ?? 'unknown',
+        if (ids.length === 1) {
+          const blockType = currentBlocks[ids[0]]?.type
+          if (blockType) {
+            import('@/lib/posthog/client')
+              .then(({ captureClientEvent }) => {
+                captureClientEvent('block_removed', {
+                  block_type: blockType,
+                  workflow_id: get().currentWorkflowId ?? 'unknown',
+                })
               })
-            })
-            .catch(() => {})
+              .catch(() => {})
+          }
         }
 
         get().updateLastSaved()

From a584e9577bc56e34058bb319c7eba9e8c0db456e Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 23:20:44 -0700
Subject: [PATCH 11/20] chore(posthog): remove unused removedBlockTypes
 variable

---
 apps/sim/stores/workflows/workflow/store.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 583173d24d6..45bfa0d5659 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -379,10 +379,6 @@ export const useWorkflowStore = create<WorkflowStore>()(
           }
         }
 
-        const removedBlockTypes = [...blocksToRemove]
-          .map((id) => currentBlocks[id]?.type)
-          .filter((t): t is string => typeof t === 'string')
-
         set({
           blocks: newBlocks,
           edges: newEdges,

From 6f69a00613d64294bebc9b09c4de1b2caf4a520b Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 23:41:11 -0700
Subject: [PATCH 12/20] fix(posthog): remove phantom $set person properties
 from subscription events

---
 apps/sim/lib/billing/webhooks/subscription.ts | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/apps/sim/lib/billing/webhooks/subscription.ts b/apps/sim/lib/billing/webhooks/subscription.ts
index 00be3f7f633..8c261a6f458 100644
--- a/apps/sim/lib/billing/webhooks/subscription.ts
+++ b/apps/sim/lib/billing/webhooks/subscription.ts
@@ -158,16 +158,11 @@ export async function handleSubscriptionCreated(subscriptionData: {
     }
 
     if (wasFreePreviously && isPaidPlan) {
-      captureServerEvent(
-        subscriptionData.referenceId,
-        'subscription_created',
-        {
-          plan: subscriptionData.plan ?? 'unknown',
-          status: subscriptionData.status,
-          reference_id: subscriptionData.referenceId,
-        },
-        { set: { plan: subscriptionData.plan ?? 'unknown' } }
-      )
+      captureServerEvent(subscriptionData.referenceId, 'subscription_created', {
+        plan: subscriptionData.plan ?? 'unknown',
+        status: subscriptionData.status,
+        reference_id: subscriptionData.referenceId,
+      })
     }
   } catch (error) {
     logger.error('Failed to handle subscription creation usage reset', {
@@ -220,15 +215,10 @@ export async function handleSubscriptionDeleted(subscription: {
         membersSynced,
       })
 
-      captureServerEvent(
-        subscription.referenceId,
-        'subscription_cancelled',
-        {
-          plan: subscription.plan ?? 'unknown',
-          reference_id: subscription.referenceId,
-        },
-        { set: { plan: 'free' } }
-      )
+      captureServerEvent(subscription.referenceId, 'subscription_cancelled', {
+        plan: subscription.plan ?? 'unknown',
+        reference_id: subscription.referenceId,
+      })
 
       return
     }
@@ -363,15 +353,10 @@ export async function handleSubscriptionDeleted(subscription: {
       membersSynced,
     })
 
-    captureServerEvent(
-      subscription.referenceId,
-      'subscription_cancelled',
-      {
-        plan: subscription.plan ?? 'unknown',
-        reference_id: subscription.referenceId,
-      },
-      { set: { plan: 'free' } }
-    )
+    captureServerEvent(subscription.referenceId, 'subscription_cancelled', {
+      plan: subscription.plan ?? 'unknown',
+      reference_id: subscription.referenceId,
+    })
   } catch (error) {
     logger.error('Failed to handle subscription deletion', {
       subscriptionId: subscription.id,

From b1a5816fd520a6476282eb4fd6d2dbb1863aaa9c Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 23:42:04 -0700
Subject: [PATCH 13/20] fix(posthog): add passedKnowledgeBaseName to
 knowledge_base_opened effect deps

---
 apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
index 7bb54a0b544..7baa20fac20 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
@@ -198,7 +198,7 @@ export function KnowledgeBase({
       knowledge_base_id: id,
       knowledge_base_name: passedKnowledgeBaseName ?? 'Unknown',
     })
-  }, [id, posthog])
+  }, [id, passedKnowledgeBaseName, posthog])
 
   useOAuthReturnForKBConnectors(id)
   const { removeKnowledgeBase } = useKnowledgeBasesList(workspaceId, { enabled: false })

From 80cdd1256a6224aff7e9adffa2fb22a9ed13a4ee Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Thu, 2 Apr 2026 23:53:31 -0700
Subject: [PATCH 14/20] fix(posthog): capture currentWorkflowId synchronously
 before async import to avoid stale closure

---
 apps/sim/stores/workflows/workflow/store.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 45bfa0d5659..d8f55d52ec6 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -317,11 +317,12 @@ export const useWorkflowStore = create<WorkflowStore>()(
         }
 
         if (blocks.length === 1) {
+          const workflowId = get().currentWorkflowId ?? 'unknown'
           import('@/lib/posthog/client')
             .then(({ captureClientEvent }) => {
               captureClientEvent('block_added', {
                 block_type: blocks[0].type,
-                workflow_id: get().currentWorkflowId ?? 'unknown',
+                workflow_id: workflowId,
               })
             })
             .catch(() => {})
@@ -389,11 +390,12 @@ export const useWorkflowStore = create<WorkflowStore>()(
         if (ids.length === 1) {
           const blockType = currentBlocks[ids[0]]?.type
           if (blockType) {
+            const workflowId = get().currentWorkflowId ?? 'unknown'
             import('@/lib/posthog/client')
               .then(({ captureClientEvent }) => {
                 captureClientEvent('block_removed', {
                   block_type: blockType,
-                  workflow_id: get().currentWorkflowId ?? 'unknown',
+                  workflow_id: workflowId,
                 })
               })
               .catch(() => {})

From 6a7b02b640b1749a3e21217b16833eb7e83ac0e3 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 3 Apr 2026 00:04:21 -0700
Subject: [PATCH 15/20] fix(posthog): add typed captureEvent wrapper for React
 components, deduplicate copilot_panel_opened

---
 apps/sim/app/(auth)/signup/signup-form.tsx    |  3 ++-
 apps/sim/app/(home)/landing-analytics.tsx     |  3 ++-
 .../app/workspace/[workspaceId]/home/home.tsx |  3 ++-
 .../[workspaceId]/knowledge/[id]/base.tsx     |  3 ++-
 .../settings/[section]/settings.tsx           |  3 ++-
 .../[tableId]/components/table/table.tsx      |  3 ++-
 apps/sim/lib/posthog/client.ts                | 21 ++++++++++++++++++-
 apps/sim/stores/panel/store.ts                |  4 ++--
 8 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/apps/sim/app/(auth)/signup/signup-form.tsx b/apps/sim/app/(auth)/signup/signup-form.tsx
index f51280c9247..7ddf2abbcaa 100644
--- a/apps/sim/app/(auth)/signup/signup-form.tsx
+++ b/apps/sim/app/(auth)/signup/signup-form.tsx
@@ -12,6 +12,7 @@ import { client, useSession } from '@/lib/auth/auth-client'
 import { getEnv, isFalsy, isTruthy } from '@/lib/core/config/env'
 import { cn } from '@/lib/core/utils/cn'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
+import { captureEvent } from '@/lib/posthog/client'
 import { AUTH_SUBMIT_BTN } from '@/app/(auth)/components/auth-button-classes'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
@@ -86,7 +87,7 @@ function SignupFormContent({
   const [isLoading, setIsLoading] = useState(false)
 
   useEffect(() => {
-    posthog?.capture('signup_page_viewed', {})
+    captureEvent(posthog, 'signup_page_viewed', {})
   }, [posthog])
   const [showPassword, setShowPassword] = useState(false)
   const [password, setPassword] = useState('')
diff --git a/apps/sim/app/(home)/landing-analytics.tsx b/apps/sim/app/(home)/landing-analytics.tsx
index 652aaba5da5..10be29e5edd 100644
--- a/apps/sim/app/(home)/landing-analytics.tsx
+++ b/apps/sim/app/(home)/landing-analytics.tsx
@@ -2,12 +2,13 @@
 
 import { useEffect } from 'react'
 import { usePostHog } from 'posthog-js/react'
+import { captureEvent } from '@/lib/posthog/client'
 
 export function LandingAnalytics() {
   const posthog = usePostHog()
 
   useEffect(() => {
-    posthog?.capture('landing_page_viewed', {})
+    captureEvent(posthog, 'landing_page_viewed', {})
   }, [posthog])
 
   return null
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index a176376c538..5b56a970890 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -11,6 +11,7 @@ import {
   type LandingWorkflowSeed,
   LandingWorkflowSeedStorage,
 } from '@/lib/core/utils/browser-storage'
+import { captureEvent } from '@/lib/posthog/client'
 import { persistImportedWorkflow } from '@/lib/workflows/operations/import-export'
 import { useChatHistory, useMarkTaskRead } from '@/hooks/queries/tasks'
 import type { ChatContext } from '@/stores/panel'
@@ -206,7 +207,7 @@ export function Home({ chatId }: HomeProps = {}) {
       const trimmed = text.trim()
       if (!trimmed && !(fileAttachments && fileAttachments.length > 0)) return
 
-      posthog?.capture('message_sent', {
+      captureEvent(posthog, 'message_sent', {
         has_attachments: !!(fileAttachments && fileAttachments.length > 0),
         has_contexts: !!(contexts && contexts.length > 0),
       })
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
index 7baa20fac20..eb5823f9100 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
@@ -29,6 +29,7 @@ import { ALL_TAG_SLOTS, type AllTagSlot, getFieldTypeForSlot } from '@/lib/knowl
 import type { DocumentSortField, SortOrder } from '@/lib/knowledge/documents/types'
 import { type FilterFieldType, getOperatorsForFieldType } from '@/lib/knowledge/filters/types'
 import type { DocumentData } from '@/lib/knowledge/types'
+import { captureEvent } from '@/lib/posthog/client'
 import { formatFileSize } from '@/lib/uploads/utils/file-utils'
 import type {
   BreadcrumbItem,
@@ -194,7 +195,7 @@ export function KnowledgeBase({
   const posthog = usePostHog()
 
   useEffect(() => {
-    posthog?.capture('knowledge_base_opened', {
+    captureEvent(posthog, 'knowledge_base_opened', {
       knowledge_base_id: id,
       knowledge_base_name: passedKnowledgeBaseName ?? 'Unknown',
     })
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
index 5506ec95781..352a0cfd334 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
@@ -6,6 +6,7 @@ import { useSearchParams } from 'next/navigation'
 import { usePostHog } from 'posthog-js/react'
 import { Skeleton } from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
+import { captureEvent } from '@/lib/posthog/client'
 import { AdminSkeleton } from '@/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton'
 import { ApiKeysSkeleton } from '@/app/workspace/[workspaceId]/settings/components/api-keys/api-key-skeleton'
 import { BYOKSkeleton } from '@/app/workspace/[workspaceId]/settings/components/byok/byok-skeleton'
@@ -179,7 +180,7 @@ export function SettingsPage({ section }: SettingsPageProps) {
 
   useEffect(() => {
     if (sessionLoading) return
-    posthog?.capture('settings_tab_viewed', { section: effectiveSection })
+    captureEvent(posthog, 'settings_tab_viewed', { section: effectiveSection })
   }, [effectiveSection, sessionLoading, posthog])
 
   return (
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
index 233518084d4..843488172c7 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
@@ -40,6 +40,7 @@ import {
   TypeText,
 } from '@/components/emcn/icons'
 import { cn } from '@/lib/core/utils/cn'
+import { captureEvent } from '@/lib/posthog/client'
 import type { ColumnDefinition, Filter, SortDirection, TableRow as TableRowType } from '@/lib/table'
 import type { ColumnOption, SortConfig } from '@/app/workspace/[workspaceId]/components'
 import { ResourceHeader, ResourceOptionsBar } from '@/app/workspace/[workspaceId]/components'
@@ -182,7 +183,7 @@ export function Table({
 
   useEffect(() => {
     if (!tableId || !workspaceId) return
-    posthog?.capture('table_opened', { table_id: tableId, workspace_id: workspaceId })
+    captureEvent(posthog, 'table_opened', { table_id: tableId, workspace_id: workspaceId })
   }, [tableId, workspaceId, posthog])
 
   const [queryOptions, setQueryOptions] = useState<QueryOptions>({
diff --git a/apps/sim/lib/posthog/client.ts b/apps/sim/lib/posthog/client.ts
index 7c346fc07eb..be04e115ecb 100644
--- a/apps/sim/lib/posthog/client.ts
+++ b/apps/sim/lib/posthog/client.ts
@@ -1,3 +1,4 @@
+import type { PostHog } from 'posthog-js'
 import type { PostHogEventMap, PostHogEventName } from '@/lib/posthog/events'
 
 /**
@@ -6,7 +7,7 @@ import type { PostHogEventMap, PostHogEventName } from '@/lib/posthog/events'
  * Uses the same dynamic `import('posthog-js')` pattern as `session-provider.tsx`.
  * Fully fire-and-forget — never throws, never blocks.
  *
- * React components should use `usePostHog()` from `posthog-js/react` instead.
+ * React components should use {@link captureEvent} with the `posthog` instance from `usePostHog()`.
  *
  * @param event      - Typed event name from {@link PostHogEventMap}.
  * @param properties - Strongly-typed property bag for this event.
@@ -25,3 +26,21 @@ export function captureClientEvent<E extends PostHogEventName>(
     })
     .catch(() => {})
 }
+
+/**
+ * Typed wrapper for `posthog.capture` in React components.
+ *
+ * Enforces event names and property shapes from {@link PostHogEventMap} at compile time,
+ * matching the type safety provided by `captureServerEvent` on the server side.
+ *
+ * @param posthog    - PostHog instance from `usePostHog()`.
+ * @param event      - Typed event name from {@link PostHogEventMap}.
+ * @param properties - Strongly-typed property bag for this event.
+ */
+export function captureEvent<E extends PostHogEventName>(
+  posthog: PostHog | null | undefined,
+  event: E,
+  properties: PostHogEventMap[E]
+): void {
+  posthog?.capture(event, properties as Record<string, unknown>)
+}
diff --git a/apps/sim/stores/panel/store.ts b/apps/sim/stores/panel/store.ts
index a57e922d1d1..869b2d5a2bf 100644
--- a/apps/sim/stores/panel/store.ts
+++ b/apps/sim/stores/panel/store.ts
@@ -10,7 +10,7 @@ const DEFAULT_TAB: PanelTab = 'copilot'
 
 export const usePanelStore = create<PanelState>()(
   persist(
-    (set) => ({
+    (set, get) => ({
       panelWidth: PANEL_WIDTH.DEFAULT,
       setPanelWidth: (width) => {
         // Only enforce minimum - maximum is enforced dynamically by the resize hook
@@ -28,7 +28,7 @@ export const usePanelStore = create<PanelState>()(
         if (typeof document !== 'undefined') {
           document.documentElement.removeAttribute('data-panel-active-tab')
         }
-        if (tab === 'copilot') {
+        if (tab === 'copilot' && get().activeTab !== 'copilot') {
           import('@/lib/posthog/client')
             .then(({ captureClientEvent }) => captureClientEvent('copilot_panel_opened', {}))
             .catch(() => {})

From 31d66e4aa3e59b7814828bd2400763357c539f9b Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 3 Apr 2026 00:09:27 -0700
Subject: [PATCH 16/20] feat(posthog): add task_created and task_message_sent
 events, remove copilot_panel_opened

---
 apps/sim/app/api/mothership/chats/route.ts         | 10 ++++++++++
 apps/sim/app/workspace/[workspaceId]/home/home.tsx |  3 ++-
 apps/sim/lib/posthog/events.ts                     |  9 ++++++---
 apps/sim/stores/panel/store.ts                     |  7 +------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/apps/sim/app/api/mothership/chats/route.ts b/apps/sim/app/api/mothership/chats/route.ts
index 91177b0a9d6..bc694d1d9fe 100644
--- a/apps/sim/app/api/mothership/chats/route.ts
+++ b/apps/sim/app/api/mothership/chats/route.ts
@@ -11,6 +11,7 @@ import {
   createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
 import { taskPubSub } from '@/lib/copilot/task-events'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { assertActiveWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('MothershipChatsAPI')
@@ -95,6 +96,15 @@ export async function POST(request: NextRequest) {
 
     taskPubSub?.publishStatusChanged({ workspaceId, chatId: chat.id, type: 'created' })
 
+    captureServerEvent(
+      userId,
+      'task_created',
+      { workspace_id: workspaceId },
+      {
+        groups: { workspace: workspaceId },
+      }
+    )
+
     return NextResponse.json({ success: true, id: chat.id })
   } catch (error) {
     if (error instanceof z.ZodError) {
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 5b56a970890..5d1cfa80125 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -207,9 +207,10 @@ export function Home({ chatId }: HomeProps = {}) {
       const trimmed = text.trim()
       if (!trimmed && !(fileAttachments && fileAttachments.length > 0)) return
 
-      captureEvent(posthog, 'message_sent', {
+      captureEvent(posthog, 'task_message_sent', {
         has_attachments: !!(fileAttachments && fileAttachments.length > 0),
         has_contexts: !!(contexts && contexts.length > 0),
+        is_new_task: !chatId,
       })
 
       if (initialViewInputRef.current) {
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
index fc7dde61647..3b5f2811bd8 100644
--- a/apps/sim/lib/posthog/events.ts
+++ b/apps/sim/lib/posthog/events.ts
@@ -205,8 +205,6 @@ export interface PostHogEventMap {
     mode: string
   }
 
-  copilot_panel_opened: Record<string, never>
-
   copilot_feedback_submitted: {
     is_positive: boolean
     has_text_feedback: boolean
@@ -266,9 +264,14 @@ export interface PostHogEventMap {
     alert_rule: string | null
   }
 
-  message_sent: {
+  task_created: {
+    workspace_id: string
+  }
+
+  task_message_sent: {
     has_attachments: boolean
     has_contexts: boolean
+    is_new_task: boolean
   }
 }
 
diff --git a/apps/sim/stores/panel/store.ts b/apps/sim/stores/panel/store.ts
index 869b2d5a2bf..5e7d0c74015 100644
--- a/apps/sim/stores/panel/store.ts
+++ b/apps/sim/stores/panel/store.ts
@@ -10,7 +10,7 @@ const DEFAULT_TAB: PanelTab = 'copilot'
 
 export const usePanelStore = create<PanelState>()(
   persist(
-    (set, get) => ({
+    (set) => ({
       panelWidth: PANEL_WIDTH.DEFAULT,
       setPanelWidth: (width) => {
         // Only enforce minimum - maximum is enforced dynamically by the resize hook
@@ -28,11 +28,6 @@ export const usePanelStore = create<PanelState>()(
         if (typeof document !== 'undefined') {
           document.documentElement.removeAttribute('data-panel-active-tab')
         }
-        if (tab === 'copilot' && get().activeTab !== 'copilot') {
-          import('@/lib/posthog/client')
-            .then(({ captureClientEvent }) => captureClientEvent('copilot_panel_opened', {}))
-            .catch(() => {})
-        }
       },
       isResizing: false,
       setIsResizing: (isResizing) => {

From 6d029d72963f474acb1426a87b26021cfa99fb95 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 3 Apr 2026 00:11:28 -0700
Subject: [PATCH 17/20] feat(posthog): track task_renamed, task_deleted,
 task_marked_read, task_marked_unread

---
 .../api/mothership/chats/[chatId]/route.ts    | 50 ++++++++++++++++---
 apps/sim/lib/posthog/events.ts                | 16 ++++++
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/apps/sim/app/api/mothership/chats/[chatId]/route.ts b/apps/sim/app/api/mothership/chats/[chatId]/route.ts
index e41a7c713d6..972651cf41b 100644
--- a/apps/sim/app/api/mothership/chats/[chatId]/route.ts
+++ b/apps/sim/app/api/mothership/chats/[chatId]/route.ts
@@ -13,6 +13,7 @@ import {
   createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
 import { taskPubSub } from '@/lib/copilot/task-events'
+import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('MothershipChatAPI')
 
@@ -142,12 +143,41 @@ export async function PATCH(
       return NextResponse.json({ success: false, error: 'Chat not found' }, { status: 404 })
     }
 
-    if (title !== undefined && updatedChat.workspaceId) {
-      taskPubSub?.publishStatusChanged({
-        workspaceId: updatedChat.workspaceId,
-        chatId,
-        type: 'renamed',
-      })
+    if (updatedChat.workspaceId) {
+      if (title !== undefined) {
+        taskPubSub?.publishStatusChanged({
+          workspaceId: updatedChat.workspaceId,
+          chatId,
+          type: 'renamed',
+        })
+        captureServerEvent(
+          userId,
+          'task_renamed',
+          { workspace_id: updatedChat.workspaceId },
+          {
+            groups: { workspace: updatedChat.workspaceId },
+          }
+        )
+      }
+      if (isUnread === false) {
+        captureServerEvent(
+          userId,
+          'task_marked_read',
+          { workspace_id: updatedChat.workspaceId },
+          {
+            groups: { workspace: updatedChat.workspaceId },
+          }
+        )
+      } else if (isUnread === true) {
+        captureServerEvent(
+          userId,
+          'task_marked_unread',
+          { workspace_id: updatedChat.workspaceId },
+          {
+            groups: { workspace: updatedChat.workspaceId },
+          }
+        )
+      }
     }
 
     return NextResponse.json({ success: true })
@@ -203,6 +233,14 @@ export async function DELETE(
         chatId,
         type: 'deleted',
       })
+      captureServerEvent(
+        userId,
+        'task_deleted',
+        { workspace_id: deletedChat.workspaceId },
+        {
+          groups: { workspace: deletedChat.workspaceId },
+        }
+      )
     }
 
     return NextResponse.json({ success: true })
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
index 3b5f2811bd8..2390aae1edb 100644
--- a/apps/sim/lib/posthog/events.ts
+++ b/apps/sim/lib/posthog/events.ts
@@ -268,6 +268,22 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
+  task_renamed: {
+    workspace_id: string
+  }
+
+  task_deleted: {
+    workspace_id: string
+  }
+
+  task_marked_read: {
+    workspace_id: string
+  }
+
+  task_marked_unread: {
+    workspace_id: string
+  }
+
   task_message_sent: {
     has_attachments: boolean
     has_contexts: boolean

From f80be50bb5741fe1796b9d2676945202f9bf4b73 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 3 Apr 2026 00:31:58 -0700
Subject: [PATCH 18/20] feat(analytics): expand posthog event coverage with
 source tracking and lifecycle events

---
 .../sim/app/api/a2a/agents/[agentId]/route.ts |  32 ++++++
 apps/sim/app/api/mcp/servers/route.ts         |  11 +-
 apps/sim/app/api/skills/route.ts              |  20 +++-
 apps/sim/app/api/tools/custom/route.ts        |  10 +-
 apps/sim/app/api/webhooks/[id]/route.ts       |  14 +++
 apps/sim/app/api/webhooks/route.ts            |  14 +++
 .../app/api/workflows/[id]/deploy/route.ts    |  28 ++++-
 .../[id]/deployments/[version]/route.ts       |   9 ++
 .../app/api/workflows/[id]/restore/route.ts   |   8 ++
 .../notifications/[notificationId]/route.ts   |  12 +++
 apps/sim/app/api/workspaces/[id]/route.ts     |   8 ++
 .../components/product-tour/product-tour.tsx  |   1 +
 .../components/product-tour/use-tour.ts       |  21 +++-
 .../components/product-tour/workflow-tour.tsx |   1 +
 .../panel/components/editor/editor.tsx        |   9 +-
 .../panel/components/toolbar/toolbar.tsx      |   9 +-
 .../w/components/sidebar/sidebar.tsx          |  11 +-
 apps/sim/lib/posthog/events.ts                | 100 ++++++++++++++++++
 18 files changed, 303 insertions(+), 15 deletions(-)

diff --git a/apps/sim/app/api/a2a/agents/[agentId]/route.ts b/apps/sim/app/api/a2a/agents/[agentId]/route.ts
index 688011352e3..877093ae30a 100644
--- a/apps/sim/app/api/a2a/agents/[agentId]/route.ts
+++ b/apps/sim/app/api/a2a/agents/[agentId]/route.ts
@@ -7,6 +7,7 @@ import { generateAgentCard, generateSkillsFromWorkflow } from '@/lib/a2a/agent-c
 import type { AgentCapabilities, AgentSkill } from '@/lib/a2a/types'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { getRedisClient } from '@/lib/core/config/redis'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 
@@ -180,6 +181,17 @@ export async function DELETE(request: NextRequest, { params }: { params: Promise
 
     logger.info(`Deleted A2A agent: ${agentId}`)
 
+    captureServerEvent(
+      auth.userId,
+      'a2a_agent_deleted',
+      {
+        agent_id: agentId,
+        workflow_id: existingAgent.workflowId,
+        workspace_id: existingAgent.workspaceId,
+      },
+      { groups: { workspace: existingAgent.workspaceId } }
+    )
+
     return NextResponse.json({ success: true })
   } catch (error) {
     logger.error('Error deleting agent:', error)
@@ -251,6 +263,16 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R
       }
 
       logger.info(`Published A2A agent: ${agentId}`)
+      captureServerEvent(
+        auth.userId,
+        'a2a_agent_published',
+        {
+          agent_id: agentId,
+          workflow_id: existingAgent.workflowId,
+          workspace_id: existingAgent.workspaceId,
+        },
+        { groups: { workspace: existingAgent.workspaceId } }
+      )
       return NextResponse.json({ success: true, isPublished: true })
     }
 
@@ -273,6 +295,16 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R
       }
 
       logger.info(`Unpublished A2A agent: ${agentId}`)
+      captureServerEvent(
+        auth.userId,
+        'a2a_agent_unpublished',
+        {
+          agent_id: agentId,
+          workflow_id: existingAgent.workflowId,
+          workspace_id: existingAgent.workspaceId,
+        },
+        { groups: { workspace: existingAgent.workspaceId } }
+      )
       return NextResponse.json({ success: true, isPublished: false })
     }
 
diff --git a/apps/sim/app/api/mcp/servers/route.ts b/apps/sim/app/api/mcp/servers/route.ts
index 3be0aaa9694..73c6f43fd56 100644
--- a/apps/sim/app/api/mcp/servers/route.ts
+++ b/apps/sim/app/api/mcp/servers/route.ts
@@ -181,10 +181,14 @@ export const POST = withMcpAuth('write')(
         // Silently fail
       }
 
+      const sourceParam = body.source as string | undefined
+      const source =
+        sourceParam === 'settings' || sourceParam === 'tool_input' ? sourceParam : undefined
+
       captureServerEvent(
         userId,
         'mcp_server_connected',
-        { workspace_id: workspaceId, server_name: body.name, transport: body.transport },
+        { workspace_id: workspaceId, server_name: body.name, transport: body.transport, source },
         {
           groups: { workspace: workspaceId },
           setOnce: { first_mcp_connected_at: new Date().toISOString() },
@@ -225,6 +229,9 @@ export const DELETE = withMcpAuth('admin')(
     try {
       const { searchParams } = new URL(request.url)
       const serverId = searchParams.get('serverId')
+      const sourceParam = searchParams.get('source')
+      const source =
+        sourceParam === 'settings' || sourceParam === 'tool_input' ? sourceParam : undefined
 
       if (!serverId) {
         return createMcpErrorResponse(
@@ -256,7 +263,7 @@ export const DELETE = withMcpAuth('admin')(
       captureServerEvent(
         userId,
         'mcp_server_disconnected',
-        { workspace_id: workspaceId, server_name: deletedServer.name },
+        { workspace_id: workspaceId, server_name: deletedServer.name, source },
         { groups: { workspace: workspaceId } }
       )
 
diff --git a/apps/sim/app/api/skills/route.ts b/apps/sim/app/api/skills/route.ts
index a45539d20cc..41173c13188 100644
--- a/apps/sim/app/api/skills/route.ts
+++ b/apps/sim/app/api/skills/route.ts
@@ -4,6 +4,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { deleteSkill, listSkills, upsertSkills } from '@/lib/workflows/skills/operations'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
@@ -23,6 +24,7 @@ const SkillSchema = z.object({
     })
   ),
   workspaceId: z.string().optional(),
+  source: z.enum(['settings', 'tool_input']).optional(),
 })
 
 /** GET - Fetch all skills for a workspace */
@@ -75,7 +77,7 @@ export async function POST(req: NextRequest) {
     const body = await req.json()
 
     try {
-      const { skills, workspaceId } = SkillSchema.parse(body)
+      const { skills, workspaceId, source } = SkillSchema.parse(body)
 
       if (!workspaceId) {
         logger.warn(`[${requestId}] Missing workspaceId in request body`)
@@ -107,6 +109,12 @@ export async function POST(req: NextRequest) {
           resourceName: skill.name,
           description: `Created/updated skill "${skill.name}"`,
         })
+        captureServerEvent(
+          userId,
+          'skill_created',
+          { skill_id: skill.id, skill_name: skill.name, workspace_id: workspaceId, source },
+          { groups: { workspace: workspaceId } }
+        )
       }
 
       return NextResponse.json({ success: true, data: resultSkills })
@@ -137,6 +145,9 @@ export async function DELETE(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams
   const skillId = searchParams.get('id')
   const workspaceId = searchParams.get('workspaceId')
+  const sourceParam = searchParams.get('source')
+  const source =
+    sourceParam === 'settings' || sourceParam === 'tool_input' ? sourceParam : undefined
 
   try {
     const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
@@ -180,6 +191,13 @@ export async function DELETE(request: NextRequest) {
       description: `Deleted skill`,
     })
 
+    captureServerEvent(
+      userId,
+      'skill_deleted',
+      { skill_id: skillId, workspace_id: workspaceId, source },
+      { groups: { workspace: workspaceId } }
+    )
+
     logger.info(`[${requestId}] Deleted skill: ${skillId}`)
     return NextResponse.json({ success: true })
   } catch (error) {
diff --git a/apps/sim/app/api/tools/custom/route.ts b/apps/sim/app/api/tools/custom/route.ts
index 521b239467a..7d45353e609 100644
--- a/apps/sim/app/api/tools/custom/route.ts
+++ b/apps/sim/app/api/tools/custom/route.ts
@@ -35,6 +35,7 @@ const CustomToolSchema = z.object({
     })
   ),
   workspaceId: z.string().optional(),
+  source: z.enum(['settings', 'tool_input']).optional(),
 })
 
 // GET - Fetch all custom tools for the workspace
@@ -136,7 +137,7 @@ export async function POST(req: NextRequest) {
 
     try {
       // Validate the request body
-      const { tools, workspaceId } = CustomToolSchema.parse(body)
+      const { tools, workspaceId, source } = CustomToolSchema.parse(body)
 
       if (!workspaceId) {
         logger.warn(`[${requestId}] Missing workspaceId in request body`)
@@ -172,7 +173,7 @@ export async function POST(req: NextRequest) {
         captureServerEvent(
           userId,
           'custom_tool_saved',
-          { tool_id: tool.id, workspace_id: workspaceId, tool_name: tool.title },
+          { tool_id: tool.id, workspace_id: workspaceId, tool_name: tool.title, source },
           {
             groups: { workspace: workspaceId },
             setOnce: { first_custom_tool_saved_at: new Date().toISOString() },
@@ -216,6 +217,9 @@ export async function DELETE(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams
   const toolId = searchParams.get('id')
   const workspaceId = searchParams.get('workspaceId')
+  const sourceParam = searchParams.get('source')
+  const source =
+    sourceParam === 'settings' || sourceParam === 'tool_input' ? sourceParam : undefined
 
   if (!toolId) {
     logger.warn(`[${requestId}] Missing tool ID for deletion`)
@@ -293,7 +297,7 @@ export async function DELETE(request: NextRequest) {
     captureServerEvent(
       userId,
       'custom_tool_deleted',
-      { tool_id: toolId, workspace_id: toolWorkspaceId },
+      { tool_id: toolId, workspace_id: toolWorkspaceId, source },
       toolWorkspaceId ? { groups: { workspace: toolWorkspaceId } } : undefined
     )
 
diff --git a/apps/sim/app/api/webhooks/[id]/route.ts b/apps/sim/app/api/webhooks/[id]/route.ts
index 88d8f26e0b3..24d93fc0609 100644
--- a/apps/sim/app/api/webhooks/[id]/route.ts
+++ b/apps/sim/app/api/webhooks/[id]/route.ts
@@ -8,6 +8,7 @@ import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { validateInteger } from '@/lib/core/security/input-validation'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { cleanupExternalWebhook } from '@/lib/webhooks/provider-subscriptions'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
 
@@ -274,6 +275,19 @@ export async function DELETE(
       request,
     })
 
+    const wsId = webhookData.workflow.workspaceId || undefined
+    captureServerEvent(
+      userId,
+      'webhook_trigger_deleted',
+      {
+        webhook_id: id,
+        workflow_id: webhookData.workflow.id,
+        provider: foundWebhook.provider || 'generic',
+        workspace_id: wsId ?? '',
+      },
+      wsId ? { groups: { workspace: wsId } } : undefined
+    )
+
     return NextResponse.json({ success: true }, { status: 200 })
   } catch (error: any) {
     logger.error(`[${requestId}] Error deleting webhook`, {
diff --git a/apps/sim/app/api/webhooks/route.ts b/apps/sim/app/api/webhooks/route.ts
index 911ce97b348..e58baa8d54c 100644
--- a/apps/sim/app/api/webhooks/route.ts
+++ b/apps/sim/app/api/webhooks/route.ts
@@ -9,6 +9,7 @@ import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { resolveEnvVarsInObject } from '@/lib/webhooks/env-resolver'
 import {
   cleanupExternalWebhook,
@@ -763,6 +764,19 @@ export async function POST(request: NextRequest) {
         metadata: { provider, workflowId },
         request,
       })
+
+      const wsId = workflowRecord.workspaceId || undefined
+      captureServerEvent(
+        userId,
+        'webhook_trigger_created',
+        {
+          webhook_id: savedWebhook.id,
+          workflow_id: workflowId,
+          provider: provider || 'generic',
+          workspace_id: wsId ?? '',
+        },
+        wsId ? { groups: { workspace: wsId } } : undefined
+      )
     }
 
     const status = targetWebhookId ? 200 : 201
diff --git a/apps/sim/app/api/workflows/[id]/deploy/route.ts b/apps/sim/app/api/workflows/[id]/deploy/route.ts
index b7a651042bb..e1130d42ffe 100644
--- a/apps/sim/app/api/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deploy/route.ts
@@ -129,7 +129,11 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
   const { id } = await params
 
   try {
-    const { error, session } = await validateWorkflowPermissions(id, requestId, 'admin')
+    const {
+      error,
+      session,
+      workflow: workflowData,
+    } = await validateWorkflowPermissions(id, requestId, 'admin')
     if (error) {
       return createErrorResponse(error.message, error.status)
     }
@@ -159,6 +163,14 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 
     logger.info(`[${requestId}] Updated isPublicApi for workflow ${id} to ${isPublicApi}`)
 
+    const wsId = workflowData?.workspaceId
+    captureServerEvent(
+      session!.user.id,
+      'workflow_public_api_toggled',
+      { workflow_id: id, workspace_id: wsId ?? '', is_public: isPublicApi },
+      wsId ? { groups: { workspace: wsId } } : undefined
+    )
+
     return createSuccessResponse({ isPublicApi })
   } catch (error: unknown) {
     const message = error instanceof Error ? error.message : 'Failed to update deployment settings'
@@ -175,7 +187,11 @@ export async function DELETE(
   const { id } = await params
 
   try {
-    const { error, session } = await validateWorkflowPermissions(id, requestId, 'admin')
+    const {
+      error,
+      session,
+      workflow: workflowData,
+    } = await validateWorkflowPermissions(id, requestId, 'admin')
     if (error) {
       return createErrorResponse(error.message, error.status)
     }
@@ -190,6 +206,14 @@ export async function DELETE(
       return createErrorResponse(result.error || 'Failed to undeploy workflow', 500)
     }
 
+    const wsId = workflowData?.workspaceId
+    captureServerEvent(
+      session!.user.id,
+      'workflow_undeployed',
+      { workflow_id: id, workspace_id: wsId ?? '' },
+      wsId ? { groups: { workspace: wsId } } : undefined
+    )
+
     return createSuccessResponse({
       isDeployed: false,
       deployedAt: null,
diff --git a/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts b/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts
index 7d4ab62d52c..74fd68d137f 100644
--- a/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts
@@ -4,6 +4,7 @@ import { and, eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { z } from 'zod'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { performActivateVersion } from '@/lib/workflows/orchestration'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
@@ -174,6 +175,14 @@ export async function PATCH(
         }
       }
 
+      const wsId = (workflowData as { workspaceId?: string } | null)?.workspaceId
+      captureServerEvent(
+        actorUserId,
+        'deployment_version_activated',
+        { workflow_id: id, workspace_id: wsId ?? '', version: versionNum },
+        wsId ? { groups: { workspace: wsId } } : undefined
+      )
+
       return createSuccessResponse({
         success: true,
         deployedAt: activateResult.deployedAt,
diff --git a/apps/sim/app/api/workflows/[id]/restore/route.ts b/apps/sim/app/api/workflows/[id]/restore/route.ts
index df9c0966de9..a9d6b6ba1a5 100644
--- a/apps/sim/app/api/workflows/[id]/restore/route.ts
+++ b/apps/sim/app/api/workflows/[id]/restore/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { restoreWorkflow } from '@/lib/workflows/lifecycle'
 import { getWorkflowById } from '@/lib/workflows/utils'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -58,6 +59,13 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       request,
     })
 
+    captureServerEvent(
+      auth.userId,
+      'workflow_restored',
+      { workflow_id: workflowId, workspace_id: workflowData.workspaceId ?? '' },
+      workflowData.workspaceId ? { groups: { workspace: workflowData.workspaceId } } : undefined
+    )
+
     return NextResponse.json({ success: true })
   } catch (error) {
     logger.error(`[${requestId}] Error restoring workflow ${workflowId}`, error)
diff --git a/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/route.ts b/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/route.ts
index 96acb82811d..08d3f5802d2 100644
--- a/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { encryptSecret } from '@/lib/core/security/encryption'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import { MAX_EMAIL_RECIPIENTS, MAX_WORKFLOW_IDS } from '../constants'
 
@@ -342,6 +343,17 @@ export async function DELETE(request: NextRequest, { params }: RouteParams) {
       request,
     })
 
+    captureServerEvent(
+      session.user.id,
+      'notification_channel_deleted',
+      {
+        notification_id: notificationId,
+        notification_type: deletedSubscription.notificationType,
+        workspace_id: workspaceId,
+      },
+      { groups: { workspace: workspaceId } }
+    )
+
     return NextResponse.json({ success: true })
   } catch (error) {
     logger.error('Error deleting notification', { error })
diff --git a/apps/sim/app/api/workspaces/[id]/route.ts b/apps/sim/app/api/workspaces/[id]/route.ts
index cf2ed3826d8..375e0879b8b 100644
--- a/apps/sim/app/api/workspaces/[id]/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/route.ts
@@ -5,6 +5,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
+import { captureServerEvent } from '@/lib/posthog/server'
 import { archiveWorkspace } from '@/lib/workspaces/lifecycle'
 
 const logger = createLogger('WorkspaceByIdAPI')
@@ -292,6 +293,13 @@ export async function DELETE(
       request,
     })
 
+    captureServerEvent(
+      session.user.id,
+      'workspace_deleted',
+      { workspace_id: workspaceId, workflow_count: workflowIds.length },
+      { groups: { workspace: workspaceId } }
+    )
+
     return NextResponse.json({ success: true })
   } catch (error) {
     logger.error(`Error deleting workspace ${workspaceId}:`, error)
diff --git a/apps/sim/app/workspace/[workspaceId]/components/product-tour/product-tour.tsx b/apps/sim/app/workspace/[workspaceId]/components/product-tour/product-tour.tsx
index ba659237800..11487f191db 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/product-tour/product-tour.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/components/product-tour/product-tour.tsx
@@ -26,6 +26,7 @@ export function NavTour() {
     steps: navTourSteps,
     triggerEvent: START_NAV_TOUR_EVENT,
     tourName: 'Navigation tour',
+    tourType: 'nav',
     disabled: isWorkflowPage,
   })
 
diff --git a/apps/sim/app/workspace/[workspaceId]/components/product-tour/use-tour.ts b/apps/sim/app/workspace/[workspaceId]/components/product-tour/use-tour.ts
index 345932b765d..dc41bf013fe 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/product-tour/use-tour.ts
+++ b/apps/sim/app/workspace/[workspaceId]/components/product-tour/use-tour.ts
@@ -2,7 +2,9 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
+import { usePostHog } from 'posthog-js/react'
 import { ACTIONS, type CallBackProps, EVENTS, STATUS, type Step } from 'react-joyride'
+import { captureEvent } from '@/lib/posthog/client'
 
 const logger = createLogger('useTour')
 
@@ -16,6 +18,8 @@ interface UseTourOptions {
   triggerEvent?: string
   /** Identifier for logging */
   tourName?: string
+  /** Analytics tour type for PostHog events */
+  tourType?: 'nav' | 'workflow'
   /** When true, stops a running tour (e.g. navigating away from the relevant page) */
   disabled?: boolean
 }
@@ -45,8 +49,10 @@ export function useTour({
   steps,
   triggerEvent,
   tourName = 'tour',
+  tourType,
   disabled = false,
 }: UseTourOptions): UseTourReturn {
+  const posthog = usePostHog()
   const [run, setRun] = useState(false)
   const [stepIndex, setStepIndex] = useState(0)
   const [tourKey, setTourKey] = useState(0)
@@ -152,6 +158,9 @@ export function useTour({
         setRun(true)
         logger.info(`${tourName} triggered via event`)
         scheduleReveal()
+        if (tourType) {
+          captureEvent(posthog, 'tour_started', { tour_type: tourType })
+        }
       }, 50)
     }
 
@@ -181,6 +190,13 @@ export function useTour({
       if (status === STATUS.FINISHED || status === STATUS.SKIPPED) {
         stopTour()
         logger.info(`${tourName} ended`, { status })
+        if (tourType) {
+          if (status === STATUS.FINISHED) {
+            captureEvent(posthog, 'tour_completed', { tour_type: tourType })
+          } else {
+            captureEvent(posthog, 'tour_skipped', { tour_type: tourType, step_index: index })
+          }
+        }
         return
       }
 
@@ -188,6 +204,9 @@ export function useTour({
         if (action === ACTIONS.CLOSE) {
           stopTour()
           logger.info(`${tourName} closed by user`)
+          if (tourType) {
+            captureEvent(posthog, 'tour_skipped', { tour_type: tourType, step_index: index })
+          }
           return
         }
 
@@ -203,7 +222,7 @@ export function useTour({
         transitionToStep(nextIndex)
       }
     },
-    [stopTour, transitionToStep, steps, tourName]
+    [stopTour, transitionToStep, steps, tourName, tourType, posthog]
   )
 
   return {
diff --git a/apps/sim/app/workspace/[workspaceId]/components/product-tour/workflow-tour.tsx b/apps/sim/app/workspace/[workspaceId]/components/product-tour/workflow-tour.tsx
index 383a3311c0b..d9c7f334549 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/product-tour/workflow-tour.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/components/product-tour/workflow-tour.tsx
@@ -26,6 +26,7 @@ export function WorkflowTour() {
     steps: workflowTourSteps,
     triggerEvent: START_WORKFLOW_TOUR_EVENT,
     tourName: 'Workflow tour',
+    tourType: 'workflow',
   })
 
   const tourState = useMemo<TourState>(
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
index 54dbc65d8c8..e6813822338 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
@@ -14,9 +14,11 @@ import {
   Unlock,
 } from 'lucide-react'
 import { useParams } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import { useShallow } from 'zustand/react/shallow'
 import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { Button, Tooltip } from '@/components/emcn'
+import { captureEvent } from '@/lib/posthog/client'
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
@@ -106,6 +108,7 @@ export function Editor() {
 
   const params = useParams()
   const workspaceId = params.workspaceId as string
+  const posthog = usePostHog()
 
   const subBlocksRef = useRef<HTMLDivElement>(null)
 
@@ -298,7 +301,11 @@ export function Editor() {
   const handleOpenDocs = useCallback(() => {
     const docsLink = isSubflow ? subflowConfig?.docsLink : blockConfig?.docsLink
     window.open(docsLink || 'https://docs.sim.ai/quick-reference', '_blank', 'noopener,noreferrer')
-  }, [isSubflow, subflowConfig?.docsLink, blockConfig?.docsLink])
+    captureEvent(posthog, 'docs_opened', {
+      source: 'editor_button',
+      block_type: currentBlock?.type,
+    })
+  }, [isSubflow, subflowConfig?.docsLink, blockConfig?.docsLink, posthog, currentBlock?.type])
 
   const childWorkflowId = isWorkflowBlock ? blockSubBlockValues?.workflowId : null
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
index 2ad1a643916..5ceaed98cb9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
@@ -12,7 +12,9 @@ import {
 } from 'react'
 import clsx from 'clsx'
 import { Search } from 'lucide-react'
+import { usePostHog } from 'posthog-js/react'
 import { Button } from '@/components/emcn'
+import { captureEvent } from '@/lib/posthog/client'
 import {
   getBlocksForSidebar,
   getTriggersForSidebar,
@@ -348,6 +350,7 @@ export const Toolbar = memo(
       triggersHeaderRef,
     })
 
+    const posthog = usePostHog()
     const { filterBlocks } = usePermissionConfig()
     const sandboxAllowedBlocks = useSandboxBlockConstraints()
 
@@ -541,8 +544,12 @@ export const Toolbar = memo(
     const handleViewDocumentation = useCallback(() => {
       if (activeItemInfo?.docsLink) {
         window.open(activeItemInfo.docsLink, '_blank', 'noopener,noreferrer')
+        captureEvent(posthog, 'docs_opened', {
+          source: 'toolbar_context_menu',
+          block_type: activeItemInfo.type,
+        })
       }
-    }, [activeItemInfo])
+    }, [activeItemInfo, posthog])
 
     /**
      * Handle clicks outside the context menu to close it
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
index d77d9c7483c..127655e39cc 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
@@ -6,6 +6,7 @@ import { Compass, MoreHorizontal } from 'lucide-react'
 import Image from 'next/image'
 import Link from 'next/link'
 import { useParams, usePathname, useRouter } from 'next/navigation'
+import { usePostHog } from 'posthog-js/react'
 import {
   Blimp,
   Button,
@@ -39,6 +40,7 @@ import { useSession } from '@/lib/auth/auth-client'
 import { cn } from '@/lib/core/utils/cn'
 import { isMacPlatform } from '@/lib/core/utils/platform'
 import { buildFolderTree } from '@/lib/folders/tree'
+import { captureEvent } from '@/lib/posthog/client'
 import {
   START_NAV_TOUR_EVENT,
   START_WORKFLOW_TOUR_EVENT,
@@ -315,6 +317,7 @@ export const Sidebar = memo(function Sidebar() {
   const fileInputRef = useRef<HTMLInputElement>(null)
   const scrollContainerRef = useRef<HTMLDivElement>(null)
 
+  const posthog = usePostHog()
   const { data: sessionData, isPending: sessionLoading } = useSession()
   const { canEdit } = useUserPermissionsContext()
   const { config: permissionConfig, filterBlocks } = usePermissionConfig()
@@ -1092,10 +1095,10 @@ export const Sidebar = memo(function Sidebar() {
 
   const handleOpenHelpFromMenu = useCallback(() => setIsHelpModalOpen(true), [])
 
-  const handleOpenDocs = useCallback(
-    () => window.open('https://docs.sim.ai', '_blank', 'noopener,noreferrer'),
-    []
-  )
+  const handleOpenDocs = useCallback(() => {
+    window.open('https://docs.sim.ai', '_blank', 'noopener,noreferrer')
+    captureEvent(posthog, 'docs_opened', { source: 'help_menu' })
+  }, [posthog])
 
   const handleTaskRenameBlur = useCallback(
     () => void taskFlyoutRename.saveRename(),
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
index 2390aae1edb..30d4c052162 100644
--- a/apps/sim/lib/posthog/events.ts
+++ b/apps/sim/lib/posthog/events.ts
@@ -104,6 +104,84 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
+  workflow_undeployed: {
+    workflow_id: string
+    workspace_id: string
+  }
+
+  workflow_restored: {
+    workflow_id: string
+    workspace_id: string
+  }
+
+  workflow_public_api_toggled: {
+    workflow_id: string
+    workspace_id: string
+    is_public: boolean
+  }
+
+  deployment_version_activated: {
+    workflow_id: string
+    workspace_id: string
+    version: number
+  }
+
+  webhook_trigger_created: {
+    webhook_id: string
+    workflow_id: string
+    workspace_id: string
+    provider: string
+  }
+
+  webhook_trigger_deleted: {
+    webhook_id: string
+    workflow_id: string
+    workspace_id: string
+    provider: string
+  }
+
+  skill_created: {
+    skill_id: string
+    skill_name: string
+    workspace_id: string
+    source?: 'settings' | 'tool_input'
+  }
+
+  skill_deleted: {
+    skill_id: string
+    workspace_id: string
+    source?: 'settings' | 'tool_input'
+  }
+
+  workspace_deleted: {
+    workspace_id: string
+    workflow_count: number
+  }
+
+  notification_channel_deleted: {
+    notification_id: string
+    workspace_id: string
+    notification_type: string
+  }
+
+  a2a_agent_deleted: {
+    agent_id: string
+    workflow_id: string
+    workspace_id: string
+  }
+
+  a2a_agent_published: {
+    agent_id: string
+    workflow_id: string
+    workspace_id: string
+  }
+
+  a2a_agent_unpublished: {
+    agent_id: string
+    workflow_id: string
+    workspace_id: string
+  }
+
   a2a_agent_created: {
     agent_id: string
     workflow_id: string
@@ -178,11 +256,13 @@ export interface PostHogEventMap {
     workspace_id: string
     server_name: string
     transport: string
+    source?: 'settings' | 'tool_input'
   }
 
   mcp_server_disconnected: {
     workspace_id: string
     server_name: string
+    source?: 'settings' | 'tool_input'
   }
 
   credential_connected: {
@@ -241,11 +321,13 @@ export interface PostHogEventMap {
     tool_id: string
     workspace_id: string
     tool_name: string
+    source?: 'settings' | 'tool_input'
   }
 
   custom_tool_deleted: {
     tool_id: string
     workspace_id: string
+    source?: 'settings' | 'tool_input'
   }
 
   byok_key_added: {
@@ -289,6 +371,24 @@ export interface PostHogEventMap {
     has_contexts: boolean
     is_new_task: boolean
   }
+
+  tour_started: {
+    tour_type: 'nav' | 'workflow'
+  }
+
+  tour_completed: {
+    tour_type: 'nav' | 'workflow'
+  }
+
+  tour_skipped: {
+    tour_type: 'nav' | 'workflow'
+    step_index: number
+  }
+
+  docs_opened: {
+    source: 'help_menu' | 'editor_button' | 'toolbar_context_menu'
+    block_type?: string
+  }
 }
 
 export type PostHogEventName = keyof PostHogEventMap

From e01511c18be41a74e4efccf928bb995f69c2def9 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 3 Apr 2026 00:40:45 -0700
Subject: [PATCH 19/20] fix(analytics): flush posthog events on SIGTERM before
 ECS task termination

---
 apps/sim/instrumentation-node.ts | 8 ++++++++
 apps/sim/lib/posthog/server.ts   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/apps/sim/instrumentation-node.ts b/apps/sim/instrumentation-node.ts
index 4100a796c7a..c16eca0a59a 100644
--- a/apps/sim/instrumentation-node.ts
+++ b/apps/sim/instrumentation-node.ts
@@ -147,6 +147,14 @@ async function initializeOpenTelemetry() {
       } catch (err) {
         logger.error('Error shutting down OpenTelemetry SDK', err)
       }
+
+      try {
+        const { getPostHogClient } = await import('@/lib/posthog/server')
+        await getPostHogClient()?.shutdown()
+        logger.info('PostHog client shut down successfully')
+      } catch (err) {
+        logger.error('Error shutting down PostHog client', err)
+      }
     }
 
     process.on('SIGTERM', shutdownHandler)
diff --git a/apps/sim/lib/posthog/server.ts b/apps/sim/lib/posthog/server.ts
index f2c1947ec39..673ae6c6b7c 100644
--- a/apps/sim/lib/posthog/server.ts
+++ b/apps/sim/lib/posthog/server.ts
@@ -6,6 +6,10 @@ const logger = createLogger('PostHogServer')
 let _client: import('posthog-node').PostHog | null = null
 let _disabled = false
 
+export function getPostHogClient(): import('posthog-node').PostHog | null {
+  return getClient()
+}
+
 function getClient(): import('posthog-node').PostHog | null {
   if (_disabled) return null
   if (_client) return _client

From 531d81f9471ea4c488b381bfd456766c80ebef12 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Fri, 3 Apr 2026 00:45:58 -0700
Subject: [PATCH 20/20] fix(analytics): fix posthog in useCallback deps and
 fire block events for bulk operations

---
 .../app/workspace/[workspaceId]/home/home.tsx |  9 ++++-
 apps/sim/stores/workflows/workflow/store.ts   | 40 +++++++++----------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 5d1cfa80125..5e98fc6e51b 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -30,6 +30,7 @@ export function Home({ chatId }: HomeProps = {}) {
   const router = useRouter()
   const { data: session } = useSession()
   const posthog = usePostHog()
+  const posthogRef = useRef(posthog)
   const [initialPrompt, setInitialPrompt] = useState('')
   const hasCheckedLandingStorageRef = useRef(false)
   const initialViewInputRef = useRef<HTMLDivElement>(null)
@@ -202,12 +203,16 @@ export function Home({ chatId }: HomeProps = {}) {
     return () => cancelAnimationFrame(id)
   }, [resources])
 
+  useEffect(() => {
+    posthogRef.current = posthog
+  }, [posthog])
+
   const handleSubmit = useCallback(
     (text: string, fileAttachments?: FileAttachmentForApi[], contexts?: ChatContext[]) => {
       const trimmed = text.trim()
       if (!trimmed && !(fileAttachments && fileAttachments.length > 0)) return
 
-      captureEvent(posthog, 'task_message_sent', {
+      captureEvent(posthogRef.current, 'task_message_sent', {
         has_attachments: !!(fileAttachments && fileAttachments.length > 0),
         has_contexts: !!(contexts && contexts.length > 0),
         is_new_task: !chatId,
@@ -219,7 +224,7 @@ export function Home({ chatId }: HomeProps = {}) {
 
       sendMessage(trimmed || 'Analyze the attached file(s).', fileAttachments, contexts)
     },
-    [sendMessage, posthog]
+    [sendMessage]
   )
 
   useEffect(() => {
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index d8f55d52ec6..de8a7b58126 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -316,17 +316,15 @@ export const useWorkflowStore = create<WorkflowStore>()(
           }
         }
 
-        if (blocks.length === 1) {
-          const workflowId = get().currentWorkflowId ?? 'unknown'
-          import('@/lib/posthog/client')
-            .then(({ captureClientEvent }) => {
-              captureClientEvent('block_added', {
-                block_type: blocks[0].type,
-                workflow_id: workflowId,
-              })
-            })
-            .catch(() => {})
-        }
+        const workflowId = get().currentWorkflowId ?? 'unknown'
+        const uniqueBlockTypes = [...new Set(blocks.map((b) => b.type))]
+        import('@/lib/posthog/client')
+          .then(({ captureClientEvent }) => {
+            for (const blockType of uniqueBlockTypes) {
+              captureClientEvent('block_added', { block_type: blockType, workflow_id: workflowId })
+            }
+          })
+          .catch(() => {})
 
         get().updateLastSaved()
       },
@@ -387,19 +385,21 @@ export const useWorkflowStore = create<WorkflowStore>()(
           parallels: generateParallelBlocks(newBlocks),
         })
 
-        if (ids.length === 1) {
-          const blockType = currentBlocks[ids[0]]?.type
-          if (blockType) {
-            const workflowId = get().currentWorkflowId ?? 'unknown'
-            import('@/lib/posthog/client')
-              .then(({ captureClientEvent }) => {
+        const workflowId = get().currentWorkflowId ?? 'unknown'
+        const uniqueRemovedTypes = [
+          ...new Set(ids.map((id) => currentBlocks[id]?.type).filter((t): t is string => !!t)),
+        ]
+        if (uniqueRemovedTypes.length > 0) {
+          import('@/lib/posthog/client')
+            .then(({ captureClientEvent }) => {
+              for (const blockType of uniqueRemovedTypes) {
                 captureClientEvent('block_removed', {
                   block_type: blockType,
                   workflow_id: workflowId,
                 })
-              })
-              .catch(() => {})
-          }
+              }
+            })
+            .catch(() => {})
         }
 
         get().updateLastSaved()