From 7587908ac772effc91b0d84bbe85495839649e5e Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Tue, 6 Jan 2026 19:05:10 -0800
Subject: [PATCH] feat: improve accounts dashboard with activity feed and bug
 fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add new Activity tab showing unified activity stream (Slack, emails, events, payments, working groups)
- Fix "Needs Attention" to exclude paying members in good standing
- Fix fire emoji display by removing letter-spacing that broke rendering
- Loosen "Hot Prospects" criteria (engagement >= 50 OR high interest)
- Extend "New Insights" from 7 days to 30 days
- Add source filter validation for security
- Improve escapeHtml to handle quotes
- Add expiring_soon attention badge styling

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .changeset/accounts-dashboard-improvements.md |  11 +
 server/public/admin-account-detail.html       |   1 -
 server/public/admin-accounts.html             | 315 +++++++++++++++++-
 server/src/routes/admin/accounts.ts           | 236 +++++++++++--
 4 files changed, 532 insertions(+), 31 deletions(-)
 create mode 100644 .changeset/accounts-dashboard-improvements.md

diff --git a/.changeset/accounts-dashboard-improvements.md b/.changeset/accounts-dashboard-improvements.md
new file mode 100644
index 0000000000..0c1b148125
--- /dev/null
+++ b/.changeset/accounts-dashboard-improvements.md
@@ -0,0 +1,11 @@
+---
+"adcontextprotocol": minor
+---
+
+Improve accounts dashboard with activity feed and bug fixes
+
+- Add new Activity tab showing unified activity stream (Slack, emails, events, payments, working groups)
+- Fix "Needs Attention" to exclude paying members in good standing (only show prospects with action items or members with expiring subscriptions)
+- Fix fire emoji display in account detail page
+- Loosen "Hot Prospects" criteria (engagement >= 50 OR high interest, not AND)
+- Extend "New Insights" from 7 days to 30 days of Slack activity
diff --git a/server/public/admin-account-detail.html b/server/public/admin-account-detail.html
index ecb7b10138..ff3428641b 100644
--- a/server/public/admin-account-detail.html
+++ b/server/public/admin-account-detail.html
@@ -90,7 +90,6 @@
     /* Engagement fires */
     .engagement-fires {
       font-size: var(--text-xl);
-      letter-spacing: 2px;
     }
 
     /* Member status badges */
diff --git a/server/public/admin-accounts.html b/server/public/admin-accounts.html
index d591b15297..d004e1064c 100644
--- a/server/public/admin-accounts.html
+++ b/server/public/admin-accounts.html
@@ -170,7 +170,7 @@
 
     /* Engagement fires */
     .engagement-fires {
-      letter-spacing: 1px;
+      /* No letter-spacing - breaks emoji rendering */
     }
 
     /* Owner */
@@ -193,6 +193,7 @@
     .attention-recent_activity { background: var(--color-success-100); color: var(--color-success-700); }
     .attention-high_engagement_unowned { background: var(--color-warning-100); color: var(--color-warning-700); }
     .attention-needs_review { background: var(--color-gray-200); color: var(--color-text-secondary); }
+    .attention-expiring_soon { background: var(--color-warning-100); color: var(--color-warning-700); }
 
     /* Activity date coloring */
     .activity-recent { color: var(--color-success-600); }
@@ -302,6 +303,122 @@
     .btn-secondary:hover {
       background: var(--color-gray-200);
     }
