feat(webapp): attribute Plain support threads to their org tenant

Author: isshaddad

apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx

@@ -95,6 +95,8 @@ export const action = dashboardAction(
               email: user.email,
               name: user.name ?? "",
               title: "Plan cancelation feedback",
+              organizationId: organization.id,
+              organizationName: organization.title,
               components: [
                 uiComponent.text({
                   text: `${user.name} (${user.email}) just canceled their plan.`,

apps/webapp/app/utils/plain.server.ts

@@ -9,9 +9,20 @@ type Input = {
   title: string;
   components: ReturnType<typeof uiComponent.text>[];
   labelTypeIds?: string[];
+  organizationId?: string;
+  organizationName?: string;
 };
 
-export async function sendToPlain({ userId, email, name, title, components, labelTypeIds }: Input) {
+export async function sendToPlain({
+  userId,
+  email,
+  name,
+  title,
+  components,
+  labelTypeIds,
+  organizationId,
+  organizationName,
+}: Input) {
   if (!env.PLAIN_API_KEY) {
     return;
   }
@@ -53,6 +64,34 @@ export async function sendToPlain({ userId, email, name, title, components, labe
       return;
     }
 
+    // Attribute the thread to the org so support data can be rolled up per org: the tenant is
+    // keyed by externalId = org_id. Isolated in its own try/catch, and the thread's
+    // tenantIdentifier is gated on success — so a tenant failure (e.g. an API key without
+    // tenant scope) downgrades to "no attribution" instead of dropping the thread. The
+    // customer's own externalId (User.id, used by the customer cards + impersonation link) is
+    // left untouched.
+    let tenantLinked = false;
+    if (organizationId) {
+      try {
+        await client.mutation.upsertTenant({
+          input: {
+            identifier: { externalId: organizationId },
+            externalId: organizationId,
+            name: organizationName ?? organizationId,
+          },
+        });
+        await client.mutation.addCustomerToTenants({
+          input: {
+            customerIdentifier: { customerId },
+            tenantIdentifiers: [{ externalId: organizationId }],
+          },
+        });
+        tenantLinked = true;
+      } catch (error) {
+        console.error("Failed to link Plain customer to org tenant", error);
+      }
+    }
+
     await client.mutation.createThread({
       input: {
         customerIdentifier: {
@@ -61,6 +100,7 @@ export async function sendToPlain({ userId, email, name, title, components, labe
         title: title,
         components: components,
         labelTypeIds,
+        tenantIdentifier: tenantLinked ? { externalId: organizationId } : undefined,
       },
     });
   } catch (error) {

apps/webapp/app/v3/services/setBranchesAddOn.server.ts

@@ -74,6 +74,8 @@ export class SetBranchesAddOnService extends BaseService {
             email: user.email,
             name: user.name ?? user.displayName ?? user.email,
             title: `Preview branches quota request: ${amount}`,
+            organizationId,
+            organizationName: organization?.title,
             components: [
               uiComponent.text({
                 text: `Org: ${organization?.title} (${organizationId})`,

apps/webapp/app/v3/services/setConcurrencyAddOn.server.ts

@@ -106,6 +106,8 @@ export class SetConcurrencyAddOnService extends BaseService {
             email: user.email,
             name: user.name ?? user.displayName ?? user.email,
             title: `Concurrency quota request: ${totalExtraConcurrency}`,
+            organizationId,
+            organizationName: organization?.title,
             components: [
               uiComponent.text({
                 text: `Org: ${organization?.title} (${organizationId})`,

apps/webapp/app/v3/services/setSchedulesAddOn.server.ts

@@ -74,6 +74,8 @@ export class SetSchedulesAddOnService extends BaseService {
             email: user.email,
             name: user.name ?? user.displayName ?? user.email,
             title: `Schedules quota request: ${amount}`,
+            organizationId,
+            organizationName: organization?.title,
             components: [
               uiComponent.text({
                 text: `Org: ${organization?.title} (${organizationId})`,

apps/webapp/app/v3/services/setSeatsAddOn.server.ts

@@ -74,6 +74,8 @@ export class SetSeatsAddOnService extends BaseService {
             email: user.email,
             name: user.name ?? user.displayName ?? user.email,
             title: `Seats quota request: ${amount}`,
+            organizationId,
+            organizationName: organization?.title,
             components: [
               uiComponent.text({
                 text: `Org: ${organization?.title} (${organizationId})`,