From d1fca571601f30631cf6121796792d8f58f491a5 Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Sun, 4 Jan 2026 19:58:37 -0500
Subject: [PATCH 1/4] Add committee leadership tools for Addie and industry
 gatherings support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add Addie admin tools: add_committee_leader, remove_committee_leader, list_committee_leaders
- Display industry gatherings in dashboard committees section
- Add "Committee Leader" dev user for testing committee management
- Seed CES 2026 and Cannes Lions 2026 as industry gatherings
- Fix committees nav to link to #committees anchor

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .changeset/happy-nights-talk.md               |   4 +
 server/public/dashboard-nav.js                |   2 +-
 server/public/dashboard.html                  |  16 +-
 server/public/dev-login.html                  |  15 ++
 server/src/addie/mcp/admin-tools.ts           | 223 ++++++++++++++++++
 .../135_seed_dev_committee_leader.sql         |  35 +++
 .../136_seed_industry_gatherings.sql          |  73 ++++++
 server/src/middleware/auth.ts                 |  10 +
 8 files changed, 376 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/happy-nights-talk.md
 create mode 100644 server/src/db/migrations/135_seed_dev_committee_leader.sql
 create mode 100644 server/src/db/migrations/136_seed_industry_gatherings.sql

diff --git a/.changeset/happy-nights-talk.md b/.changeset/happy-nights-talk.md
new file mode 100644
index 0000000000..4c3ad70f2f
--- /dev/null
+++ b/.changeset/happy-nights-talk.md
@@ -0,0 +1,4 @@
+---
+---
+
+Add committee leadership management tools for Addie and display industry gatherings in the dashboard committees section.
diff --git a/server/public/dashboard-nav.js b/server/public/dashboard-nav.js
index 62528ffc35..5299eae067 100644
--- a/server/public/dashboard-nav.js
+++ b/server/public/dashboard-nav.js
@@ -68,7 +68,7 @@
         items: [
           { href: isDashboardPage ? '#profile' : '/dashboard#profile', label: 'Member Profile', icon: '🏢', anchor: 'profile' },
           { href: isDashboardPage ? '#team' : '/dashboard#team', label: 'Team', icon: '👥', anchor: 'team' },
-          { href: isDashboardPage ? '#working-groups' : '/dashboard#working-groups', label: 'Working Groups', icon: '🏛️', anchor: 'working-groups' },
+          { href: isDashboardPage ? '#committees' : '/dashboard#committees', label: 'Committees', icon: '🏛️', anchor: 'committees' },
           { href: isDashboardPage ? '#leadership' : '/dashboard#leadership', label: 'Leadership', icon: '👔', anchor: 'leadership', hidden: true, id: 'leadershipNavItem' },
           { href: isDashboardPage ? '#membership' : '/dashboard#membership', label: 'Membership', icon: '⭐', anchor: 'membership' },
         ]
diff --git a/server/public/dashboard.html b/server/public/dashboard.html
index 5654e97ac4..c2a2cc0639 100644
--- a/server/public/dashboard.html
+++ b/server/public/dashboard.html
@@ -1856,7 +1856,8 @@ <h3 style="margin: 0 0 8px 0; font-size: 18px; color: var(--color-text-heading);
         const byType = {
           working_group: allCommittees.filter(c => c.committee_type === 'working_group'),
           council: allCommittees.filter(c => c.committee_type === 'council'),
-          chapter: allCommittees.filter(c => c.committee_type === 'chapter')
+          chapter: allCommittees.filter(c => c.committee_type === 'chapter'),
+          industry_gathering: allCommittees.filter(c => c.committee_type === 'industry_gathering')
         };
 
         // Helper to get icon and colors
@@ -1876,6 +1877,9 @@ <h3 style="margin: 0 0 8px 0; font-size: 18px; color: var(--color-text-heading);
           } else if (committee.committee_type === 'chapter') {
             icon = '📍';
             bgColor = 'var(--color-info-100)';
+          } else if (committee.committee_type === 'industry_gathering') {
+            icon = '✈️';
+            bgColor = 'var(--color-primary-50)';
           }
 
           return { icon, bgColor, isJoined, isLaunching };
