antenna-openclaw-plugin 0.3.2 → 0.5.0

package/index.ts

@@ -1,4 +1,5 @@
 import { createClient, SupabaseClient } from "@supabase/supabase-js";
+import { execSync } from "child_process";
 
 // ─── Built-in Supabase config (shared backend, zero config) ─────────
 
@@ -106,6 +107,109 @@ function ok(data: any) {
   return { content: [{ type: "text", text: JSON.stringify(data) }] };
 }
 
+// ─── Cron helpers ────────────────────────────────────────────────────
+
+const FOLLOW_UP_INTERVAL_MS = 15 * 60 * 1000; // 15 minutes
+const FOLLOW_UP_MAX_DURATION_MS = 2 * 60 * 60 * 1000; // 2 hours
+const _activeFollowUps = new Map<string, string>(); // "deviceA→deviceB" → cronJobId
+
+function cronJobId(deviceA: string, deviceB: string): string {
+  // Stable, filesystem-safe id
+  const safe = (s: string) => s.replace(/[^a-zA-Z0-9_-]/g, "_");
+  return `antenna-follow-${safe(deviceA)}-${safe(deviceB)}`;
+}
+
+/** Send a real-time notification to a user via openclaw agent --deliver */
+function notifyUser(
+  channel: string,
+  userId: string,
+  message: string,
+  logger: any,
+): void {
+  try {
+    execSync(
+      `openclaw agent` +
+      ` --message ${JSON.stringify(message)}` +
+      ` --deliver` +
+      ` --reply-channel ${channel}` +
+      ` --reply-to "${userId}"`,
+      { timeout: 30_000, encoding: "utf-8" },
+    );
+    logger.info(`Antenna: notified ${channel}:${userId}`);
+  } catch (err: any) {
+    logger.warn(`Antenna: notify failed for ${channel}:${userId}: ${err.message}`);
+  }
+}
+
+function startFollowUpCron(
+  deviceId: string,
+  targetDeviceId: string,
+  channel: string,
+  userId: string,
+  targetName: string,
+  logger: any,
+): void {
+  const jobId = cronJobId(deviceId, targetDeviceId);
+  const key = `${deviceId}→${targetDeviceId}`;
+
+  // Already tracking this pair
+  if (_activeFollowUps.has(key)) return;
+
+  const message = [
+    `[Antenna follow-up] 检查匹配状态：`,
+    `运行 antenna_check_matches（sender_id="${userId}", channel="${channel}"）。`,
+    `如果 ${targetName}（${targetDeviceId}）已经 mutual match，`,
+    `用 message tool 通知用户：「${targetName} 也接受了你的匹配！」并附上对方的联系方式（如果有）。`,
+    `然后运行：openclaw cron remove ${jobId}`,
+    `如果还没有 mutual，回复 HEARTBEAT_OK。`,
+  ].join(" ");
+
+  try {
+    // Create recurring 15-min job
+    execSync(
+      `openclaw cron add` +
+      ` --name "Antenna: 等待 ${targetName} 回应"` +
+      ` --every 15m` +
+      ` --session isolated` +
+      ` --message ${JSON.stringify(message)}` +
+      ` --announce` +
+      ` --channel ${channel}` +
+      ` --to "${userId}"`,
+      { timeout: 10_000, encoding: "utf-8" },
+    );
+
+    _activeFollowUps.set(key, jobId);
+    logger.info(`Antenna: follow-up cron created for ${key} (job: ${jobId})`);
+
+    // Schedule auto-cleanup after 2 hours
+    setTimeout(() => {
+      try {
+        execSync(`openclaw cron remove ${jobId}`, { timeout: 5_000 });
+        logger.info(`Antenna: follow-up expired for ${key}`);
+      } catch {
+        // Job may already be removed
+      }
+      _activeFollowUps.delete(key);
+    }, FOLLOW_UP_MAX_DURATION_MS);
+  } catch (err: any) {
+    logger.warn(`Antenna: failed to create follow-up cron: ${err.message}`);
+  }
+}
+
+function stopFollowUpCron(deviceA: string, deviceB: string, logger: any): void {
+  const key = `${deviceA}→${deviceB}`;
+  const jobId = _activeFollowUps.get(key);
+  if (!jobId) return;
+
+  try {
+    execSync(`openclaw cron remove ${jobId}`, { timeout: 5_000 });
+    logger.info(`Antenna: follow-up stopped for ${key}`);
+  } catch {
+    // Already removed
+  }
+  _activeFollowUps.delete(key);
+}
+
 // ─── Plugin ──────────────────────────────────────────────────────────
 
 export default function register(api: any) {
@@ -233,6 +337,53 @@ export default function register(api: any) {
     },
   });
 