+
+    /* Activity Feed */
+    .activity-feed {
+      background: var(--color-bg-card);
+      border-radius: var(--radius-md);
+      box-shadow: var(--shadow-xs);
+      overflow: hidden;
+    }
+    .activity-item {
+      display: flex;
+      align-items: flex-start;
+      gap: var(--space-3);
+      padding: var(--space-4);
+      border-bottom: var(--border-1) solid var(--color-gray-100);
+      transition: var(--transition-all);
+    }
+    .activity-item:last-child {
+      border-bottom: none;
+    }
+    .activity-item:hover {
+      background: var(--color-gray-50);
+    }
+    .activity-icon {
+      width: 36px;
+      height: 36px;
+      border-radius: var(--radius-full);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: var(--text-lg);
+      flex-shrink: 0;
+    }
+    .activity-icon.slack { background: var(--color-primary-100); }
+    .activity-icon.email { background: var(--color-info-100); }
+    .activity-icon.event { background: var(--color-warning-100); }
+    .activity-icon.payment { background: var(--color-success-100); }
+    .activity-icon.working_group { background: var(--color-primary-100); }
+    .activity-content {
+      flex: 1;
+      min-width: 0;
+    }
+    .activity-header {
+      display: flex;
+      align-items: center;
+      gap: var(--space-2);
+      margin-bottom: var(--space-1);
+    }
+    .activity-actor {
+      font-weight: var(--font-semibold);
+      color: var(--color-text-heading);
+    }
+    .activity-action {
+      color: var(--color-text-secondary);
+      font-size: var(--text-sm);
+    }
+    .activity-org {
+      color: var(--color-brand);
+      text-decoration: none;
+      font-size: var(--text-sm);
+    }
+    .activity-org:hover {
+      text-decoration: underline;
+    }
+    .activity-description {
+      font-size: var(--text-sm);
+      color: var(--color-text-secondary);
+      margin-top: var(--space-1);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .activity-time {
+      font-size: var(--text-xs);
+      color: var(--color-text-muted);
+      flex-shrink: 0;
+    }
+    .activity-filters {
+      display: flex;
+      gap: var(--space-2);
+      margin-bottom: var(--space-4);
+      flex-wrap: wrap;
+    }
+    .activity-filter {
+      padding: var(--space-1) var(--space-3);
+      border-radius: var(--radius-full);
+      font-size: var(--text-xs);
+      cursor: pointer;
+      background: var(--color-gray-100);
+      border: none;
+      color: var(--color-text-secondary);
+      transition: var(--transition-all);
+    }
+    .activity-filter:hover {
+      background: var(--color-gray-200);
+    }
+    .activity-filter.active {
+      background: var(--color-brand);
+      color: white;
+    }
+    .load-more {
+      text-align: center;
+      padding: var(--space-4);
+    }
+    .load-more-btn {
+      padding: var(--space-2) var(--space-4);
+      border: var(--border-1) solid var(--color-border);
+      border-radius: var(--radius-md);
+      background: white;
+      color: var(--color-text-secondary);
+      cursor: pointer;
+      font-size: var(--text-sm);
+    }
+    .load-more-btn:hover {
+      background: var(--color-gray-50);
+      border-color: var(--color-gray-300);
+    }
   </style>
 </head>
 <body>
@@ -321,6 +438,9 @@ <h1>Accounts</h1>
 
     <!-- View Tabs -->
     <div class="view-tabs">
+      <button class="view-tab" data-view="activity">
+        Activity
+      </button>
       <button class="view-tab active" data-view="needs_attention">
         Needs Attention <span class="badge" id="count-needs_attention">-</span>
       </button>
@@ -360,8 +480,8 @@ <h1>Accounts</h1>
       </select>
     </div>
 
-    <!-- Table -->
-    <div class="table-container">
+    <!-- Table (for account views) -->
+    <div class="table-container" id="accountsContainer">
       <table>
         <thead>
           <tr>
@@ -379,6 +499,24 @@ <h1>Accounts</h1>
         </tbody>
       </table>
     </div>
+
+    <!-- Activity Feed (for activity view) -->
+    <div id="activityContainer" style="display: none;">
+      <div class="activity-filters">
+        <button class="activity-filter active" data-source="all">All</button>
+        <button class="activity-filter" data-source="slack">Slack</button>
+        <button class="activity-filter" data-source="email">Email</button>
+        <button class="activity-filter" data-source="event">Events</button>
+        <button class="activity-filter" data-source="payment">Payments</button>
+        <button class="activity-filter" data-source="working_group">Groups</button>
+      </div>
+      <div class="activity-feed" id="activityFeed">
+        <div class="loading" style="padding: var(--space-8);">Loading activity...</div>
+      </div>
+      <div class="load-more" id="loadMoreContainer" style="display: none;">
+        <button class="load-more-btn" onclick="loadMoreActivity()">Load More</button>
+      </div>
+    </div>
   </div>
 
   <script>
@@ -386,8 +524,12 @@ <h1>Accounts</h1>
     let teamMembers = [];
     let currentView = 'needs_attention';
     let searchTimeout = null;
+    let activityData = [];
+    let activityOffset = 0;
+    let activitySourceFilter = 'all';
 
     const viewDescriptions = {
+      activity: 'Recent activity across the community: Slack, emails, events, payments',
       needs_attention: 'Accounts needing action: overdue tasks, open invoices, unowned hot prospects',
       new_insights: 'Prospects with recent Slack activity from their team',
       hot: 'High engagement prospects ready to convert',
@@ -423,7 +565,31 @@ <h1>Accounts</h1>
           tab.classList.add('active');
           currentView = tab.dataset.view;
           document.getElementById('viewDescription').textContent = viewDescriptions[currentView] || '';
-          loadAccounts();
+
+          // Toggle between activity and accounts view
+          if (currentView === 'activity') {
+            document.getElementById('accountsContainer').style.display = 'none';
+            document.getElementById('activityContainer').style.display = 'block';
+            document.querySelector('.filters-bar').style.display = 'none';
+            activityOffset = 0;
+            loadActivityFeed();
+          } else {
+            document.getElementById('accountsContainer').style.display = 'block';
+            document.getElementById('activityContainer').style.display = 'none';
+            document.querySelector('.filters-bar').style.display = 'flex';
+            loadAccounts();
+          }
+        });
+      });
+
+      // Set up activity filter handlers
+      document.querySelectorAll('.activity-filter').forEach(btn => {
+        btn.addEventListener('click', () => {
+          document.querySelectorAll('.activity-filter').forEach(b => b.classList.remove('active'));
+          btn.classList.add('active');
+          activitySourceFilter = btn.dataset.source;
+          activityOffset = 0;
+          loadActivityFeed();
         });
       });
     }
