Merge branch 'main' into brendan/bitbucket-server-sso

Author: brendan-kellam

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added PostHog events for chat UI interactions (details card expand/collapse, copy answer, table of contents toggle) and repo tracking in `wa_chat_message_sent`. [#922](https://github.com/sourcebot-dev/sourcebot/pull/922)
 - Added Bitbucket Cloud OAuth identity provider support (`provider: "bitbucket-cloud"`) for SSO and account-linked permission syncing. [#924](https://github.com/sourcebot-dev/sourcebot/pull/924)
 - Added permission syncing support for Bitbucket Cloud. [#925](https://github.com/sourcebot-dev/sourcebot/pull/925)
+- Added `wa_user_created` PostHog event fired on successful user sign-up. [#933](https://github.com/sourcebot-dev/sourcebot/pull/933)
+- Added `wa_askgh_login_wall_prompted` PostHog event fired when an unauthenticated user attempts to ask a question on Ask GitHub. [#933](https://github.com/sourcebot-dev/sourcebot/pull/933)
 - Added Bitbucket Server (Data Center) OAuth 2.0 SSO identity provider support (`provider: "bitbucket-server"`). [#934](https://github.com/sourcebot-dev/sourcebot/pull/934)
 
 ### Changed

packages/web/package.json

@@ -63,6 +63,7 @@
     "@opentelemetry/api-logs": "^0.203.0",
     "@opentelemetry/instrumentation": "^0.203.0",
     "@opentelemetry/sdk-logs": "^0.203.0",
+    "@posthog/ai": "^7.8.10",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.1.5",
     "@radix-ui/react-avatar": "^1.1.2",

packages/web/src/app/[domain]/askgh/[owner]/[repo]/components/landingPage.tsx

@@ -14,6 +14,7 @@ import type { IdentityProviderMetadata } from "@/lib/identityProviders";
 import { Descendant, Transforms } from "slate";
 import { useSlate } from "slate-react";
 import { useCallback, useEffect, useMemo, useState, useRef } from "react";
+import { captureEvent } from "@/hooks/useCaptureEvent";
 
 const PENDING_MESSAGE_KEY = "askgh_pending_message";
 
@@ -55,6 +56,7 @@ export const LandingPage = ({
     // Intercept submit to check auth status
     const handleSubmit = useCallback((children: Descendant[]) => {
         if (!isAuthenticated) {
+            captureEvent('wa_askgh_login_wall_prompted', {});
             // Store message in sessionStorage to survive OAuth redirect
             sessionStorage.setItem(PENDING_MESSAGE_KEY, JSON.stringify(children));
             setIsLoginModalOpen(true);

packages/web/src/features/chat/actions.ts

@@ -107,7 +107,7 @@ export const onCreateUser = async ({ user }: { user: AuthJsUser }) => {
                 type: "org"
             }
         });
-    } else if (!defaultOrg.memberApprovalRequired) { 
+    } else if (!defaultOrg.memberApprovalRequired) {
         const hasAvailability = await orgHasAvailability(defaultOrg.domain);
         if (!hasAvailability) {
             logger.warn(`onCreateUser: org ${SINGLE_TENANT_ORG_ID} has reached max capacity. User ${user.id} was not added to the org.`);
@@ -123,6 +123,10 @@ export const onCreateUser = async ({ user }: { user: AuthJsUser }) => {
         });
     }
 
+    // Dynamic import to avoid circular dependency:
+    // authUtils -> posthog -> auth -> authUtils
+    const { captureEvent } = await import("@/lib/posthog");
+    await captureEvent('wa_user_created', { userId: user.id });
 };
 
 

packages/web/src/lib/authUtils.ts

@@ -52,7 +52,7 @@ const getPostHogCookie = (cookieStore: Pick<RequestCookies, 'get'>): PostHogCook
 /**
  * Attempts to retrieve the distinct id of the current user.
  */
-const tryGetDistinctId = async () => {
+export const tryGetPostHogDistinctId = async () => {
     // First, attempt to retrieve the distinct id from the cookie.
     const cookieStore = await cookies();
     const cookie = getPostHogCookie(cookieStore);
@@ -77,22 +77,27 @@ const tryGetDistinctId = async () => {
     return apiKey?.createdById;
 }
 
+export const createPostHogClient = async () => {
+    const posthog = new PostHog(env.POSTHOG_PAPIK, {
+        host: 'https://us.i.posthog.com',
+        flushAt: 1,
+        flushInterval: 0
+    });
+
+    return posthog;
+}
+
 export async function captureEvent<E extends PosthogEvent>(event: E, properties: PosthogEventMap[E]) {
     if (env.SOURCEBOT_TELEMETRY_DISABLED === 'true') {
         return;
     }
 
-    const distinctId = await tryGetDistinctId();
+    const distinctId = await tryGetPostHogDistinctId();
+    const posthog = await createPostHogClient();
 
     const headersList = await headers();
     const host = headersList.get("host") ?? undefined;
 
-    const posthog = new PostHog(env.POSTHOG_PAPIK, {
-        host: 'https://us.i.posthog.com',
-        flushAt: 1,
-        flushInterval: 0
-    })
-
     posthog.capture({
         event,
         properties: {

packages/web/src/lib/posthog.ts

@@ -227,6 +227,11 @@ export type PosthogEventMap = {
         chatId: string,
         isExpanded: boolean,
     },
+    wa_user_created: {
+        userId: string,
+    },
+    //////////////////////////////////////////////////////////////////
+    wa_askgh_login_wall_prompted: {},
     //////////////////////////////////////////////////////////////////
     wa_demo_docs_link_pressed: {},
     wa_demo_search_example_card_pressed: {