+  // ═══════════════════════════════════════════════════════════════════
+  // Tool: antenna_checkin
+  // ═══════════════════════════════════════════════════════════════════
+  api.registerTool({
+    name: "antenna_checkin",
+    description:
+      "Check in at a location — update your position so others can find you when they scan. Use when the user says 'I'm at XX' or wants to be discoverable without scanning others. Also works with place names (agent should geocode first).",
+    parameters: {
+      type: "object",
+      properties: {
+        lat: { type: "number", description: "Latitude" },
+        lng: { type: "number", description: "Longitude" },
+        sender_id: { type: "string", description: "The sender's user ID" },
+        channel: { type: "string", description: "The channel name" },
+        place_name: { type: "string", description: "Optional: name of the place (for confirmation message)" },
+      },
+      required: ["lat", "lng", "sender_id", "channel"],
+    },
+    async execute(_id: string, params: any) {
+      const cfg = getConfig(api);
+      const supabase = getSupabase(cfg);
+      const deviceId = deriveDeviceId(params.sender_id, params.channel);
+      const fuzzy = fuzzyCoords(params.lat, params.lng);
+
+      // Check if user has a profile first
+      const { data: profile } = await supabase.rpc("get_profile", { p_device_id: deviceId });
+      if (!profile) {
+        return ok({
+          checked_in: false,
+          message: "你还没有名片，别人看到你也不知道你是谁。先创建一个名片吧（告诉我你的名字、emoji、三句话介绍自己）。",
+        });
+      }
+
+      const { error } = await supabase.rpc("upsert_profile_location", {
+        p_device_id: deviceId, p_lng: fuzzy.lng, p_lat: fuzzy.lat,
+      });
+
+      if (error) return ok({ error: error.message });
+
+      const place = params.place_name ? ` (${params.place_name})` : "";
+      return ok({
+        checked_in: true,
+        message: `已签到${place} 📍 现在附近的人扫描就能看到你了。`,
+      });
+    },
+  });
+
   // ═══════════════════════════════════════════════════════════════════
   // Tool: antenna_accept
   // ═══════════════════════════════════════════════════════════════════
@@ -268,6 +419,10 @@ export default function register(api: any) {
       );
 
       if (reverse) {
+        // Mutual match! Stop any follow-up cron for this pair
+        stopFollowUpCron(deviceId, params.target_device_id, logger);
+        stopFollowUpCron(params.target_device_id, deviceId, logger);
+
         return ok({
           accepted: true, mutual: true,
           their_contact: reverse.contact_info_a || null,
@@ -277,7 +432,19 @@ export default function register(api: any) {
         });
       }
 
-      return ok({ accepted: true, mutual: false, message: "已接受。等对方也接受后，你们就可以交换联系方式了。" });
+      // Not mutual yet — start a follow-up cron (check every 15min for 2h)
+      const { data: targetProfile } = await supabase.rpc("get_profile", { p_device_id: params.target_device_id });
+      const targetName = targetProfile?.display_name || "对方";
+
+      startFollowUpCron(
+        deviceId, params.target_device_id,
+        params.channel, params.sender_id, targetName, logger,
+      );
+
+      return ok({
+        accepted: true, mutual: false,
+        message: "已接受。我会在接下来 2 小时内每 15 分钟检查一次对方是否回应，有消息第一时间告诉你。",
+      });
     },
   });
 