@@ -522,7 +688,8 @@ <h1>Accounts</h1>
             going_cold: 'Going Cold',
             recent_activity: 'Active',
             high_engagement_unowned: 'Unowned',
-            needs_review: 'Review'
+            needs_review: 'Review',
+            expiring_soon: 'Expiring'
           };
           extraColumnHtml = `<td><span class="attention-badge attention-${account.attention_reason}">${reasonLabels[account.attention_reason] || account.attention_reason}</span></td>`;
         } else if (showExtraColumn) {
@@ -659,7 +826,143 @@ <h1>Accounts</h1>
 
     function escapeHtml(str) {
       if (!str) return '';
-      return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+      return String(str)
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;');
+    }
+
+    // Activity Feed Functions
+    async function loadActivityFeed(append = false) {
+      const feed = document.getElementById('activityFeed');
+      const loadMoreContainer = document.getElementById('loadMoreContainer');
+
+      if (!append) {
+        feed.innerHTML = '<div class="loading" style="padding: var(--space-8);">Loading activity...</div>';
+      }
+
+      try {
+        let url = `/api/admin/activity-feed?limit=50&offset=${activityOffset}`;
+        if (activitySourceFilter && activitySourceFilter !== 'all') {
+          url += `&source=${activitySourceFilter}`;
+        }
+
+        const response = await fetch(url);
+        if (!response.ok) throw new Error('Failed to load activity');
+
+        const data = await response.json();
+        activityData = append ? [...activityData, ...data.activities] : data.activities;
+
+        renderActivityFeed(append);
+
+        // Show/hide load more button
+        loadMoreContainer.style.display = data.pagination.has_more ? 'block' : 'none';
+      } catch (e) {
+        console.error('Error loading activity feed:', e);
+        if (!append) {
+          feed.innerHTML = '<div class="empty-state">Error loading activity</div>';
+        }
+      }
+    }
+
+    function loadMoreActivity() {
+      activityOffset += 50;
+      loadActivityFeed(true);
+    }
+
+    function renderActivityFeed(append = false) {
+      const feed = document.getElementById('activityFeed');
+
+      if (activityData.length === 0) {
+        feed.innerHTML = '<div class="empty-state">No recent activity</div>';
+        return;
+      }
+
+      const sourceIcons = {
+        slack: '#',
+        email: '@',
+        event: '*',
+        payment: '$',
+        working_group: '+'
+      };
+
+      const actionLabels = {
+        message: 'posted a message',
+        thread_reply: 'replied to a thread',
+        channel_join: 'joined a channel',
+        email_received: 'sent an email',
+        registered: 'registered for',
+        attended: 'attended',
+        waitlisted: 'is waitlisted for',
+        subscription_initial: 'started a subscription',
+        subscription_recurring: 'renewed their subscription',
+        one_time: 'made a payment',
+        joined_group: 'joined'
+      };
+
+      let html = '';
+      for (const activity of activityData) {
+        const icon = sourceIcons[activity.source] || '?';
+        const actionLabel = actionLabels[activity.action] || activity.action;
+        const timeAgo = formatRelativeTime(activity.timestamp);
+
+        // Build org link if available
+        let orgHtml = '';
+        if (activity.org_id) {
+          orgHtml = `<a href="/admin/accounts/${activity.org_id}" class="activity-org">${escapeHtml(activity.org_name || 'Unknown')}</a>`;
+        } else if (activity.org_name) {
+          orgHtml = `<span class="activity-org" style="color: var(--color-text-secondary);">${escapeHtml(activity.org_name)}</span>`;
+        }
+
+        // Format payment amount if available
+        let descriptionHtml = '';
+        if (activity.description) {
+          descriptionHtml = `<div class="activity-description">${escapeHtml(activity.description)}</div>`;
+        }
+        if (activity.metadata?.amount) {
+          const amount = (activity.metadata.amount / 100).toLocaleString('en-US', { style: 'currency', currency: activity.metadata.currency || 'USD' });
+          descriptionHtml = `<div class="activity-description">${amount}</div>`;
+        }
+
+        html += `
+          <div class="activity-item">
+            <div class="activity-icon ${activity.source}">${icon}</div>
+            <div class="activity-content">
+              <div class="activity-header">
+                <span class="activity-actor">${escapeHtml(activity.actor_name || 'Unknown')}</span>
+                <span class="activity-action">${actionLabel}</span>
+                ${orgHtml}
+              </div>
+              ${descriptionHtml}
+            </div>
+            <span class="activity-time">${timeAgo}</span>
+          </div>
+        `;
+      }
+
+      if (append) {
+        feed.innerHTML += html;
+      } else {
+        feed.innerHTML = html;
+      }
+    }
+
+    function formatRelativeTime(timestamp) {
+      if (!timestamp) return '';
+      const date = new Date(timestamp);
+      const now = new Date();
+      const diffMs = now - date;
+      const diffMins = Math.floor(diffMs / 60000);
+      const diffHours = Math.floor(diffMs / 3600000);
+      const diffDays = Math.floor(diffMs / 86400000);
+
+      if (diffMins < 1) return 'Just now';
+      if (diffMins < 60) return `${diffMins}m ago`;
+      if (diffHours < 24) return `${diffHours}h ago`;
+      if (diffDays < 7) return `${diffDays}d ago`;
+      return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
     }
 
     document.addEventListener('DOMContentLoaded', init);
diff --git a/server/src/routes/admin/accounts.ts b/server/src/routes/admin/accounts.ts
index 740055f659..e3211fec0d 100644
--- a/server/src/routes/admin/accounts.ts
+++ b/server/src/routes/admin/accounts.ts
@@ -513,7 +513,8 @@ export function setupAccountRoutes(
 
       switch (viewName) {
         case "needs_attention":
-          // All accounts needing action: overdue next steps, open invoices, high engagement unowned
+          // Accounts needing action: prospects with overdue tasks/invoices/high engagement,
+          // OR members with real problems (expiring soon)
           query = `
             ${selectFields},
             na.next_step_due_date as next_step_due,
@@ -522,6 +523,8 @@ export function setupAccountRoutes(
               WHEN na.next_step_due_date < CURRENT_DATE THEN 'overdue'
               WHEN na.next_step_due_date <= CURRENT_DATE + INTERVAL '7 days' THEN 'due_soon'
               WHEN oi.stripe_invoice_id IS NOT NULL THEN 'open_invoice'
+              WHEN o.subscription_current_period_end <= NOW() + INTERVAL '30 days'
+                AND o.subscription_status = 'active' THEN 'expiring_soon'
               WHEN COALESCE(o.engagement_score, 0) >= 50 AND NOT EXISTS (
                 SELECT 1 FROM org_stakeholders os WHERE os.organization_id = o.workos_organization_id
               ) THEN 'high_engagement_unowned'
@@ -536,14 +539,26 @@ export function setupAccountRoutes(
               AND oi.status IN ('draft', 'open')
             WHERE COALESCE(o.prospect_status, 'prospect') != 'disqualified'
               AND (
-                na.id IS NOT NULL
-                OR oi.stripe_invoice_id IS NOT NULL
-                OR (
-                  COALESCE(o.engagement_score, 0) >= 50
-                  AND NOT EXISTS (
-                    SELECT 1 FROM org_stakeholders os WHERE os.organization_id = o.workos_organization_id
+                -- Non-members: show if they have action items
+                (
+                  (o.subscription_status IS NULL OR o.subscription_status NOT IN ('active', 'trialing'))
+                  AND (
+                    na.id IS NOT NULL
+                    OR oi.stripe_invoice_id IS NOT NULL
+                    OR (
+                      COALESCE(o.engagement_score, 0) >= 50
+                      AND NOT EXISTS (
+                        SELECT 1 FROM org_stakeholders os WHERE os.organization_id = o.workos_organization_id
+                      )
+                    )
                   )
                 )
+                OR
+                -- Members: only show if they have a real problem
+                (
+                  o.subscription_status = 'active'
+                  AND o.subscription_current_period_end <= NOW() + INTERVAL '30 days'
+                )
               )
           `;
           orderBy = ` ORDER BY
@@ -589,7 +604,7 @@ export function setupAccountRoutes(
           break;
 
         case "hot":
-          // High engagement non-members
+          // High engagement non-members (engagement >= 50 OR high/very_high interest)
           query = `
             ${selectFields}
             FROM organizations o
@@ -597,8 +612,10 @@ export function setupAccountRoutes(
               o.subscription_status IS NULL
               OR o.subscription_status NOT IN ('active', 'trialing')
             )
-            AND COALESCE(o.engagement_score, 0) >= 50
-            AND o.interest_level IN ('high', 'very_high')
+            AND (
+              COALESCE(o.engagement_score, 0) >= 50
+              OR o.interest_level IN ('high', 'very_high')
+            )
             AND COALESCE(o.prospect_status, 'prospect') != 'disqualified'
           `;
           orderBy = ` ORDER BY o.engagement_score DESC NULLS LAST`;
@@ -621,7 +638,7 @@ export function setupAccountRoutes(
           break;
 
         case "new_insights":
-          // Accounts with recent member activity/insights
+          // Accounts with recent member activity/insights (extended to 30 days)
           // Joins through organization_memberships to find orgs with recent Slack activity
           query = `
             ${selectFields},
@@ -632,7 +649,7 @@ export function setupAccountRoutes(
               FROM organization_memberships om
               JOIN slack_user_mappings sm ON sm.workos_user_id = om.workos_user_id
               WHERE om.workos_organization_id = o.workos_organization_id
-                AND sm.last_slack_activity_at >= NOW() - INTERVAL '7 days'
+                AND sm.last_slack_activity_at >= NOW() - INTERVAL '30 days'
             ) latest_activity ON latest_activity.latest_activity_at IS NOT NULL
             WHERE COALESCE(o.prospect_status, 'prospect') != 'disqualified'
               AND (o.subscription_status IS NULL OR o.subscription_status NOT IN ('active', 'trialing'))
@@ -930,7 +947,7 @@ export function setupAccountRoutes(
           members,
           disqualified,
         ] = await Promise.all([
-          // Needs attention - all accounts needing action
+          // Needs attention - prospects with action items OR members with real problems
           pool.query(`
             SELECT COUNT(DISTINCT o.workos_organization_id) as count
             FROM organizations o
@@ -942,18 +959,30 @@ export function setupAccountRoutes(
               AND oi.status IN ('draft', 'open')
             WHERE COALESCE(o.prospect_status, 'prospect') != 'disqualified'
               AND (
-                na.id IS NOT NULL
-                OR oi.stripe_invoice_id IS NOT NULL
-                OR (
-                  COALESCE(o.engagement_score, 0) >= 50
-                  AND NOT EXISTS (
-                    SELECT 1 FROM org_stakeholders os WHERE os.organization_id = o.workos_organization_id
+                -- Non-members: show if they have action items
+                (
+                  (o.subscription_status IS NULL OR o.subscription_status NOT IN ('active', 'trialing'))
+                  AND (
+                    na.id IS NOT NULL
+                    OR oi.stripe_invoice_id IS NOT NULL
+                    OR (
+                      COALESCE(o.engagement_score, 0) >= 50
+                      AND NOT EXISTS (
+                        SELECT 1 FROM org_stakeholders os WHERE os.organization_id = o.workos_organization_id
+                      )
+                    )
                   )
                 )
+                OR
+                -- Members: only show if they have a real problem (expiring soon)
+                (
+                  o.subscription_status = 'active'
+                  AND o.subscription_current_period_end <= NOW() + INTERVAL '30 days'
+                )
               )
           `),
 
-          // New insights - prospects with recent Slack activity
+          // New insights - prospects with recent Slack activity (30 days)
           pool.query(`
             SELECT COUNT(DISTINCT o.workos_organization_id) as count
             FROM organizations o
@@ -961,19 +990,21 @@ export function setupAccountRoutes(
               SELECT 1 FROM organization_memberships om
               JOIN slack_user_mappings sm ON sm.workos_user_id = om.workos_user_id
               WHERE om.workos_organization_id = o.workos_organization_id
-                AND sm.last_slack_activity_at >= NOW() - INTERVAL '7 days'
+                AND sm.last_slack_activity_at >= NOW() - INTERVAL '30 days'
             )
             AND COALESCE(o.prospect_status, 'prospect') != 'disqualified'
             AND (o.subscription_status IS NULL OR o.subscription_status NOT IN ('active', 'trialing'))
           `),
 
-          // Hot prospects
+          // Hot prospects (engagement >= 50 OR high interest)
           pool.query(`
             SELECT COUNT(*) as count
             FROM organizations o
             WHERE (o.subscription_status IS NULL OR o.subscription_status NOT IN ('active', 'trialing'))
-              AND COALESCE(o.engagement_score, 0) >= 50
-              AND o.interest_level IN ('high', 'very_high')
+              AND (
+                COALESCE(o.engagement_score, 0) >= 50
+                OR o.interest_level IN ('high', 'very_high')
+              )
               AND COALESCE(o.prospect_status, 'prospect') != 'disqualified'
           `),
 
@@ -1055,6 +1086,163 @@ export function setupAccountRoutes(
     }
   );
 
+  // GET /api/admin/activity-feed - Unified activity stream across all sources
+  apiRouter.get(
+    "/activity-feed",
+    requireAuth,
+    requireAdmin,
+    async (req, res) => {
+      try {
+        const pool = getPool();
+        const { limit: limitParam, offset: offsetParam, source } = req.query;
+
+        const limit = Math.min(Math.max(parseInt(limitParam as string) || 50, 1), 200);
+        const offset = Math.max(parseInt(offsetParam as string) || 0, 0);
+
+        // Build source filter if provided - validate against allowed sources
+        const ALLOWED_SOURCES = ['slack', 'email', 'event', 'payment', 'working_group'];
+        const sourceFilter = source && typeof source === "string"
+          ? source.split(",").map(s => s.trim()).filter(s => ALLOWED_SOURCES.includes(s))
+          : null;
+
+        // Unified activity query with multiple sources
+        const query = `
+          WITH activity_stream AS (
+            -- Slack activity
+            SELECT
+              'slack' as source,
+              sa.activity_timestamp as timestamp,
+              sa.activity_type as action,
+              COALESCE(sm.slack_display_name, sm.slack_real_name, 'Unknown') as actor_name,
+              o.name as org_name,
+              o.workos_organization_id as org_id,
+              NULL as description,
+              NULL as metadata
+            FROM slack_activities sa
+            JOIN slack_user_mappings sm ON sm.slack_user_id = sa.slack_user_id
+            LEFT JOIN organization_memberships om ON om.workos_user_id = sm.workos_user_id
+            LEFT JOIN organizations o ON o.workos_organization_id = om.workos_organization_id
+            WHERE sa.activity_timestamp > NOW() - INTERVAL '7 days'
+              AND sa.activity_type IN ('message', 'thread_reply', 'channel_join')
+
+            UNION ALL
+
+            -- Email contact activity
+            SELECT
+              'email' as source,
+              eca.email_date as timestamp,
+              'email_received' as action,
+              COALESCE(ec.name, ec.email) as actor_name,
+              o.name as org_name,
+              o.workos_organization_id as org_id,
+              eca.subject as description,
+              NULL as metadata
+            FROM email_contact_activities eca
+            JOIN email_activity_contacts eac ON eac.activity_id = eca.id AND eac.is_primary = true
+            JOIN email_contacts ec ON ec.id = eac.contact_id
+            LEFT JOIN organizations o ON o.workos_organization_id = ec.organization_id
+            WHERE eca.email_date > NOW() - INTERVAL '7 days'
+
+            UNION ALL
+
+            -- Event registrations
+            SELECT
+              'event' as source,
+              COALESCE(er.registered_at, er.created_at) as timestamp,
+              CASE
+                WHEN er.attended THEN 'attended'
+                ELSE er.registration_status
+              END as action,
+              COALESCE(ec.name, u.first_name || ' ' || u.last_name, ec.email, 'Unknown') as actor_name,
+              e.title as org_name,
+              NULL as org_id,
+              e.title as description,
+              NULL as metadata
+            FROM event_registrations er
+            JOIN events e ON e.id = er.event_id
+            LEFT JOIN email_contacts ec ON ec.id = er.email_contact_id
+            LEFT JOIN users u ON u.workos_user_id = er.workos_user_id
+            WHERE COALESCE(er.registered_at, er.created_at) > NOW() - INTERVAL '7 days'
+
+            UNION ALL
+
+            -- Revenue events (payments)
+            SELECT
+              'payment' as source,
+              re.created_at as timestamp,
+              re.revenue_type as action,
+              o.name as actor_name,
+              o.name as org_name,
+              o.workos_organization_id as org_id,
+              re.product_name as description,
+              jsonb_build_object('amount', re.amount_paid, 'currency', re.currency) as metadata
+            FROM revenue_events re
+            JOIN organizations o ON o.workos_organization_id = re.workos_organization_id
+            WHERE re.created_at > NOW() - INTERVAL '30 days'
+
+            UNION ALL
+
+            -- Working group membership changes
+            SELECT
+              'working_group' as source,
+              wgm.joined_at as timestamp,
+              'joined_group' as action,
+              o.name as actor_name,
+              wg.name as org_name,
+              o.workos_organization_id as org_id,
+              wg.name as description,
+              NULL as metadata
+            FROM working_group_memberships wgm
+            JOIN working_groups wg ON wg.id = wgm.working_group_id
+            JOIN organizations o ON o.workos_organization_id = wgm.workos_organization_id
+            WHERE wgm.joined_at > NOW() - INTERVAL '30 days'
+              AND wgm.status = 'active'
+          )
+          SELECT *
+          FROM activity_stream
+          WHERE timestamp IS NOT NULL
+            ${sourceFilter ? `AND source = ANY($3)` : ''}
+          ORDER BY timestamp DESC
+          LIMIT $1 OFFSET $2
+        `;
+
+        const params: (number | string[])[] = [limit, offset];
+        if (sourceFilter) {
+          params.push(sourceFilter);
+        }
+
+        const result = await pool.query(query, params);
+
+        // Format response
+        const activities = result.rows.map(row => ({
+          source: row.source,
+          timestamp: row.timestamp,
+          action: row.action,
+          actor_name: row.actor_name,
+          org_name: row.org_name,
+          org_id: row.org_id,
+          description: row.description,
+          metadata: row.metadata,
+        }));
+
+        res.json({
+          activities,
+          pagination: {
+            limit,
+            offset,
+            has_more: activities.length === limit,
+          },
+        });
+      } catch (error) {
+        logger.error({ err: error }, "Error fetching activity feed");
+        res.status(500).json({
+          error: "Internal server error",
+          message: "Unable to fetch activity feed",
+        });
+      }
+    }
+  );
+
   /**
    * Convert account type between personal and team
    *