fix(analytics): simplify desktop analytics and fix funnels

apps/admin/src/app/(dashboard)/page.tsx

@@ -19,15 +19,26 @@ import { WeekPicker } from "./components/WeekPicker";
 export default function DashboardPage() {
 	const trpc = useTRPC();
 
-	const [funnelRange, setFunnelRange] = useState<TimeRange>("-7d");
+	const [activationFunnelRange, setActivationFunnelRange] =
+		useState<TimeRange>("-7d");
+	const [marketingFunnelRange, setMarketingFunnelRange] =
+		useState<TimeRange>("-7d");
 	const [signupsRange, setSignupsRange] = useState<TimeRange>("-30d");
 	const [trafficRange, setTrafficRange] = useState<TimeRange>("-30d");
 	const [revenueRange, setRevenueRange] = useState<TimeRange>("-30d");
 	const [wauRange, setWauRange] = useState<TimeRange>("-30d");
 	const [leaderboardWeekOffset, setLeaderboardWeekOffset] = useState(0);
 
-	const fullJourneyFunnel = useQuery(
-		trpc.analytics.getFullJourneyFunnel.queryOptions({ dateFrom: funnelRange }),
+	const activationFunnel = useQuery(
+		trpc.analytics.getActivationFunnel.queryOptions({
+			dateFrom: activationFunnelRange,
+		}),
+	);
+
+	const marketingFunnel = useQuery(
+		trpc.analytics.getMarketingFunnel.queryOptions({
+			dateFrom: marketingFunnelRange,
+		}),
 	);
 
 	const wau = useQuery(
@@ -106,13 +117,30 @@ export default function DashboardPage() {
 			/>
 
 			<FunnelChart
-				title="Full Journey Funnel"
-				description="From site visit to terminal usage"
-				data={fullJourneyFunnel.data}
-				isLoading={fullJourneyFunnel.isLoading}
-				error={fullJourneyFunnel.error}
+				title="Activation Funnel"
+				description="From app open to workspace creation"
+				data={activationFunnel.data}
+				isLoading={activationFunnel.isLoading}
+				error={activationFunnel.error}
 				headerAction={
-					<TimeRangePicker value={funnelRange} onChange={setFunnelRange} />
+					<TimeRangePicker
+						value={activationFunnelRange}
+						onChange={setActivationFunnelRange}
+					/>
+				}
+			/>
+
+			<FunnelChart
+				title="Marketing Funnel"
+				description="From site visit to app download"
+				data={marketingFunnel.data}
+				isLoading={marketingFunnel.isLoading}
+				error={marketingFunnel.error}
+				headerAction={
+					<TimeRangePicker
+						value={marketingFunnelRange}
+						onChange={setMarketingFunnelRange}
+					/>
 				}
 			/>
 

apps/desktop/src/lib/trpc/routers/analytics/index.ts

@@ -0,0 +1,15 @@
+import { setUserId } from "main/lib/analytics";
+import { z } from "zod";
+import { publicProcedure, router } from "../..";
+
+export const createAnalyticsRouter = () => {
+	return router({
+		setUserId: publicProcedure
+			.input(z.object({ userId: z.string().nullable() }))
+			.mutation(({ input }) => {
+				setUserId(input.userId);
+			}),
+	});
+};
+
+export type AnalyticsRouter = ReturnType<typeof createAnalyticsRouter>;

apps/desktop/src/lib/trpc/routers/auth/index.ts

@@ -1,6 +1,5 @@
 import { observable } from "@trpc/server/observable";
 import type { BrowserWindow } from "electron";
-import { clearUserCache } from "main/lib/analytics";
 import { authService } from "main/lib/auth";
 import { AUTH_PROVIDERS } from "shared/auth";
 import { z } from "zod";
@@ -54,7 +53,6 @@ export const createAuthRouter = (getWindow: () => BrowserWindow | null) => {
 		 */
 		signOut: publicProcedure.mutation(async () => {
 			await authService.signOut();
-			clearUserCache();
 			return { success: true };
 		}),
 	});

apps/desktop/src/lib/trpc/routers/index.ts

@@ -1,5 +1,6 @@
 import type { BrowserWindow } from "electron";
 import { router } from "..";
+import { createAnalyticsRouter } from "./analytics";
 import { createAuthRouter } from "./auth";
 import { createChangesRouter } from "./changes";
 import { createConfigRouter } from "./config";
@@ -25,6 +26,7 @@ import { createWorkspacesRouter } from "./workspaces";
  */
 export const createAppRouter = (getWindow: () => BrowserWindow | null) => {
 	return router({
+		analytics: createAnalyticsRouter(),
 		auth: createAuthRouter(getWindow),
 		user: createUserRouter(),
 		window: createWindowRouter(getWindow),

apps/desktop/src/lib/trpc/routers/projects/projects.ts

@@ -301,6 +301,11 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 			const defaultBranch = await getDefaultBranch(mainRepoPath);
 			const project = upsertProject(mainRepoPath, defaultBranch);
 
+			track("project_opened", {
+				project_id: project.id,
+				method: "open",
+			});
+
 			return {
 				canceled: false,
 				project,
@@ -351,6 +356,11 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 
 				const project = upsertProject(input.path, defaultBranch);
 
+				track("project_opened", {
+					project_id: project.id,
+					method: "init",
+				});
+
 				return { project };
 			}),
 
@@ -420,6 +430,12 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 								.set({ lastOpenedAt: Date.now() })
 								.where(eq(projects.id, existingProject.id))
 								.run();
+
+							track("project_opened", {
+								project_id: existingProject.id,
+								method: "clone",
+							});
+
 							return {
 								canceled: false as const,
 								success: true as const,
@@ -462,6 +478,11 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
 						.returning()
 						.get();
 
+					track("project_opened", {
+						project_id: project.id,
+						method: "clone",
+					});
+
 					return {
 						canceled: false as const,
 						success: true as const,

apps/desktop/src/main/index.ts

@@ -7,7 +7,7 @@ import { app, BrowserWindow } from "electron";
 import { makeAppSetup } from "lib/electron-app/factories/app/setup";
 import { PROTOCOL_SCHEME } from "shared/constants";
 import { setupAgentHooks } from "./lib/agent-setup";
-import { shutdown as shutdownAnalytics, track } from "./lib/analytics";
+import { posthog } from "./lib/analytics";
 import { initAppState } from "./lib/app-state";
 import { authService, handleAuthDeepLink, isAuthDeepLink } from "./lib/auth";
 import { setupAutoUpdater } from "./lib/auto-updater";
@@ -56,7 +56,6 @@ async function processDeepLink(url: string): Promise<void> {
 				refreshTokenExpiresAt: result.refreshTokenExpiresAt,
 				state: result.state,
 			});
-			track("auth_completed");
 			focusMainWindow();
 		} else {
 			console.error("[main] Auth deep link failed:", result.error);
@@ -148,7 +147,7 @@ if (!gotTheLock) {
 
 		// Clean up all terminals and analytics when app is quitting
 		app.on("before-quit", async () => {
-			await Promise.all([terminalManager.cleanup(), shutdownAnalytics()]);
+			await Promise.all([terminalManager.cleanup(), posthog?.shutdown()]);
 		});
 	})();
 }

apps/desktop/src/main/lib/analytics/index.ts

@@ -1,73 +1,44 @@
 import { env } from "main/env.main";
-import { apiClient } from "main/lib/api-client";
 import { PostHog } from "posthog-node";
 
-let client: PostHog | null = null;
-let cachedUserId: string | null = null;
+export let posthog: PostHog | null = null;
+let userId: string | null = null;
 
 function getClient(): PostHog | null {
 	if (!env.NEXT_PUBLIC_POSTHOG_KEY) {
 		return null;
 	}
 
-	if (!client) {
-		client = new PostHog(env.NEXT_PUBLIC_POSTHOG_KEY, {
+	if (!posthog) {
+		posthog = new PostHog(env.NEXT_PUBLIC_POSTHOG_KEY, {
 			host: env.NEXT_PUBLIC_POSTHOG_HOST,
-			flushAt: 1, // Send events immediately for desktop app
+			flushAt: 1,
 			flushInterval: 0,
 		});
 	}
-	return client;
+	return posthog;
 }
 
-async function getUserId(): Promise<string | null> {
-	if (cachedUserId) return cachedUserId;
-	try {
-		const user = await apiClient.user.me.query();
-		cachedUserId = user?.id ?? null;
-		return cachedUserId;
-	} catch {
-		return null;
-	}
-}
-
-/**
- * Clear cached user ID (call on sign out)
- */
-export function clearUserCache(): void {
-	cachedUserId = null;
+export function setUserId(id: string | null): void {
+	userId = id;
 }
 
-/**
- * Track an event with the current user's ID as distinct_id.
- * Fire-and-forget - errors are silently ignored.
- */
 export function track(
 	event: string,
 	properties?: Record<string, unknown>,
 ): void {
-	const posthog = getClient();
-	if (!posthog) return;
-
-	getUserId()
-		.then((userId) => {
-			if (!userId) return;
-			posthog.capture({
-				distinctId: userId,
-				event,
-				properties: {
-					...properties,
-					app_name: "desktop",
-					platform: process.platform,
-				},
-			});
-		})
-		.catch(() => {});
-}
-
-/**
- * Shutdown PostHog client (call on app quit)
- */
-export async function shutdown(): Promise<void> {
-	await client?.shutdown();
+	if (!userId) return;
+
+	const client = getClient();
+	if (!client) return;
+
+	client.capture({
+		distinctId: userId,
+		event,
+		properties: {
+			...properties,
+			app_name: "desktop",
+			platform: process.platform,
+		},
+	});
 }

apps/desktop/src/renderer/components/PostHogUserIdentifier/PostHogUserIdentifier.tsx

@@ -3,16 +3,28 @@ import { trpc } from "renderer/lib/trpc";
 
 import { posthog } from "../../lib/posthog";
 
+const AUTH_COMPLETED_KEY = "superset_auth_completed";
+
 export function PostHogUserIdentifier() {
 	const { data: user, isSuccess } = trpc.user.me.useQuery();
+	const { mutate: setUserId } = trpc.analytics.setUserId.useMutation();
 
 	useEffect(() => {
 		if (user) {
 			posthog.identify(user.id, { email: user.email, name: user.name });
+			setUserId({ userId: user.id });
+
+			const trackedUserId = localStorage.getItem(AUTH_COMPLETED_KEY);
+			if (trackedUserId !== user.id) {
+				posthog.capture("auth_completed");
+				localStorage.setItem(AUTH_COMPLETED_KEY, user.id);
+			}
 		} else if (isSuccess) {
 			posthog.reset();
+			setUserId({ userId: null });
+			localStorage.removeItem(AUTH_COMPLETED_KEY);
 		}
-	}, [user, isSuccess]);
+	}, [user, isSuccess, setUserId]);
 
 	return null;
 }