@@ -319,6 +486,10 @@ export default function register(api: any) {
           (m: any) => m.device_id_a === match.device_id_b
         );
         if (reverse) {
+          // Clean up follow-up crons for this mutual pair
+          stopFollowUpCron(deviceId, match.device_id_b, logger);
+          stopFollowUpCron(match.device_id_b, deviceId, logger);
+
           const { data: profile } = await supabase.rpc("get_profile", { p_device_id: match.device_id_b });
           mutualMatches.push({
             device_id: match.device_id_b,
@@ -360,16 +531,16 @@ export default function register(api: any) {
   });
 
   // ═══════════════════════════════════════════════════════════════════
-  // Service: poll for new mutual matches every 10 minutes
+  // Service: poll for new matches every 10 minutes → notify instantly
   // ═══════════════════════════════════════════════════════════════════
-  const _pendingNotifications: Map<string, any[]> = new Map(); // deviceId → new mutual matches
+  const _notifiedMatches = new Set<string>(); // "deviceA→deviceB" already notified
 
   let _pollTimer: ReturnType<typeof setInterval> | null = null;
 
   api.registerService({
     id: "antenna-match-poller",
     start: () => {
-      logger.info("Antenna: match poller started (10 min interval)");
+      logger.info("Antenna: match poller started (10 min interval, real-time notify)");
       _pollTimer = setInterval(async () => {
         try {
           const cfg = getConfig(api);
@@ -387,15 +558,74 @@ export default function register(api: any) {
             const { data: matches } = await supabase.rpc("get_my_matches", { p_device_id: deviceId });
             if (!matches?.length) continue;
 
-            // Check for matches created in last 10 min (new since last poll)
+            // Find new matches created in last 10 min
             const newMatches = matches.filter((m: any) => {
               const created = new Date(m.created_at).getTime();
-              return Date.now() - created < 10 * 60 * 1000;
+              const key = `${m.device_id_a}→${m.device_id_b}`;
+              return Date.now() - created < 10 * 60 * 1000 && !_notifiedMatches.has(key);
             });
 
-            if (newMatches.length > 0) {
-              _pendingNotifications.set(deviceId, newMatches);
-              logger.info(`Antenna: ${newMatches.length} new match(es) for ${deviceId}`);
+            if (newMatches.length === 0) continue;
+
+            // Parse channel and userId from device_id (format: "channel:userId")
+            const parts = deviceId.split(":");
+            if (parts.length < 2) continue;
+            const channel = parts[0];
+            const userId = parts.slice(1).join(":");
+
+            // Check for mutual matches
+            const myMatches = matches.filter((m: any) => m.device_id_a === deviceId);
+            const incomingMatches = matches.filter((m: any) => m.device_id_b === deviceId);
+
+            for (const match of newMatches) {
+              const notifyKey = `${match.device_id_a}→${match.device_id_b}`;
+              _notifiedMatches.add(notifyKey);
+
+              // Is this a new mutual match?
+              if (match.device_id_a === deviceId) {
+                const reverse = incomingMatches.find((m: any) => m.device_id_a === match.device_id_b);
+                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,
+                  );
+                  // 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,
+                  );
+                  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,
+                  );
+                }
+              }
+            }
+
+            // Prune old entries from _notifiedMatches (keep last 24h)
+            if (_notifiedMatches.size > 5000) {
+              _notifiedMatches.clear();
             }
           }
         } catch (err: any) {
@@ -410,7 +640,7 @@ export default function register(api: any) {
   });
 
   // ═══════════════════════════════════════════════════════════════════
-  // Hook: auto-scan when location is received + inject match notifications
+  // Hook: auto-scan when location is received
   // ═══════════════════════════════════════════════════════════════════
   api.on(
     "before_prompt_build",
@@ -419,26 +649,16 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         let hint = "";
 
-        // --- Check for pending match notifications ---
-        if (ctx?.senderId && ctx?.channel) {
-          const deviceId = deriveDeviceId(ctx.senderId, ctx.channel);
-          const pending = _pendingNotifications.get(deviceId);
-          if (pending && pending.length > 0) {
-            _pendingNotifications.delete(deviceId);
-            hint += `\n\n[Antenna] 🎉 有 ${pending.length} 个新的匹配通知！请调用 antenna_check_matches 查看详情，并告诉用户有人想认识他们。`;
-          }
-        }
-
         // --- Auto-scan on location ---
-        if (cfg.autoScanOnLocation === false) return hint ? { prependContext: hint } : {};
+        if (cfg.autoScanOnLocation === false) return {};
 
         const lat = ctx?.LocationLat;
         const lon = ctx?.LocationLon;
-        if (lat == null || lon == null) return hint ? { prependContext: hint } : {};
+        if (lat == null || lon == null) return {};
 
         const isLive = ctx?.LocationIsLive ?? false;
         const locationName = ctx?.LocationName ?? "";
-        hint += isLive
+        hint = isLive
           ? `\n\n[Antenna] 📡 收到实时位置 (${lat.toFixed(4)}, ${lon.toFixed(4)})${locationName ? ` — ${locationName}` : ""}。请使用 antenna_scan 工具查看附近有谁。参数：lat=${lat}, lng=${lon}, sender_id 和 channel 从消息上下文获取。`
           : `\n\n[Antenna] 📍 收到位置 (${lat.toFixed(4)}, ${lon.toFixed(4)})${locationName ? ` — ${locationName}` : ""}。请使用 antenna_scan 工具查看附近有谁。参数：lat=${lat}, lng=${lon}, sender_id 和 channel 从消息上下文获取。`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antenna-openclaw-plugin",
-  "version": "0.3.2",
+  "version": "0.5.0",
   "description": "Antenna — agent-mediated nearby people discovery for OpenClaw",
   "openclaw": {
     "extensions": ["./index.ts"]