Fix Intercom in-flight boot cross-org race

Co-authored-by: Armen Zambrano G. <armenzg@users.noreply.github.com>

Author: cursoragent

static/app/utils/intercom.tsx

@@ -24,23 +24,29 @@ interface IntercomJwtResponse {
 
 let hasBooted = false;
 let bootPromise: Promise<void> | null = null;
+let bootingOrgSlug: string | null = null;
 let bootedOrgSlug: string | null = null;
 
 /**
  * Initialize Intercom with identity verification.
  * Only fetches JWT and boots on first call.
  */
 async function initIntercom(orgSlug: string): Promise<void> {
-  if (hasBooted) {
+  if (hasBooted && bootedOrgSlug === orgSlug) {
     return;
   }
 
-  // Prevent concurrent initialization
-  if (bootPromise) {
+  // Prevent concurrent initialization for the same organization
+  if (bootPromise && bootingOrgSlug === orgSlug) {
     return bootPromise;
   }
 
-  bootPromise = (async () => {
+  // If a different org is currently booting, invalidate it first.
+  if (bootPromise && bootingOrgSlug !== orgSlug) {
+    await shutdownIntercom();
+  }
+
+  const currentBootPromise = (async () => {
     try {
       const intercomAppId = ConfigStore.get('intercomAppId');
       if (!intercomAppId) {
@@ -55,6 +61,12 @@ async function initIntercom(orgSlug: string): Promise<void> {
 
       // Boot Intercom with user data
       const {default: Intercom} = await import('@intercom/messenger-js-sdk');
+
+      // Boot may have been invalidated while async work was in-flight.
+      if (bootPromise !== currentBootPromise || bootingOrgSlug !== orgSlug) {
+        return;
+      }
+
       Intercom({
         app_id: intercomAppId,
         user_id: jwtData.userData.userId,
@@ -71,21 +83,36 @@ async function initIntercom(orgSlug: string): Promise<void> {
 
       hasBooted = true;
       bootedOrgSlug = orgSlug;
+
+      if (bootPromise === currentBootPromise) {
+        bootPromise = null;
+        bootingOrgSlug = null;
+      }
     } catch (error) {
-      // Reset so user can retry on next click
-      bootPromise = null;
-      throw error;
+      // Reset so user can retry on next click.
+      if (bootPromise === currentBootPromise) {
+        bootPromise = null;
+        bootingOrgSlug = null;
+        throw error;
+      }
     }
   })();
 
-  return bootPromise;
+  bootPromise = currentBootPromise;
+  bootingOrgSlug = orgSlug;
+
+  return currentBootPromise;
 }
 
 /**
  * Shutdown Intercom and clear session data.
  * Call this when user logs out or switches organizations.
  */
 export async function shutdownIntercom(): Promise<void> {
+  // Invalidate any in-flight boot immediately.
+  bootPromise = null;
+  bootingOrgSlug = null;
+
   if (!hasBooted) {
     return;
   }
@@ -105,11 +132,18 @@ export async function shutdownIntercom(): Promise<void> {
  */
 export async function showIntercom(orgSlug: string): Promise<void> {
   // If booted for a different org, shutdown first to re-initialize with new org context
-  if (hasBooted && bootedOrgSlug !== orgSlug) {
+  if (
+    (hasBooted && bootedOrgSlug !== orgSlug) ||
+    (bootPromise && bootingOrgSlug !== orgSlug)
+  ) {
     await shutdownIntercom();
   }
 
   await initIntercom(orgSlug);
+  if (!hasBooted || bootedOrgSlug !== orgSlug) {
+    return;
+  }
+
   const {show} = await import('@intercom/messenger-js-sdk');
   show();
 }