@@ -1951,6 +1955,16 @@ <h3 style="margin: 0 0 8px 0; font-size: 18px; color: var(--color-text-heading);
           `;
         }
 
+        // Industry Gatherings
+        if (byType.industry_gathering.length > 0) {
+          html += `
+            <div style="margin-bottom: 16px;">
+              <div style="font-size: 11px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.5px; color: var(--color-text-muted); margin-bottom: 8px; padding-bottom: 4px; border-bottom: 1px solid var(--color-border);">Industry Gatherings</div>
+              ${byType.industry_gathering.map(renderCommitteeItem).join('')}
+            </div>
+          `;
+        }
+
         // Browse all link
         html += `<a href="/committees" class="btn btn-ghost btn-sm" style="width: 100%;">Browse All Committees</a>`;
 
diff --git a/server/public/dev-login.html b/server/public/dev-login.html
index 57989eec5d..fbab6533b6 100644
--- a/server/public/dev-login.html
+++ b/server/public/dev-login.html
@@ -233,6 +233,21 @@ <h2 class="dev-login__section-title">Available Users</h2>
         <div class="user-card__description">Regular member with organization access, no admin privileges</div>
       </button>
 
+      <button class="user-card" onclick="loginAs('leader')">
+        <div class="user-card__header">
+          <div class="user-card__avatar user-card__avatar--member">🎯</div>
+          <div class="user-card__info">
+            <div class="user-card__name">Committee Leader</div>
+            <div class="user-card__email">leader@test.local</div>
+          </div>
+        </div>
+        <div class="user-card__badges">
+          <span class="user-card__badge user-card__badge--member">Member</span>
+          <span class="user-card__badge" style="background: var(--color-primary-100); color: var(--color-primary-700);">Leader</span>
+        </div>
+        <div class="user-card__description">Committee leader who manages working groups (not a site admin)</div>
+      </button>
+
       <button class="user-card" onclick="loginAs('nonmember')">
         <div class="user-card__header">
           <div class="user-card__avatar user-card__avatar--nonmember">👻</div>
diff --git a/server/src/addie/mcp/admin-tools.ts b/server/src/addie/mcp/admin-tools.ts
index e8a94f28c3..6647d03757 100644
--- a/server/src/addie/mcp/admin-tools.ts
+++ b/server/src/addie/mcp/admin-tools.ts
@@ -983,6 +983,75 @@ Example: For CES 2026, create an industry gathering with name "CES 2026", locati
     },
   },
 
+  // ============================================
+  // COMMITTEE LEADERSHIP TOOLS
+  // ============================================
+  {
+    name: 'add_committee_leader',
+    description: `Add a user as a leader of a committee (working group, council, chapter, or industry gathering).
+Leaders have management access to their committee - they can create events, manage posts, and manage members.
+
+To find the user_id:
+1. Look up the user via Slack (use their Slack user ID to find their WorkOS user ID in the mapping)
+2. Or ask for their email and look up via get_organization_details
+
+To find the committee:
+1. Use list_working_groups, list_chapters, or list_industry_gatherings
+2. Use the committee's slug (e.g., "ces-2026", "technical-standards-wg")`,
+    usage_hints: 'Use when an admin wants to give someone committee management access. Get the user_id from Slack mapping or org details.',
+    input_schema: {
+      type: 'object',
+      properties: {
+        committee_slug: {
+          type: 'string',
+          description: 'The slug of the committee (e.g., "ces-2026", "creative-wg", "austin-chapter")',
+        },
+        user_id: {
+          type: 'string',
+          description: 'The WorkOS user ID of the person to make a leader',
+        },
+        user_email: {
+          type: 'string',
+          description: 'Optional: The user email (for confirmation/logging)',
+        },
+      },
+      required: ['committee_slug', 'user_id'],
+    },
+  },
+  {
+    name: 'remove_committee_leader',
+    description: `Remove a user from the leadership of a committee.
+The user will lose management access but will remain a regular member.`,
+    input_schema: {
+      type: 'object',
+      properties: {
+        committee_slug: {
+          type: 'string',
+          description: 'The slug of the committee',
+        },
+        user_id: {
+          type: 'string',
+          description: 'The WorkOS user ID of the leader to remove',
+        },
+      },
+      required: ['committee_slug', 'user_id'],
+    },
+  },
+  {
+    name: 'list_committee_leaders',
+    description: `List all leaders of a specific committee. Shows their user IDs, names, and organizations.`,
+    input_schema: {
+      type: 'object',
+      properties: {
+        committee_slug: {
+          type: 'string',
+          description: 'The slug of the committee to list leaders for',
+        },
+      },
+      required: ['committee_slug'],
+    },
+  },
+
   // ============================================
   // ORGANIZATION MANAGEMENT TOOLS
   // ============================================
