feat(atxp): pass email_user_id during notifications enable

Extract getAccountInfo() as shared export from whoami.ts and use it
in webhook.ts to resolve the email local part (e.g. agent_xyz) for
cross-system event matching between email-mcp and atxp account IDs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: R-M-Naveen

packages/atxp/src/commands/webhook.ts

@@ -151,6 +151,14 @@ function getMachineId(): string | undefined {
   return process.env.FLY_MACHINE_ID || os.hostname() || undefined;
 }
 
+async function getEmailUserId(): Promise<string | undefined> {
+  const { getAccountInfo } = await import('./whoami.js');
+  const account = await getAccountInfo();
+  if (!account?.email) return undefined;
+  // Extract local part: agent_xyz@atxp.email -> agent_xyz
+  return account.email.split('@')[0];
+}
+
 async function enableNotifications(): Promise<void> {
   const machineId = getMachineId();
   if (!machineId) {
@@ -161,10 +169,16 @@ async function enableNotifications(): Promise<void> {
 
   console.log(chalk.gray('Enabling push notifications...'));
 
+  // Resolve email user ID for event matching
+  const emailUserId = await getEmailUserId();
+
+  const body: Record<string, string> = { machine_id: machineId };
+  if (emailUserId) body.email_user_id = emailUserId;
+
   const res = await fetch(`${NOTIFICATIONS_BASE_URL}/notifications/enable`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ machine_id: machineId }),
+    body: JSON.stringify(body),
   });
 
   const data = await res.json() as Record<string, unknown>;

packages/atxp/src/commands/whoami.ts

@@ -22,6 +22,35 @@ function getBaseUrl(connectionString: string): string {
   }
 }
 
+export interface AccountInfo {
+  accountId: string;
+  accountType?: string;
+  email?: string;
+  displayName?: string;
+  sources?: Array<{ chain: string; address: string }>;
+  team?: { id: string; name: string; role: string };
+  ownerEmail?: string;
+  isOrphan?: boolean;
+}
+
+export async function getAccountInfo(): Promise<AccountInfo | null> {
+  const connection = getConnection();
+  if (!connection) return null;
+  const token = getConnectionToken(connection);
+  if (!token) return null;
+  const baseUrl = getBaseUrl(connection);
+  try {
+    const credentials = Buffer.from(`${token}:`).toString('base64');
+    const response = await fetch(`${baseUrl}/me`, {
+      headers: { 'Authorization': `Basic ${credentials}` },
+    });
+    if (!response.ok) return null;
+    return await response.json() as AccountInfo;
+  } catch {
+    return null;
+  }
+}
+
 export async function whoamiCommand(): Promise<void> {
   const connection = getConnection();
 
@@ -39,45 +68,21 @@ export async function whoamiCommand(): Promise<void> {
     process.exit(1);
   }
 
-  const baseUrl = getBaseUrl(connection);
-
   try {
-    const credentials = Buffer.from(`${token}:`).toString('base64');
-
     // Fetch account info and phone number in parallel
-    const [response, phoneNumber] = await Promise.all([
-      fetch(`${baseUrl}/me`, {
-        headers: {
-          'Authorization': `Basic ${credentials}`,
-          'Content-Type': 'application/json',
-        },
-      }),
+    const [data, phoneNumber] = await Promise.all([
+      getAccountInfo(),
       callTool('phone.mcp.atxp.ai', 'phone_check_sms', {})
         .then((r) => { try { return JSON.parse(r).phoneNumber || null; } catch { return null; } })
         .catch(() => null),
     ]);
 
-    if (!response.ok) {
-      if (response.status === 401) {
-        console.error(chalk.red('Error: Invalid or expired connection token.'));
-        console.error(`Try logging in again: ${chalk.cyan('npx atxp login --force')}`);
-      } else {
-        console.error(chalk.red(`Error: ${response.status} ${response.statusText}`));
-      }
+    if (!data) {
+      console.error(chalk.red('Error: Could not fetch account info.'));
+      console.error(`Try logging in again: ${chalk.cyan('npx atxp login --force')}`);
       process.exit(1);
     }
 
-    const data = await response.json() as {
-      accountId: string;
-      accountType?: string;
-      email?: string;
-      displayName?: string;
-      sources?: Array<{ chain: string; address: string }>;
-      team?: { id: string; name: string; role: string };
-      ownerEmail?: string;
-      isOrphan?: boolean;
-    };
-
     // Find the primary wallet address from sources
     const wallet = data.sources?.[0];