antenna-openclaw-plugin 1.3.28 → 1.3.29

package/index.ts

@@ -25,17 +25,17 @@ interface Profile {
   line1: string | null;
   line2: string | null;
   line3: string | null;
-  emoji: string | null;
-  profile_slug: string | null;
-  matching_context: string | null;
   visible: boolean;
   last_seen_at?: string;
+  profile_slug?: string;
+  distance_m?: number;
+  dist_meters?: number;
+  matching_context?: string;
 }
 
 interface MatchResult {
   device_id: string;
   display_name: string | null;
-  emoji: string | null;
   line1: string | null;
   line2: string | null;
   line3: string | null;
@@ -58,7 +58,7 @@ function getConfig(api: any): AntennaConfig {
     supabaseUrl: cfg.supabaseUrl || BUILTIN_SUPABASE_URL,
     supabaseKey: cfg.supabaseKey || BUILTIN_SUPABASE_ANON_KEY,
     defaultRadiusM: cfg.defaultRadiusM ?? 500,
-    matchExpiryHours: cfg.matchExpiryHours ?? 168,
+    matchExpiryHours: cfg.matchExpiryHours ?? 24,
     maxMatches: cfg.maxMatches ?? 5,
     autoScanOnLocation: cfg.autoScanOnLocation ?? true,
   };
@@ -102,10 +102,10 @@ function extractWords(profile: Partial<Profile>): string[] {
   return text.split(/[\s,，。.!！?？、;；:：]+/).filter((w) => w.length > 1);
 }
 
-function deriveDeviceId(senderId: string, channel: string, chatId?: string): string {
+function deriveDeviceId(senderId: string, channel: string, chatId?: string, api?: any): string {
   const id = `${channel}:${senderId}`;
   _knownDeviceIds.add(id);
-  if (chatId) {
+  if (chatId && api) {
     _channelContext.set(id, chatId);
     // Persist to DB async
     try {
@@ -140,12 +140,13 @@ async function notifyUser(
   userId: string,
   message: string,
   logger: any,
+  api?: any,
 ): Promise<void> {
   const deviceId = `${channel}:${userId}`;
   let chatId = _channelContext.get(deviceId);
 
   // Fallback: read from DB if not in memory
-  if (!chatId) {
+  if (!chatId && api) {
     try {
       const cfg = getConfig(api);
       const sb = getSupabase(cfg);
@@ -275,7 +276,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const radius = params.radius_m ?? cfg.defaultRadiusM ?? 500;
 
       if (isRateLimited(deviceId)) {
@@ -307,29 +308,10 @@ export default function register(api: any) {
       const others = (nearby ?? []).filter((p: Profile) => p.device_id !== deviceId);
 
       if (others.length === 0) {
-        // Fallback to global discover
-        const { data: globalData } = await supabase.rpc("global_discover", {
-          p_device_id: deviceId, p_limit: 1,
+        return ok({
+          profiles: [], count: 0, radius_m: radius,
+          message: `附近 ${radius}m 暂时没人。可以试试全球推荐（antenna_discover）或者把你的名片链接发给想认识的人。`,
         });
-        const globalOthers = globalData || [];
-        if (globalOthers.length > 0) {
-          const gRefMap: Record<string, string> = {};
-          const gProfiles = globalOthers.map((p: any, i: number) => {
-            const ref = String(i + 1);
-            gRefMap[ref] = p.device_id;
-            return { ref, emoji: p.emoji || "👤", name: p.display_name || "匿名", line1: p.line1, line2: p.line2, line3: p.line3, more_information: p.matching_context || null, profile_slug: p.profile_slug || null };
-          });
-          (api as any)._antennaRefMap = gRefMap;
-          try { await supabase.rpc("save_scan_refs", { p_owner: deviceId, p_refs: gRefMap }); } catch {}
-          for (const p of globalOthers) {
-            try { await supabase.rpc("log_recommendation", { p_device_id: deviceId, p_recommended_id: p.device_id }); } catch {}
-          }
-          return ok({
-            profiles: gProfiles, count: gProfiles.length, radius_m: radius, global: true,
-            message: `附近 ${radius}m 暂时没人。今天的全球推荐——这个人跟你可能聊得来。（每天 1 次）`,
-          });
-        }
-        return ok({ profiles: [], message: `附近暂时没人，今天的全球推荐已经用完了。明天再来！` });
       }
 
       // Build ref mapping — never expose device_id
@@ -339,12 +321,10 @@ export default function register(api: any) {
         _refMap[ref] = p.device_id;
         return {
           ref,
-          emoji: p.emoji || "👤",
           name: p.display_name || "匿名",
-          line1: p.line1,
-          line2: p.line2,
-          line3: p.line3,
-          more_information: p.matching_context || null,
+          personal_description: p.line1,
+          looking_for: p.line2,
+          conversation_style: p.line3,
           profile_slug: p.profile_slug || null,
           distance_m: p.distance_m ?? p.dist_meters ?? null,
         };
@@ -371,7 +351,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "antenna_profile",
     description:
-      "View or update the user's Antenna profile (name card). The profile has a display name, emoji, and three lines describing who they are.",
+      "View or update the user's Antenna profile (name card). The profile has a display name and three descriptions: personal description, looking for, and conversation style.",
     parameters: {
       type: "object",
       properties: {
@@ -380,45 +360,98 @@ export default function register(api: any) {
         channel: { type: "string", description: "The channel name" },
         chat_id: { type: "string", description: "REQUIRED for notifications. Pass the chat/channel ID from your message context so Antenna can send you match and event notifications." },
         display_name: { type: "string", description: "Display name" },
-        emoji: { type: "string", description: "Profile emoji" },
-        line1: { type: "string", description: "First line (who you are / what you do)" },
-        line2: { type: "string", description: "Second line (what you're into)" },
-        line3: { type: "string", description: "Third line (what you're looking for)" },
+        personal_description: { type: "string", description: "Personal description — who you are and what you do (max 220 chars)" },
+        looking_for: { type: "string", description: "Looking for — the kind of people you want to meet (max 140 chars)" },
+        conversation_style: { type: "string", description: "Conversation style — the type of conversations you want (max 160 chars)" },
         visible: { type: "boolean", description: "Whether to be visible to others" },
-        matching_context: { type: "string", description: "More information / free-form context for AI matching (interests, goals, background, etc.)" },
+        more_information: { type: "string", description: "More information — agent-generated rich context for better matching (not shown to others, max 1000 chars). Generate this FIRST, then derive personal_description, looking_for, and conversation_style from it." },
+        interest_tags: { type: "array", items: { type: "string" }, description: "Interest/topic tags shown on the card (up to 8)" },
+        city: { type: "string", description: "Country or region (e.g. 'United States', 'Beijing')" },
+        links: { type: "array", items: { type: "string" }, description: "Social links shown on the card footer (up to 3)" },
+        is_active: { type: "boolean", description: "Whether the profile is active or quiet" },
+        contact_info: { type: "string", description: "Contact info (WeChat, Telegram, email, etc.) — PRIVATE, only revealed to mutual matches. Ask the user what contact they want to share." },
       },
       required: ["action", "sender_id", "channel", "chat_id"],
     },
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       if (params.action === "get") {
         const { data, error } = await supabase.rpc("get_profile", { p_device_id: deviceId });
         if (error || !data) {
-          return ok({ exists: false, message: "你还没有名片。告诉我你的名字、一个 emoji、和三句话介绍自己，我帮你创建。" });
+          return ok({
+            exists: false,
+            message: "你还没有名片。跟我聊聊你是谁、做什么、想认识什么人，我帮你创建。",
+            fields: {
+              display_name: { label: "显示名称", description: "How you want to be called" },
+              personal_description: { label: "个人描述", description: "Who you are and what you do", maxLength: 220, required: true },
+              looking_for: { label: "想认识的人", description: "The kind of people you want to meet", maxLength: 140 },
+              conversation_style: { label: "想要的交流方式", description: "The type of conversations you want", maxLength: 160 },
+              more_information: { label: "更多信息", description: "Agent-generated rich context for better matching (not shown to others)", maxLength: 1000 },
+              interest_tags: { label: "兴趣标签", description: "Interest/topic tags shown on the card (up to 8)", maxItems: 8 },
+              city: { label: "国家/地区", description: "Country or region" },
+              links: { label: "社交链接", description: "Social links shown on the card footer (up to 3)", maxItems: 3 },
+              is_active: { label: "状态", description: "Whether the profile is active or quiet" },
+            },
+          });
         }
         return ok({
           exists: true,
-          profile: { display_name: data.display_name, emoji: data.emoji,
-            line1: data.line1, line2: data.line2, line3: data.line3, visible: data.visible },
+          profile: { display_name: data.display_name,
+            personal_description: data.line1, looking_for: data.line2, conversation_style: data.line3, visible: data.visible, contact_info: data.contact_info || null },
+          fields: {
+            display_name: { label: "显示名称", description: "How you want to be called" },
+            personal_description: { label: "个人描述", description: "Who you are and what you do", maxLength: 220, required: true },
+            looking_for: { label: "想认识的人", description: "The kind of people you want to meet", maxLength: 140 },
+            conversation_style: { label: "想要的交流方式", description: "The type of conversations you want", maxLength: 160 },
+            more_information: { label: "更多信息", description: "Agent-generated rich context for better matching (not shown to others)", maxLength: 1000 },
+              interest_tags: { label: "兴趣标签", description: "Interest/topic tags shown on the card (up to 8)", maxItems: 8 },
+              city: { label: "国家/地区", description: "Country or region" },
+              links: { label: "社交链接", description: "Social links shown on the card footer (up to 3)", maxItems: 3 },
+              is_active: { label: "状态", description: "Whether the profile is active or quiet" },
+          },
         });
       }
 
+      // Pack structured fields into matching_context JSON
+      let contextJson = params.more_information ?? undefined;
+      if (params.interest_tags || params.city || params.links || params.is_active !== undefined) {
+        let existing: Record<string, any> = {};
+        if (contextJson) {
+          try { existing = JSON.parse(contextJson); } catch { existing = { context: contextJson }; }
+        } else {
+          // Read existing matching_context from DB to merge
+          try {
+            const { data: cur } = await supabase.rpc("get_profile", { p_device_id: deviceId });
+            if (cur?.matching_context) {
+              try { existing = JSON.parse(cur.matching_context); } catch {}
+            }
+          } catch {}
+        }
+        if (params.interest_tags) existing.interestTags = params.interest_tags;
+        if (params.city) existing.city = params.city;
+        if (params.links) existing.links = params.links;
+        if (params.is_active !== undefined) existing.isActive = params.is_active;
+        existing.version = existing.version || 1;
+        contextJson = JSON.stringify(existing);
+      }
+
       const { data, error } = await supabase.rpc("upsert_profile", {
         p_device_id: deviceId,
-        p_display_name: params.display_name ?? null, p_emoji: params.emoji ?? null,
-        p_line1: params.line1 ?? null, p_line2: params.line2 ?? null,
-        p_line3: params.line3 ?? null, p_visible: params.visible ?? true,
-        ...(params.matching_context != null ? { p_matching_context: params.matching_context } : {}),
+        p_display_name: params.display_name ?? null, p_emoji: null,
+        p_line1: params.personal_description ?? null, p_line2: params.looking_for ?? null,
+        p_line3: params.conversation_style ?? null, p_visible: params.visible ?? true,
+        ...(contextJson != null ? { p_matching_context: contextJson } : {}),
+        ...(params.contact_info != null ? { p_contact_info: params.contact_info } : {}),
       });
 
       if (error) return ok({ error: error.message });
 
       // Read back profile to get slug for public page link
-      let publicUrl = null;
-      let archetypeResult = null;
+      let publicUrl: string | null = null;
+      let gpsBindUrl: string | null = null;
       try {
         const { data: profile } = await supabase.rpc("get_profile", { p_device_id: deviceId });
         if (profile?.profile_slug) {
@@ -426,50 +459,25 @@ export default function register(api: any) {
         }
       } catch {}
 
-      // Generate personalized archetype description via LLM (best-effort)
+      // Auto-generate GPS bind link
       try {
-        const profileText = [data.line1, data.line2, data.line3, params.matching_context].filter(Boolean).join(". ");
-        if (profileText) {
-          const corpus = profileText.toLowerCase();
-          const archetypeKw: Record<string, string[]> = {
-            Prometheus: ["ai", "agent", "llm", "founder", "startup", "build", "developer", "tools"],
-            Athena: ["product", "strategy", "research", "design", "craft", "pm", "ux"],
-            Hermes: ["network", "connect", "community", "social", "bridge"],
-            Apollo: ["music", "media", "content", "creator", "writing", "taste"],
-            Artemis: ["independent", "explore", "freelance", "health", "outdoor"],
-            Aphrodite: ["beauty", "brand", "fashion", "relationship"],
-            Dionysus: ["event", "culture", "party", "art", "festival"],
-            Hades: ["finance", "invest", "infrastructure", "backend", "security"],
-            Persephone: ["transform", "cross", "research", "academic", "bridge"],
-            Odysseus: ["founder", "journey", "resilience", "travel", "startup"],
-          };
-          let bestRole = "Prometheus"; let bestScore = 0;
-          for (const [role, kws] of Object.entries(archetypeKw)) {
-            const score = kws.reduce((s, kw) => s + (corpus.includes(kw) ? 1 : 0), 0);
-            if (score > bestScore) { bestScore = score; bestRole = role; }
-          }
-          const cfg2 = getConfig(api);
-          const supabaseUrl = cfg2.supabaseUrl || "https://bcudjloikmpcqwcptuyd.supabase.co";
-          const supabaseKey = cfg2.supabaseKey || BUILTIN_SUPABASE_ANON_KEY;
-          const res = await fetch(`${supabaseUrl}/functions/v1/generate-archetype`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json", "Authorization": `Bearer ${supabaseKey}` },
-            body: JSON.stringify({ archetype: bestRole, profile_text: profileText }),
-          });
-          if (res.ok) {
-            const archData = await res.json();
-            if (archData?.reason) archetypeResult = { archetype: bestRole, ...archData };
-          }
+        const { data: bindData } = await supabase.rpc("create_bind_token", {
+          p_device_id: deviceId,
+          p_purpose: "profile",
+          p_event_code: null,
+        });
+        if (bindData?.token) {
+          gpsBindUrl = `https://www.antenna.fyi/locate?token=${bindData.token}`;
         }
       } catch {}
 
       return ok({
         updated: true,
         profile: { display_name: data.display_name,
-          line1: data.line1, line2: data.line2, line3: data.line3, visible: data.visible },
+          personal_description: data.line1, looking_for: data.line2, conversation_style: data.line3, visible: data.visible },
         public_url: publicUrl,
-        archetype: archetypeResult || null,
-        next_step: "IMPORTANT: 1) Send the public_url to the user — this is their shareable profile link. 2) Tell the user their archetype and the personalized reason. 3) Call antenna_bind to generate a GPS link. Do not skip any step.",
+        gps_bind_url: gpsBindUrl,
+        next_step: "Send the public_url and gps_bind_url to the user. The GPS link should be opened on their phone to share location.",
       });
     },
   });
@@ -496,7 +504,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const fuzzy = fuzzyCoords(params.lat, params.lng);
 
       // Check if user has a profile first
@@ -504,7 +512,7 @@ export default function register(api: any) {
       if (!profile) {
         return ok({
           checked_in: false,
-          message: "你还没有名片，别人看到你也不知道你是谁。先创建一个名片吧（告诉我你的名字、emoji、三句话介绍自己）。",
+          message: "你还没有名片，别人看到你也不知道你是谁。先创建一个名片吧（跟我聊聊你是谁、做什么、想认识什么人）。",
         });
       }
 
@@ -528,7 +536,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "antenna_accept",
     description:
-      "Accept a match. Use 'ref' from scan results (e.g. '1', '2'), target_device_id, or profile_slug (from a public profile link like antenna.fyi/p/SLUG). Optionally share contact info.",
+      "Accept a match. Use 'ref' from scan results (e.g. '1', '2'), target_device_id, or profile_slug (from profile links like antenna.fyi/p/xxx). Optionally share contact info.",
     parameters: {
       type: "object",
       properties: {
@@ -536,8 +544,8 @@ export default function register(api: any) {
         channel: { type: "string" },
         chat_id: { type: "string", description: "REQUIRED for notifications. Pass the chat/channel ID from your message context so Antenna can send you match and event notifications." },
         ref: { type: "string", description: "Ref number from scan results (e.g. '1')" },
-        target_device_id: { type: "string", description: "Device ID (use ref or profile_slug instead when possible)" },
-        profile_slug: { type: "string", description: "Profile slug from a public profile link (e.g. 'yi' from antenna.fyi/p/yi). Resolves to device_id automatically." },
+        target_device_id: { type: "string", description: "Device ID (use ref instead when possible)" },
+        profile_slug: { type: "string", description: "Profile slug from profile link (e.g. 'yi' from antenna.fyi/p/yi)" },
         contact_info: { type: "string", description: "Optional contact info to share" },
       },
       required: ["sender_id", "channel", "chat_id"],
@@ -545,7 +553,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       // Resolve ref to device_id — try DB first, then memory fallback
       let targetId = params.target_device_id;
@@ -554,12 +562,13 @@ export default function register(api: any) {
         const { data: resolved } = await supabase.rpc("resolve_ref", { p_owner: deviceId, p_ref: params.ref });
         targetId = resolved || (api as any)._antennaRefMap?.[params.ref];
       }
-      // Resolve profile_slug to device_id via get_profile_by_slug RPC
+      // Resolve profile_slug to device_id
       if (!targetId && params.profile_slug) {
-        const { data: slugProfile } = await supabase.rpc("get_profile_by_slug", { p_slug: params.profile_slug });
-        const resolved = Array.isArray(slugProfile) ? slugProfile[0] : slugProfile;
-        if (resolved?.device_id) {
-          targetId = resolved.device_id;
+        const { data: slugData } = await supabase.rpc("get_profile_by_slug", { p_slug: params.profile_slug });
+        if (slugData?.found) {
+          targetId = slugData.device_id;
+        } else {
+          return ok({ error: `Profile slug "${params.profile_slug}" not found.` });
         }
       }
       if (!targetId) {
@@ -629,7 +638,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       const { data, error } = await supabase.rpc("create_bind_token", {
         p_device_id: deviceId,
@@ -651,45 +660,6 @@ export default function register(api: any) {
     },
   });
 
-  // ═══════════════════════════════════════════════════════════════════
-  // Tool: antenna_link_account
-  // ═══════════════════════════════════════════════════════════════════
-  api.registerTool({
-    name: "antenna_link_account",
-    description:
-      "Link your Antenna agent profile to your antenna.fyi website account. Pass the user's API key — the server verifies it and extracts the user_id. The agent never needs to know or pass user_id directly.",
-    parameters: {
-      type: "object",
-      properties: {
-        sender_id: { type: "string", description: "The sender's user ID" },
-        channel: { type: "string", description: "The channel name" },
-        chat_id: { type: "string", description: "REQUIRED. Pass the chat/channel ID from your message context." },
-        api_key: { type: "string", description: "The user's Antenna API key (ant_xxx) from antenna.fyi/me" },
-      },
-      required: ["sender_id", "channel", "chat_id", "api_key"],
-    },
-    async execute(_id: string, params: any) {
-      const cfg = getConfig(api);
-      const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
-
-      const { data, error } = await supabase.rpc("bind_user_id", {
-        p_device_id: deviceId,
-        p_api_key: params.api_key,
-      });
-      if (error) return ok({ error: error.message });
-
-      if (data?.error) {
-        return ok(data);
-      }
-
-      return ok({
-        ...data,
-        message: "账号已关联！现在你可以在 antenna.fyi/me 看到你的完整 profile 和匹配记录了。",
-      });
-    },
-  });
-
   // ═══════════════════════════════════════════════════════════════════
   // Tool: antenna_discover
   // ═══════════════════════════════════════════════════════════════════
@@ -709,7 +679,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       const { data: globalData } = await supabase.rpc("global_discover", {
         p_device_id: deviceId, p_limit: 1,
@@ -752,7 +722,7 @@ export default function register(api: any) {
           } catch { /* best effort */ }
         }
 
-        profiles.push({ ref, emoji: p.emoji || "👤", name: p.display_name || "匿名", line1: p.line1, line2: p.line2, line3: p.line3, more_information: p.matching_context || null, profile_slug: p.profile_slug || null, match_reason });
+        profiles.push({ ref, name: p.display_name || "匿名", personal_description: p.line1, looking_for: p.line2, conversation_style: p.line3, profile_slug: p.profile_slug || null, match_reason });
       }
 
       // Persist refs + log recommendation
@@ -777,7 +747,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "antenna_initial_recommendations",
     description:
-      "Get initial recommendations for a new user — 2-3 people most similar to them. One-time only, does NOT consume daily discover quota. Use right after profile creation in onboarding.",
+      "First-time recommendations — show 2-3 best matches right after profile creation. One-time only (second call returns empty). Does NOT consume daily discover quota. Use in onboarding step 3.",
     parameters: {
       type: "object",
       properties: {
@@ -790,27 +760,51 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
-      const { data: results, error } = await supabase.rpc("initial_recommendations", {
-        p_device_id: deviceId,
-        p_limit: 3,
+      // Check if already done via profile matching_context
+      const { data: myProfileCheck } = await supabase.rpc("get_profile", { p_device_id: deviceId });
+      if (myProfileCheck?.matching_context) {
+        try {
+          const ctx = JSON.parse(myProfileCheck.matching_context);
+          if (ctx.initialRecommendationsDone) {
+            return ok({ count: 0, profiles: [], message: "首次推荐已经用过了。用 antenna_discover 获取每日推荐。" });
+          }
+        } catch {}
+      }
+
+      const { data: globalData } = await supabase.rpc("global_discover", {
+        p_device_id: deviceId, p_limit: 3,
       });
 
-      if (error) return ok({ error: error.message });
+      const results = globalData || [];
 
-      if (!results || results.length === 0) {
-        return ok({
-          count: 0,
-          profiles: [],
-          initial: true,
-          message: "暂时没有推荐，等有更多人加入！",
+      // Mark initial recommendations as done in matching_context
+      try {
+        let ctx: Record<string, any> = {};
+        if (myProfileCheck?.matching_context) {
+          try { ctx = JSON.parse(myProfileCheck.matching_context); } catch {}
+        }
+        ctx.initialRecommendationsDone = true;
+        await supabase.rpc("upsert_profile", {
+          p_device_id: deviceId,
+          p_display_name: myProfileCheck?.display_name ?? null,
+          p_emoji: null,
+          p_line1: myProfileCheck?.line1 ?? null,
+          p_line2: myProfileCheck?.line2 ?? null,
+          p_line3: myProfileCheck?.line3 ?? null,
+          p_visible: myProfileCheck?.visible ?? true,
+          p_matching_context: JSON.stringify(ctx),
         });
+      } catch {}
+
+      if (results.length === 0) {
+        return ok({ count: 0, profiles: [], message: "目前还没有足够的用户来匹配。你是早期用户！" });
       }
 
       const _refMap: Record<string, string> = {};
 
-      // Get my profile for match reason generation
+      // Get my profile for match reason
       const { data: myProfile } = await supabase.rpc("get_profile", { p_device_id: deviceId });
       const myLines = myProfile ? [myProfile.line1, myProfile.line2, myProfile.line3].filter(Boolean).join(". ") : "";
 
@@ -839,21 +833,21 @@ export default function register(api: any) {
           } catch { /* best effort */ }
         }
 
-        profiles.push({ ref, emoji: p.emoji || "👤", name: p.display_name || "匿名", personal_description: p.line1, looking_for: p.line2, conversation_style: p.line3, more_information: p.matching_context || null, profile_slug: p.profile_slug || null, match_reason });
+        profiles.push({
+          ref, name: p.display_name || "匿名",
+          personal_description: p.line1, looking_for: p.line2, conversation_style: p.line3, profile_slug: p.profile_slug || null, match_reason,
+        });
       }
 
-      // Persist refs + log recommendations
       (api as any)._antennaRefMap = { ...(api as any)._antennaRefMap, ..._refMap };
-      try {
-        await supabase.rpc("save_scan_refs", { p_owner: deviceId, p_refs: _refMap });
-      } catch { /* best effort */ }
+      try { await supabase.rpc("save_scan_refs", { p_owner: deviceId, p_refs: _refMap }); } catch {}
       for (const p of results) {
-        await supabase.rpc("log_recommendation", { p_device_id: deviceId, p_recommended_id: (p as any).device_id });
+        await supabase.rpc("log_recommendation", { p_device_id: deviceId, p_recommended_id: p.device_id }).catch(() => {});
       }
 
       return ok({
         count: profiles.length, profiles, initial: true,
-        message: "这是你的首次推荐——基于你的名片，这几个人跟你最匹配。",
+        message: "\uD83C\uDF1F 这是你的首次推荐——跟你最像的人：",
       });
     },
   });
@@ -885,11 +879,11 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const { data, error } = await supabase.rpc("create_event", {
         p_name: params.name,
-        p_lat: params.lat ?? null,
-        p_lng: params.lng ?? null,
+        p_lat: params.lat || null,
+        p_lng: params.lng || null,
         p_created_by: deviceId,
         p_starts_at: params.starts_at || null,
         p_ends_at: params.ends_at || null,
@@ -922,7 +916,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const { data, error } = await supabase.rpc("end_event", {
         p_code: params.code,
         p_device_id: deviceId,
@@ -954,7 +948,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       // Profile gate
       const { data: profile } = await supabase.rpc("get_profile", { p_device_id: deviceId });
@@ -973,7 +967,7 @@ export default function register(api: any) {
         } catch {}
       }
 
-      const { data, error } = await supabase.rpc("join_event", { p_code: params.code, p_device_id: deviceId, p_lat: lat ?? null, p_lng: lng ?? null, p_application_context: params.application_context || null });
+      const { data, error } = await supabase.rpc("join_event", { p_code: params.code, p_device_id: deviceId, p_lat: lat || null, p_lng: lng || null, p_application_context: params.application_context || null });
       if (error) return ok({ error: error.message });
       if (!data?.joined) return ok(data);
 
@@ -1036,7 +1030,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       const { data, error } = await supabase.rpc("event_participants_list", { p_code: params.code, p_device_id: deviceId });
       if (error) return ok({ error: error.message });
@@ -1046,7 +1040,7 @@ export default function register(api: any) {
       const profiles = others.map((p, i) => {
         const ref = String(i + 1);
         _refMap[ref] = p.device_id;
-        return { ref, emoji: p.emoji || "👤", name: p.display_name || "匿名", line1: p.line1, line2: p.line2, line3: p.line3, more_information: p.matching_context || null, profile_slug: p.profile_slug || null, checked_in: !!p.checked_in, role: p.role || "participant", status: p.status || "active", application_context: p.application_context || null, source: "event" };
+        return { ref, name: p.display_name || "匿名", personal_description: p.line1, looking_for: p.line2, conversation_style: p.line3, profile_slug: p.profile_slug || null, checked_in: !!p.checked_in, role: p.role || "participant", status: p.status || "active", application_context: p.application_context || null, source: "event" };
       });
 
       (api as any)._antennaRefMap = { ...(api as any)._antennaRefMap, ..._refMap };
@@ -1076,7 +1070,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       let targetId = params.target_device_id;
       if (!targetId && params.ref) {
@@ -1113,7 +1107,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const fuzzy = (params.lat != null && params.lng != null) ? fuzzyCoords(params.lat, params.lng) : { lat: null, lng: null };
       const { data, error } = await supabase.rpc("event_checkin", {
         p_code: params.code,
@@ -1172,7 +1166,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
 
       const { data: result } = await supabase.rpc("get_my_matches_with_profiles", { p_device_id: deviceId });
 
@@ -1187,18 +1181,18 @@ export default function register(api: any) {
         ref: String(i + 1),
         _device_id: m.target_id,
         name: m.name || "匿名",
-        emoji: m.emoji || "👤",
-        line1: m.line1, line2: m.line2, line3: m.line3,
+        personal_description: m.line1, looking_for: m.line2, conversation_style: m.line3,
+        profile_slug: m.profile_slug || null,
         their_contact: m.their_contact || null,
         you_shared: m.you_shared || null,
       }));
 
       const incomingAccepts = rawIncoming.map((m: any, i: number) => ({
-        ref: String(mutualMatches.length + i + 1),
+        ref: String(i + 1),
         _device_id: m.target_id,
         name: m.name || "匿名",
-        emoji: m.emoji || "👤",
-        line1: m.line1, line2: m.line2, line3: m.line3,
+        personal_description: m.line1, looking_for: m.line2, conversation_style: m.line3,
+        profile_slug: m.profile_slug || null,
       }));
 
       // Clean up follow-up crons for mutual matches
@@ -1212,14 +1206,6 @@ export default function register(api: any) {
       if (incomingAccepts.length > 0) messages.push(`${incomingAccepts.length} 个人想认识你，等你回应`);
       if (messages.length === 0) messages.push("你接受了一些匹配，但对方还没有回应。耐心等等 ⏳");
 
-      // Persist ref map so accept(ref) resolves correctly
-      const _refMap: Record<string, string> = {};
-      for (const m of mutualMatches) _refMap[m.ref] = m._device_id;
-      for (const m of incomingAccepts) _refMap[m.ref] = m._device_id;
-      if (deviceId && Object.keys(_refMap).length > 0) {
-        try { await supabase.rpc("save_scan_refs", { p_owner: deviceId, p_refs: _refMap }); } catch { /* best effort */ }
-      }
-
       return ok({
         mutual_matches: mutualMatches,
         incoming_accepts: incomingAccepts,
@@ -1248,22 +1234,18 @@ export default function register(api: any) {
         lng: { type: "number", description: "New event longitude" },
         starts_at: { type: "string", description: "New start time ISO" },
         ends_at: { type: "string", description: "New end time ISO" },
-        requires_approval: { type: "boolean", description: "Require host approval to join" },
-        screening_questions: { type: "array", items: { type: "string" }, description: "Screening questions for applicants" },
       },
       required: ["code", "sender_id", "channel", "chat_id"],
     },
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const { data, error } = await supabase.rpc("update_event", {
         p_code: params.code, p_device_id: deviceId,
         p_name: params.name || null, p_description: params.description || null,
-        p_og_image: params.og_image || null, p_lat: params.lat ?? null, p_lng: params.lng ?? null,
+        p_og_image: params.og_image || null, p_lat: params.lat || null, p_lng: params.lng || null,
         p_starts_at: params.starts_at || null, p_ends_at: params.ends_at || null,
-        ...(params.requires_approval != null ? { p_requires_approval: params.requires_approval } : {}),
-        ...(params.screening_questions != null ? { p_screening_questions: params.screening_questions } : {}),
       });
       if (error) return ok({ error: error.message });
       return ok(data);
@@ -1290,7 +1272,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const { data, error } = await supabase.rpc("approve_participant", {
         p_code: params.code, p_device_id: deviceId, p_target_ref: params.ref,
       });
@@ -1319,7 +1301,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const { data, error } = await supabase.rpc("reject_participant", {
         p_code: params.code, p_device_id: deviceId, p_target_ref: params.ref,
       });
@@ -1348,7 +1330,7 @@ export default function register(api: any) {
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
       const { data, error } = await supabase.rpc("add_cohost", {
         p_code: params.code, p_device_id: deviceId, p_target_ref: params.ref,
       });
@@ -1362,34 +1344,72 @@ export default function register(api: any) {
   // ═══════════════════════════════════════════════════════════════════
   api.registerTool({
     name: "antenna_event_message",
-    description: "Send a message to event participants. Only creator or co-host can send. Omit ref to broadcast to all participants.",
+    description:
+      "Send a message to event participants. Only creator or co-host can send. Omit ref to broadcast to all.",
     parameters: {
       type: "object",
       properties: {
         code: { type: "string", description: "Event code" },
-        sender_id: { type: "string" },
-        channel: { type: "string" },
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "Channel name" },
         chat_id: { type: "string", description: "REQUIRED for notifications. Pass the chat/channel ID from your message context so Antenna can send you match and event notifications." },
-        message: { type: "string", description: "Message to send to participants" },
-        ref: { type: "string", description: "Ref number of specific participant (omit to broadcast to all)" },
+        message: { type: "string", description: "Message to send" },
+        ref: { type: "string", description: "Ref number of specific participant (omit for broadcast)" },
       },
-      required: ["code", "sender_id", "channel", "message", "chat_id"],
+      required: ["code", "sender_id", "channel", "chat_id", "message"],
     },
     async execute(_id: string, params: any) {
       const cfg = getConfig(api);
       const supabase = getSupabase(cfg);
-      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id);
-      const { data, error } = await supabase.rpc("send_event_message", {
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+      const rpcParams: any = {
         p_code: params.code,
         p_device_id: deviceId,
         p_message: params.message,
-        ...(params.ref ? { p_target_ref: params.ref } : {}),
-      });
+      };
+      if (params.ref) rpcParams.p_target_ref = params.ref;
+      const { data, error } = await supabase.rpc("send_event_message", rpcParams);
       if (error) return ok({ error: error.message });
       return ok(data);
     },
   });
 
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_link_account
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_link_account",
+    description:
+      "Link your Antenna agent profile to your antenna.fyi website account. Pass the user's API key — the server verifies it and extracts the user_id. The agent never needs to know or pass user_id directly.",
+    parameters: {
+      type: "object",
+      properties: {
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "Channel name" },
+        chat_id: { type: "string", description: "REQUIRED for notifications. Pass the chat/channel ID from your message context so Antenna can send you match and event notifications." },
+        api_key: { type: "string", description: "The user's Antenna API key (ant_xxx) from antenna.fyi/me" },
+      },
+      required: ["sender_id", "channel", "chat_id", "api_key"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+      const { data, error } = await supabase.rpc("bind_user_id", {
+        p_device_id: deviceId,
+        p_api_key: params.api_key,
+      });
+      if (error) return ok({ error: error.message });
+      if (data?.error) return ok(data);
+      return ok({
+        ...data,
+        message: "账号已关联！现在你可以在 antenna.fyi/me 看到你的完整 profile 和匹配记录了。",
+      });
+    },
+  });
+
+  // ═══════════════════════════════════════════════════════════════════
+  // Service: poll for new matches every 10 minutes → notify instantly
   // ═══════════════════════════════════════════════════════════════════
   const _notifiedMatches = new Set<string>(); // "deviceA→deviceB" already notified
 
@@ -1412,10 +1432,11 @@ export default function register(api: any) {
             async (payload: any) => {
               try {
                 const targetDeviceId = payload.new?.device_id_b;
-                if (!targetDeviceId) return;
+                if (!targetDeviceId || !_knownDeviceIds.has(targetDeviceId)) return;
 
                 const key = `${payload.new.device_id_a}→${targetDeviceId}`;
                 if (_notifiedMatches.has(key)) return;
+                _notifiedMatches.add(key);
 
                 const parts = targetDeviceId.split(":");
                 if (parts.length < 2) return;
@@ -1427,7 +1448,6 @@ export default function register(api: any) {
 
                 const { data: theirProfile } = await innerSb.rpc("get_profile", { p_device_id: payload.new.device_id_a });
                 const name = theirProfile?.display_name || "有人";
-                const emoji = theirProfile?.emoji || "👤";
 
                 // Check if mutual
                 const { data: matches } = await innerSb.rpc("get_my_matches", { p_device_id: targetDeviceId });
@@ -1438,15 +1458,13 @@ export default function register(api: any) {
                 if (myAccept) {
                   const contact = payload.new.contact_info_a ? `\n对方的联系方式：${payload.new.contact_info_a}` : "";
                   notifyUser(channel, userId,
-                    `[Antenna] 🎉 双向匹配！${emoji} ${name} 也接受了你！${contact}\n\n用 antenna_check_matches 查看详情。`,
-                    logger);
-                  _notifiedMatches.add(key);
+                    `[Antenna] 🎉 双向匹配！${name} 也接受了你！${contact}\n\n用 antenna_check_matches 查看详情。`,
+                    logger, api);
                   stopFollowUpCron(targetDeviceId, payload.new.device_id_a, logger);
                 } else {
                   notifyUser(channel, userId,
-                    `[Antenna] 📩 ${emoji} ${name} 想认识你！看看 TA 的名片，决定要不要接受？\n\n用 antenna_check_matches 查看详情。`,
-                    logger);
-                  _notifiedMatches.add(key);
+                    `[Antenna] 📩 ${name} 想认识你！看看 TA 的名片，决定要不要接受？\n\n用 antenna_check_matches 查看详情。`,
+                    logger, api);
                 }
               } catch (err: any) {
                 logger.warn("Antenna: realtime match handler error:", err.message);
@@ -1483,13 +1501,12 @@ export default function register(api: any) {
                 // Get applicant profile
                 const { data: applicant } = await epSb.rpc('get_profile', { p_device_id: applicantDeviceId });
                 const aName = applicant?.display_name || '某人';
-                const aEmoji = applicant?.emoji || '👤';
 
                 const parts = event.created_by.split(':');
                 if (parts.length < 2) return;
                 notifyUser(parts[0], parts.slice(1).join(':'),
-                  `[Antenna] 📩 ${aEmoji} ${aName} 申请加入你的活动「${event.name}」\n\n用 antenna_event_scan --code ${event.code} 查看申请者名片并审批。`,
-                  logger);
+                  `[Antenna] 📩 ${aName} 申请加入你的活动「${event.name}」\n\n用 antenna_event_scan --code ${event.code} 查看申请者名片并审批。`,
+                  logger, api);
               } catch (err: any) {
                 logger.warn('Antenna: event participant INSERT handler error:', err.message);
               }
@@ -1518,11 +1535,11 @@ export default function register(api: any) {
                 if (newStatus === 'active') {
                   notifyUser(parts[0], parts.slice(1).join(':'),
                     `[Antenna] ✅ 你的申请已通过！欢迎加入「${eventName}」\n\n用 antenna_event_scan --code ${event?.code} 查看其他参与者。`,
-                    logger);
+                    logger, api);
                 } else if (newStatus === 'rejected') {
                   notifyUser(parts[0], parts.slice(1).join(':'),
                     `[Antenna] ❌ 你的申请未通过「${eventName}」的审核。`,
-                    logger);
+                    logger, api);
                 }
               } catch (err: any) {
                 logger.warn('Antenna: event participant UPDATE handler error:', err.message);
@@ -1542,9 +1559,10 @@ export default function register(api: any) {
           const cfg = getConfig(api);
           const supabase = getSupabase(cfg);
 
-          // Get all profiles with valid notification targets
+          // Get all profiles that have been active in last 24h
           const { data: activeProfiles } = await supabase
-            .rpc("get_notification_targets", { p_since: "7 days" });
+            .rpc("nearby_profiles", { p_lat: 0, p_lng: 0, p_radius_m: 999999999 })
+            .select("device_id");
 
           if (!activeProfiles?.length) return;
 
@@ -1574,7 +1592,7 @@ export default function register(api: any) {
 
             for (const match of newMatches) {
               const notifyKey = `${match.device_id_a}→${match.device_id_b}`;
-              if (_notifiedMatches.has(notifyKey)) continue;
+              _notifiedMatches.add(notifyKey);
 
               // Is this a new mutual match?
               if (match.device_id_a === deviceId) {
@@ -1582,38 +1600,36 @@ export default function register(api: any) {
                 if (reverse) {
                   const { data: theirProfile } = await supabase.rpc("get_profile", { p_device_id: match.device_id_b });
                   const name = theirProfile?.display_name || "对方";
-                  const emoji = theirProfile?.emoji || "👤";
                   const contact = reverse.contact_info_a ? `\n对方的联系方式：${reverse.contact_info_a}` : "";
                   notifyUser(
                     channel, userId,
-                    `[Antenna] 🎉 双向匹配成功！${emoji} ${name} 也接受了你！${contact}\n\n用 antenna_check_matches 查看详情。`,
-                    logger,
+                    `[Antenna] 🎉 双向匹配成功！${name} 也接受了你！${contact}\n\n用 antenna_check_matches 查看详情。`,
+                    logger, api,
                   );
-                  _notifiedMatches.add(notifyKey);
+                  // Clean up follow-up crons
                   stopFollowUpCron(deviceId, match.device_id_b, logger);
                 }
               } else if (match.device_id_b === deviceId) {
                 // Someone new accepted me
                 const { data: theirProfile } = await supabase.rpc("get_profile", { p_device_id: match.device_id_a });
                 const name = theirProfile?.display_name || "有人";
-                const emoji = theirProfile?.emoji || "👤";
                 const iAccepted = myMatches.find((m: any) => m.device_id_b === match.device_id_a);
                 if (iAccepted) {
+                  // I already accepted them → mutual!
                   const contact = match.contact_info_a ? `\n对方的联系方式：${match.contact_info_a}` : "";
                   notifyUser(
                     channel, userId,
-                    `[Antenna] 🎉 双向匹配成功！${emoji} ${name} 也接受了你！${contact}\n\n用 antenna_check_matches 查看详情。`,
-                    logger,
+                    `[Antenna] 🎉 双向匹配成功！${name} 也接受了你！${contact}\n\n用 antenna_check_matches 查看详情。`,
+                    logger, api,
                   );
-                  _notifiedMatches.add(notifyKey);
                   stopFollowUpCron(deviceId, match.device_id_a, logger);
                 } else {
+                  // They accepted me but I haven't responded
                   notifyUser(
                     channel, userId,
-                    `[Antenna] 📩 ${emoji} ${name} 想认识你！看看 TA 的名片，决定要不要接受？\n\n用 antenna_check_matches 查看详情。`,
-                    logger,
+                    `[Antenna] 📩 ${name} 想认识你！看看 TA 的名片，决定要不要接受？\n\n用 antenna_check_matches 查看详情。`,
+                    logger, api,
                   );
-                  _notifiedMatches.add(notifyKey);
                 }
               }
             }
@@ -1624,9 +1640,8 @@ export default function register(api: any) {
             }
           }
 
-          // ── Event approval polling (use notification targets, not _knownDeviceIds) ──
-          for (const profile of activeProfiles) {
-            const deviceId = profile.device_id;
+          // ── Event approval polling ──
+          for (const deviceId of _knownDeviceIds) {
             try {
               const { data: events } = await supabase.rpc("get_my_event_updates", { p_device_id: deviceId });
               if (!events?.length) continue;
@@ -1635,47 +1650,23 @@ export default function register(api: any) {
               const channel = parts[0];
               const userId = parts.slice(1).join(":");
               for (const ev of events) {
-                const key = `event:${deviceId}:${ev.event_id}:${ev.status}`;
+                const key = `event:${ev.event_id}:${ev.status}`;
                 if (_notifiedMatches.has(key)) continue;
-                if (ev.status === "active" && ev.role !== "creator" && ev.role !== "cohost" && ev.requires_approval) {
+                _notifiedMatches.add(key);
+                if (ev.status === "active" && ev.role !== "creator" && ev.role !== "cohost") {
                   notifyUser(channel, userId,
                     `[Antenna] ✅ 你的申请已通过！欢迎加入「${ev.event_name}」`,
-                    logger,
+                    logger, api,
                   );
-                  _notifiedMatches.add(key);
                 } else if (ev.status === "rejected") {
                   notifyUser(channel, userId,
                     `[Antenna] ❌ 你的申请未通过「${ev.event_name}」`,
-                    logger,
+                    logger, api,
                   );
-                  _notifiedMatches.add(key);
                 }
               }
             } catch { /* silent */ }
           }
-
-          // ── Event messages polling ──
-          for (const profile of activeProfiles) {
-            const deviceId = profile.device_id;
-            try {
-              const { data: msgs } = await supabase.rpc("get_my_event_messages", { p_device_id: deviceId });
-              if (!msgs?.length) continue;
-              const parts = deviceId.split(":");
-              if (parts.length < 2) continue;
-              const channel = parts[0];
-              const userId = parts.slice(1).join(":");
-              for (const msg of msgs) {
-                const key = `evtmsg:${msg.event_id}:${msg.created_at}`;
-                if (_notifiedMatches.has(key)) continue;
-                const role = msg.sender_role === 'creator' ? '组织者' : '协办';
-                notifyUser(channel, userId,
-                  `[Antenna] 📢 来自「${msg.event_name}」${role} ${msg.sender_emoji || ''} ${msg.sender_name}: ${msg.message}`,
-                  logger,
-                );
-                _notifiedMatches.add(key);
-              }
-            } catch { /* silent */ }
-          }
         } catch (err: any) {
           logger.warn("Antenna: match poll error:", err.message);
         }
@@ -1695,6 +1686,171 @@ export default function register(api: any) {
     },
   });
 
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_drift_throw
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_drift_throw",
+    description: "Throw a drift bottle into the sea. Write a message (max 500 chars), a random stranger will pick it up. Anonymous.",
+    parameters: {
+      type: "object",
+      properties: {
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "The channel name" },
+        chat_id: { type: "string", description: "REQUIRED. Chat/channel ID for notifications." },
+        message: { type: "string", description: "The message to put in the bottle (max 500 chars)" },
+      },
+      required: ["sender_id", "channel", "chat_id", "message"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+
+      if (!params.message || params.message.length === 0) {
+        return ok({ error: "empty_message", message: "漂流瓶不能是空的。" });
+      }
+      if (params.message.length > 500) {
+        return ok({ error: "too_long", message: "最多 500 字。" });
+      }
+
+      const { data, error } = await supabase.rpc("throw_drift_bottle", {
+        p_device_id: deviceId,
+        p_message: params.message,
+      });
+
+      if (error) return ok({ error: error.message });
+      return ok({ success: true, bottle_id: data?.bottle_id, total_thrown: data?.total_thrown, message: "🍾 漂流瓶已丢入海中，等待某个陌生人捡起它…" });
+    },
+  });
+
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_drift_pick
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_drift_pick",
+    description: "Pick up a random drift bottle from the sea. You'll get an anonymous message from a stranger. You can only hold one bottle at a time.",
+    parameters: {
+      type: "object",
+      properties: {
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "The channel name" },
+        chat_id: { type: "string", description: "REQUIRED. Chat/channel ID for notifications." },
+      },
+      required: ["sender_id", "channel", "chat_id"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+
+      const { data, error } = await supabase.rpc("pick_drift_bottle", {
+        p_device_id: deviceId,
+      });
+
+      if (error) return ok({ error: error.message });
+      return ok(data);
+    },
+  });
+
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_drift_reply
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_drift_reply",
+    description: "Reply to a drift bottle you picked up. Your reply will be sent back to the original thrower anonymously.",
+    parameters: {
+      type: "object",
+      properties: {
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "The channel name" },
+        chat_id: { type: "string", description: "REQUIRED. Chat/channel ID for notifications." },
+        bottle_id: { type: "string", description: "The bottle ID to reply to" },
+        reply: { type: "string", description: "Your reply message (max 500 chars)" },
+      },
+      required: ["sender_id", "channel", "chat_id", "bottle_id", "reply"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+
+      if (!params.reply || params.reply.length === 0) {
+        return ok({ error: "empty_reply", message: "回复不能是空的。" });
+      }
+      if (params.reply.length > 500) {
+        return ok({ error: "too_long", message: "最多 500 字。" });
+      }
+
+      const { data, error } = await supabase.rpc("reply_drift_bottle", {
+        p_bottle_id: params.bottle_id,
+        p_device_id: deviceId,
+        p_reply: params.reply,
+      });
+
+      if (error) return ok({ error: error.message });
+      return ok(data);
+    },
+  });
+
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_drift_check
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_drift_check",
+    description: "Check drift bottle status: any new replies to your bottles? Any bottles you picked up waiting for reply?",
+    parameters: {
+      type: "object",
+      properties: {
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "The channel name" },
+        chat_id: { type: "string", description: "REQUIRED. Chat/channel ID for notifications." },
+      },
+      required: ["sender_id", "channel", "chat_id"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+
+      const { data, error } = await supabase.rpc("check_drift_bottles", {
+        p_device_id: deviceId,
+      });
+
+      if (error) return ok({ error: error.message });
+      return ok(data);
+    },
+  });
+
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_drift_my_bottles
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_drift_my_bottles",
+    description: "List all drift bottles you've thrown, with their status (floating/picked/replied).",
+    parameters: {
+      type: "object",
+      properties: {
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "The channel name" },
+        chat_id: { type: "string", description: "REQUIRED. Chat/channel ID for notifications." },
+      },
+      required: ["sender_id", "channel", "chat_id"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel, params.chat_id, api);
+
+      const { data, error } = await supabase.rpc("get_my_bottles", {
+        p_device_id: deviceId,
+      });
+
+      if (error) return ok({ error: error.message });
+      return ok(data);
+    },
+  });
+
   // ═══════════════════════════════════════════════════════════════════
   // Hook: auto-scan when location is received
   // ═══════════════════════════════════════════════════════════════════