@@ -3847,6 +3916,160 @@ export function createAdminToolHandlers(
     }
   });
 
+  // ============================================
+  // COMMITTEE LEADERSHIP HANDLERS
+  // ============================================
+
+  // Add committee leader
+  handlers.set('add_committee_leader', async (input) => {
+    const adminCheck = requireAdminFromContext();
+    if (adminCheck) return adminCheck;
+
+    const committeeSlug = (input.committee_slug as string)?.trim();
+    const userId = (input.user_id as string)?.trim();
+    const userEmail = input.user_email as string | undefined;
+
+    if (!committeeSlug) {
+      return '❌ Please provide a committee_slug (e.g., "ces-2026", "creative-wg").';
+    }
+
+    if (!userId) {
+      return '❌ Please provide a user_id (WorkOS user ID).';
+    }
+
+    try {
+      // Find the committee
+      const committee = await wgDb.getWorkingGroupBySlug(committeeSlug);
+      if (!committee) {
+        return `❌ Committee "${committeeSlug}" not found. Use list_working_groups, list_chapters, or list_industry_gatherings to find the correct slug.`;
+      }
+
+      // Check if already a leader
+      const leaders = await wgDb.getLeaders(committee.id);
+      if (leaders.some((l: { user_id: string }) => l.user_id === userId)) {
+        return `ℹ️ User is already a leader of "${committee.name}".`;
+      }
+
+      // Add as leader
+      await wgDb.addLeader(committee.id, userId);
+
+      // Also ensure they're a member
+      const memberships = await wgDb.getMembershipsByWorkingGroup(committee.id);
+      if (!memberships.some(m => m.workos_user_id === userId)) {
+        await wgDb.addMembership({
+          working_group_id: committee.id,
+          workos_user_id: userId,
+          user_email: userEmail,
+        });
+      }
+
+      logger.info({ committeeSlug, committeeName: committee.name, userId, userEmail }, 'Added committee leader via Addie');
+
+      const emailInfo = userEmail ? ` (${userEmail})` : '';
+      return `✅ Successfully added user ${userId}${emailInfo} as a leader of **${committee.name}**.
+
+They now have management access to:
+- Create and manage events
+- Create and manage posts
+- Manage committee members
+
+Committee management page: https://agenticadvertising.org/working-groups/${committeeSlug}/manage`;
+    } catch (error) {
+      logger.error({ error, committeeSlug, userId }, 'Error adding committee leader');
+      return '❌ Failed to add committee leader. Please try again.';
+    }
+  });
+
+  // Remove committee leader
+  handlers.set('remove_committee_leader', async (input) => {
+    const adminCheck = requireAdminFromContext();
+    if (adminCheck) return adminCheck;
+
+    const committeeSlug = (input.committee_slug as string)?.trim();
+    const userId = (input.user_id as string)?.trim();
+
+    if (!committeeSlug) {
+      return '❌ Please provide a committee_slug.';
+    }
+
+    if (!userId) {
+      return '❌ Please provide a user_id.';
+    }
+
+    try {
+      const committee = await wgDb.getWorkingGroupBySlug(committeeSlug);
+      if (!committee) {
+        return `❌ Committee "${committeeSlug}" not found.`;
+      }
+
+      // Check if they are a leader
+      const leaders = await wgDb.getLeaders(committee.id);
+      if (!leaders.some((l: { user_id: string }) => l.user_id === userId)) {
+        return `ℹ️ User ${userId} is not a leader of "${committee.name}".`;
+      }
+
+      await wgDb.removeLeader(committee.id, userId);
+
+      logger.info({ committeeSlug, committeeName: committee.name, userId }, 'Removed committee leader via Addie');
+
+      return `✅ Successfully removed user ${userId} as a leader of **${committee.name}**.
+
+They are still a member but no longer have management access.`;
+    } catch (error) {
+      logger.error({ error, committeeSlug, userId }, 'Error removing committee leader');
+      return '❌ Failed to remove committee leader. Please try again.';
+    }
+  });
+
+  // List committee leaders
+  handlers.set('list_committee_leaders', async (input) => {
+    const adminCheck = requireAdminFromContext();
+    if (adminCheck) return adminCheck;
+
+    const committeeSlug = (input.committee_slug as string)?.trim();
+
+    if (!committeeSlug) {
+      return '❌ Please provide a committee_slug.';
+    }
+
+    try {
+      const committee = await wgDb.getWorkingGroupBySlug(committeeSlug);
+      if (!committee) {
+        return `❌ Committee "${committeeSlug}" not found.`;
+      }
+
+      const leaders = await wgDb.getLeaders(committee.id);
+
+      if (leaders.length === 0) {
+        return `ℹ️ **${committee.name}** has no assigned leaders.
+
+Use add_committee_leader to assign a leader.`;
+      }
+
+      let response = `## Leaders of ${committee.name}\n\n`;
+      response += `**Committee type:** ${committee.committee_type}\n`;
+      response += `**Slug:** ${committeeSlug}\n\n`;
+
+      for (const leader of leaders) {
+        response += `- **User ID:** ${leader.user_id}\n`;
+        if (leader.name) {
+          response += `  **Name:** ${leader.name}\n`;
+        }
+        if (leader.org_name) {
+          response += `  **Org:** ${leader.org_name}\n`;
+        }
+        if (leader.created_at) {
+          response += `  Added: ${new Date(leader.created_at).toLocaleDateString()}\n`;
+        }
+      }
+
+      return response;
+    } catch (error) {
+      logger.error({ error, committeeSlug }, 'Error listing committee leaders');
+      return '❌ Failed to list committee leaders. Please try again.';
+    }
+  });
+
   // ============================================
   // ORGANIZATION MANAGEMENT HANDLERS
   // ============================================
diff --git a/server/src/db/migrations/135_seed_dev_committee_leader.sql b/server/src/db/migrations/135_seed_dev_committee_leader.sql
new file mode 100644
index 0000000000..7e94448a4b
--- /dev/null
+++ b/server/src/db/migrations/135_seed_dev_committee_leader.sql
@@ -0,0 +1,35 @@
+-- Migration: 135_seed_dev_committee_leader.sql
+-- Set up dev leader user as a leader of the Technical Standards Working Group
+-- This is only for local development testing
+
+-- Insert the dev leader user into working_group_leaders table
+-- Makes them a leader of the Technical Standards Working Group
+INSERT INTO working_group_leaders (working_group_id, user_id)
+SELECT
+  wg.id,
+  'user_dev_leader_001'
+FROM working_groups wg
+WHERE wg.slug = 'technical-standards-wg'
+ON CONFLICT (working_group_id, user_id) DO NOTHING;
+
+-- Also make them a member of the working group
+INSERT INTO working_group_memberships (working_group_id, workos_user_id, status, joined_at)
+SELECT
+  wg.id,
+  'user_dev_leader_001',
+  'active',
+  NOW()
+FROM working_groups wg
+WHERE wg.slug = 'technical-standards-wg'
+ON CONFLICT (working_group_id, workos_user_id) DO NOTHING;
+
+-- Also make the dev member user a member of a working group for testing
+INSERT INTO working_group_memberships (working_group_id, workos_user_id, status, joined_at)
+SELECT
+  wg.id,
+  'user_dev_member_001',
+  'active',
+  NOW()
+FROM working_groups wg
+WHERE wg.slug = 'creative-wg'
+ON CONFLICT (working_group_id, workos_user_id) DO NOTHING;
diff --git a/server/src/db/migrations/136_seed_industry_gatherings.sql b/server/src/db/migrations/136_seed_industry_gatherings.sql
new file mode 100644
index 0000000000..f0fd110caf
--- /dev/null
+++ b/server/src/db/migrations/136_seed_industry_gatherings.sql
@@ -0,0 +1,73 @@
+-- Migration: 136_seed_industry_gatherings.sql
+-- Seed industry gatherings (external events like CES, Cannes Lions)
+-- These are committee-like groups where members coordinate attendance/activities at major industry events
+
+-- Insert CES 2026
+INSERT INTO working_groups (
+  name, slug, description, committee_type, status, is_private, display_order,
+  event_start_date, event_end_date, auto_archive_after_event,
+  logo_url, website_url
+)
+VALUES (
+  'CES 2026',
+  'ces-2026',
+  'Connect with AgenticAdvertising.org members attending CES 2026 in Las Vegas. Coordinate meetups, share schedules, and network with fellow members at the world''s most influential tech event.',
+  'industry_gathering',
+  'active',
+  false,
+  100,
+  '2026-01-07',
+  '2026-01-10',
+  true,
+  'https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/CES_logo.svg/300px-CES_logo.svg.png',
+  'https://www.ces.tech/'
+)
+ON CONFLICT (slug) DO UPDATE SET
+  name = EXCLUDED.name,
+  description = EXCLUDED.description,
+  event_start_date = EXCLUDED.event_start_date,
+  event_end_date = EXCLUDED.event_end_date,
+  logo_url = EXCLUDED.logo_url,
+  website_url = EXCLUDED.website_url;
+
+-- Insert Cannes Lions 2026
+INSERT INTO working_groups (
+  name, slug, description, committee_type, status, is_private, display_order,
+  event_start_date, event_end_date, auto_archive_after_event,
+  logo_url, website_url
+)
+VALUES (
+  'Cannes Lions 2026',
+  'cannes-lions-2026',
+  'Join AgenticAdvertising.org members at the Cannes Lions International Festival of Creativity. Network, attend sessions together, and explore the future of advertising creativity.',
+  'industry_gathering',
+  'active',
+  false,
+  101,
+  '2026-06-15',
+  '2026-06-19',
+  true,
+  'https://www.canneslions.com/images/canneslions-logo.svg',
+  'https://www.canneslions.com/'
+)
+ON CONFLICT (slug) DO UPDATE SET
+  name = EXCLUDED.name,
+  description = EXCLUDED.description,
+  event_start_date = EXCLUDED.event_start_date,
+  event_end_date = EXCLUDED.event_end_date,
+  logo_url = EXCLUDED.logo_url,
+  website_url = EXCLUDED.website_url;
+
+-- Make the dev leader user a leader of CES 2026
+INSERT INTO working_group_leaders (working_group_id, user_id)
+SELECT wg.id, 'user_dev_leader_001'
+FROM working_groups wg
+WHERE wg.slug = 'ces-2026'
+ON CONFLICT (working_group_id, user_id) DO NOTHING;
+
+-- Also make them a member
+INSERT INTO working_group_memberships (working_group_id, workos_user_id, status, joined_at)
+SELECT wg.id, 'user_dev_leader_001', 'active', NOW()
+FROM working_groups wg
+WHERE wg.slug = 'ces-2026'
+ON CONFLICT (working_group_id, workos_user_id) DO NOTHING;
diff --git a/server/src/middleware/auth.ts b/server/src/middleware/auth.ts
index 61dbb526a4..52f78215c0 100644
--- a/server/src/middleware/auth.ts
+++ b/server/src/middleware/auth.ts
@@ -173,6 +173,16 @@ export const DEV_USERS: Record<string, DevUserConfig> = {
     isMember: false,
     description: 'User without any organization membership',
   },
+  // Committee leader (member who leads a working group but is not a site admin)
+  leader: {
+    id: 'user_dev_leader_001',
+    email: 'leader@test.local',
+    firstName: 'Committee',
+    lastName: 'Leader',
+    isAdmin: false,
+    isMember: true,
+    description: 'Committee leader with working group management access',
+  },
 };
 
 // Dev session cookie name

From 5f328e16b983de17c37261ea3f480604c1f982ee Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Sun, 4 Jan 2026 20:02:43 -0500
Subject: [PATCH 2/4] Move Industry Gatherings from Events dropdown to
 Committees
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add Industry Gatherings as 5th option in Committees dropdown
- Events nav becomes a simple link instead of dropdown
- Add industry_gathering type config to committees page
- Add Industry Gatherings tab on committees page

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 server/public/committees.html | 14 ++++++++++++++
 server/public/nav.js          | 30 ++++++++++--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/server/public/committees.html b/server/public/committees.html
index 45e3320e21..6ea9be29f1 100644
--- a/server/public/committees.html
+++ b/server/public/committees.html
@@ -424,6 +424,7 @@ <h1 id="headerTitle">Committees</h1>
       <a href="/committees?type=working_group" class="type-tab" id="tab-working_group">Working Groups</a>
       <a href="/committees?type=council" class="type-tab" id="tab-council">Industry Councils</a>
       <a href="/committees?type=chapter" class="type-tab" id="tab-chapter">Regional Chapters</a>
+      <a href="/committees?type=industry_gathering" class="type-tab" id="tab-industry_gathering">Industry Gatherings</a>
     </div>
 
     <!-- User's Groups (shown when logged in and member of groups) -->
@@ -541,6 +542,19 @@ <h2>Want to Get Involved?</h2>
         joinCta: 'Become an AAO member to join regional chapters and connect with practitioners in your area.',
         viewButton: 'View Chapter',
         apiType: 'chapter'
+      },
+      industry_gathering: {
+        title: 'Industry Gatherings',
+        pageTitle: 'Industry Gatherings | AgenticAdvertising.org',
+        subtitle: 'Coordinate with AAO members at major industry events',
+        sectionTitle: 'All Industry Gatherings',
+        sectionDesc: 'Industry gatherings help members connect at conferences and trade shows like CES, Cannes Lions, and more.',
+        emptyTitle: 'No Upcoming Gatherings',
+        emptyMessage: 'No industry gatherings are scheduled. Check back soon!',
+        myGroupsTitle: 'Your Gatherings',
+        joinCta: 'Become an AAO member to coordinate meetups at industry events.',
+        viewButton: 'View Gathering',
+        apiType: 'industry_gathering'
       }
     };
 
diff --git a/server/public/nav.js b/server/public/nav.js
index 8613c014f3..e252704fc3 100644
--- a/server/public/nav.js
+++ b/server/public/nav.js
@@ -185,23 +185,12 @@
           </div>
         </div>`;
 
-    // Build Events dropdown
+    // Events link (no dropdown - just links to events calendar)
     const eventsUrl = isLocal ? '/events' : `${aaoBaseUrl}/events`;
     const industryGatheringsUrl = isLocal ? '/industry-gatherings' : `${aaoBaseUrl}/industry-gatherings`;
-    const isEventsActive = currentPath.startsWith('/events') || currentPath === '/industry-gatherings';
-    const eventsDropdown = membershipEnabled
-      ? `<div class="navbar__dropdown-wrapper">
-          <button class="navbar__link navbar__dropdown-trigger ${isEventsActive ? 'active' : ''}">
-            Events
-            <svg width="10" height="10" viewBox="0 0 10 10" fill="currentColor" style="margin-left: 4px;">
-              <path d="M2 3.5L5 6.5L8 3.5" stroke="currentColor" stroke-width="1.5" fill="none"/>
-            </svg>
-          </button>
-          <div class="navbar__dropdown navbar__dropdown--nav">
-            <a href="${eventsUrl}" class="navbar__dropdown-item ${currentPath === '/events' ? 'active' : ''}">All Events</a>
-            <a href="${industryGatheringsUrl}" class="navbar__dropdown-item ${currentPath === '/industry-gatherings' ? 'active' : ''}">Industry Gatherings</a>
-          </div>
-        </div>`
+    const isEventsActive = currentPath.startsWith('/events');
+    const eventsLink = membershipEnabled
+      ? `<a href="${eventsUrl}" class="navbar__link ${isEventsActive ? 'active' : ''}">Events</a>`
       : '';
 
     // Build "The Latest" dropdown
@@ -229,7 +218,8 @@
     const workingGroupsUrl = `${committeesBaseUrl}?type=working_group`;
     const councilsUrl = `${committeesBaseUrl}?type=council`;
     const chaptersUrl = `${committeesBaseUrl}?type=chapter`;
-    const isCommitteesActive = currentPath.startsWith('/committees') || currentPath.startsWith('/working-groups');
+    const gatheringsUrl = `${committeesBaseUrl}?type=industry_gathering`;
+    const isCommitteesActive = currentPath.startsWith('/committees') || currentPath.startsWith('/working-groups') || currentPath.startsWith('/industry-gatherings');
     const committeesDropdown = membershipEnabled
       ? `<div class="navbar__dropdown-wrapper">
           <button class="navbar__link navbar__dropdown-trigger ${isCommitteesActive ? 'active' : ''}">
@@ -243,6 +233,7 @@
             <a href="${workingGroupsUrl}" class="navbar__dropdown-item">Working Groups</a>
             <a href="${councilsUrl}" class="navbar__dropdown-item">Industry Councils</a>
             <a href="${chaptersUrl}" class="navbar__dropdown-item">Regional Chapters</a>
+            <a href="${gatheringsUrl}" class="navbar__dropdown-item ${currentPath === '/industry-gatherings' ? 'active' : ''}">Industry Gatherings</a>
           </div>
         </div>`
       : '';
@@ -264,7 +255,7 @@
             </a>
             <div class="navbar__links-desktop">
               ${projectsDropdown}
-              ${eventsDropdown}
+              ${eventsLink}
               ${latestDropdown}
               ${committeesDropdown}
               ${aboutDropdown}
@@ -295,9 +286,7 @@
           <a href="${agentsUrl}" class="navbar__link navbar__link--indent ${currentPath === '/registry' ? 'active' : ''}">Agents</a>
           <a href="${publishersUrl}" class="navbar__link navbar__link--indent ${currentPath === '/publishers' ? 'active' : ''}">Publishers</a>
           <a href="${propertiesUrl}" class="navbar__link navbar__link--indent ${currentPath === '/properties' ? 'active' : ''}">Properties</a>
-          ${membershipEnabled ? `<span class="navbar__link navbar__link--header">Events</span>` : ''}
-          ${membershipEnabled ? `<a href="${eventsUrl}" class="navbar__link navbar__link--indent ${currentPath === '/events' ? 'active' : ''}">All Events</a>` : ''}
-          ${membershipEnabled ? `<a href="${industryGatheringsUrl}" class="navbar__link navbar__link--indent ${currentPath === '/industry-gatherings' ? 'active' : ''}">Industry Gatherings</a>` : ''}
+          ${membershipEnabled ? `<a href="${eventsUrl}" class="navbar__link ${currentPath === '/events' ? 'active' : ''}">Events</a>` : ''}
           ${membershipEnabled ? `<span class="navbar__link navbar__link--header">The Latest</span>` : ''}
           ${membershipEnabled ? `<a href="${latestBaseUrl}/research" class="navbar__link navbar__link--indent ${currentPath === '/latest/research' ? 'active' : ''}">Research & Ideas</a>` : ''}
           ${membershipEnabled ? `<a href="${latestBaseUrl}/industry-news" class="navbar__link navbar__link--indent ${currentPath === '/latest/industry-news' ? 'active' : ''}">Industry News</a>` : ''}
@@ -308,6 +297,7 @@
           ${membershipEnabled ? `<a href="${workingGroupsUrl}" class="navbar__link navbar__link--indent">Working Groups</a>` : ''}
           ${membershipEnabled ? `<a href="${councilsUrl}" class="navbar__link navbar__link--indent">Industry Councils</a>` : ''}
           ${membershipEnabled ? `<a href="${chaptersUrl}" class="navbar__link navbar__link--indent">Regional Chapters</a>` : ''}
+          ${membershipEnabled ? `<a href="${gatheringsUrl}" class="navbar__link navbar__link--indent ${currentPath === '/industry-gatherings' ? 'active' : ''}">Industry Gatherings</a>` : ''}
           <a href="${aboutUrl}" class="navbar__link ${currentPath === '/about' ? 'active' : ''}">About</a>
           <a href="${membershipUrl}" class="navbar__link navbar__link--indent ${currentPath === '/membership' ? 'active' : ''}">Membership</a>
           <a href="${governanceUrl}" class="navbar__link navbar__link--indent ${currentPath === '/governance' ? 'active' : ''}">Governance</a>

From f40faaa919b780c298665480c9305dc0fed8f809 Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Sun, 4 Jan 2026 20:20:31 -0500
Subject: [PATCH 3/4] Remove unused industryGatheringsUrl variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 server/public/nav.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/public/nav.js b/server/public/nav.js
index e252704fc3..0a76144616 100644
--- a/server/public/nav.js
+++ b/server/public/nav.js
@@ -187,7 +187,6 @@
 
     // Events link (no dropdown - just links to events calendar)
     const eventsUrl = isLocal ? '/events' : `${aaoBaseUrl}/events`;
-    const industryGatheringsUrl = isLocal ? '/industry-gatherings' : `${aaoBaseUrl}/industry-gatherings`;
     const isEventsActive = currentPath.startsWith('/events');
     const eventsLink = membershipEnabled
       ? `<a href="${eventsUrl}" class="navbar__link ${isEventsActive ? 'active' : ''}">Events</a>`

From 4f9cae0cd5e8ef0e549aca5e0877d98c749062c6 Mon Sep 17 00:00:00 2001
From: Brian O'Kelley <bokelley@scope3.com>
Date: Sun, 4 Jan 2026 20:26:03 -0500
Subject: [PATCH 4/4] Rename migrations 135/136 to 137/138 to avoid conflicts
 with main
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Main branch now has 135_vendor_visibility_goal.sql and 136_outreach_goal_stats.sql,
so renumber our migrations to 137 and 138.

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 ...v_committee_leader.sql => 137_seed_dev_committee_leader.sql} | 2 +-
 ...industry_gatherings.sql => 138_seed_industry_gatherings.sql} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename server/src/db/migrations/{135_seed_dev_committee_leader.sql => 137_seed_dev_committee_leader.sql} (95%)
 rename server/src/db/migrations/{136_seed_industry_gatherings.sql => 138_seed_industry_gatherings.sql} (98%)

diff --git a/server/src/db/migrations/135_seed_dev_committee_leader.sql b/server/src/db/migrations/137_seed_dev_committee_leader.sql
similarity index 95%
rename from server/src/db/migrations/135_seed_dev_committee_leader.sql
rename to server/src/db/migrations/137_seed_dev_committee_leader.sql
index 7e94448a4b..eb643af9db 100644
--- a/server/src/db/migrations/135_seed_dev_committee_leader.sql
+++ b/server/src/db/migrations/137_seed_dev_committee_leader.sql
@@ -1,4 +1,4 @@
--- Migration: 135_seed_dev_committee_leader.sql
+-- Migration: 137_seed_dev_committee_leader.sql
 -- Set up dev leader user as a leader of the Technical Standards Working Group
 -- This is only for local development testing
 
diff --git a/server/src/db/migrations/136_seed_industry_gatherings.sql b/server/src/db/migrations/138_seed_industry_gatherings.sql
similarity index 98%
rename from server/src/db/migrations/136_seed_industry_gatherings.sql
rename to server/src/db/migrations/138_seed_industry_gatherings.sql
index f0fd110caf..993b71ac77 100644
--- a/server/src/db/migrations/136_seed_industry_gatherings.sql
+++ b/server/src/db/migrations/138_seed_industry_gatherings.sql
@@ -1,4 +1,4 @@
--- Migration: 136_seed_industry_gatherings.sql
+-- Migration: 138_seed_industry_gatherings.sql
 -- Seed industry gatherings (external events like CES, Cannes Lions)
 -- These are committee-like groups where members coordinate attendance/activities at major industry events