antenna-fyi 1.2.28 → 1.2.30

package/lib/cli.js

@@ -2,7 +2,7 @@
 
 import { scan, getProfile, setProfile, accept, checkMatches, checkin, createBindToken, discover, createEvent, endEvent, eventCheckin, joinEvent, eventScan, pass as passUser, uploadEventImage, updateEvent, approveParticipant, rejectParticipant, addCohost, getClient } from "./core.js";
 import { createInterface } from "readline";
-import { existsSync, mkdirSync, copyFileSync, readFileSync, writeFileSync, unlinkSync } from "fs";
+import { existsSync, mkdirSync, copyFileSync, readFileSync, writeFileSync, unlinkSync, renameSync } from "fs";
 import path from "path";
 import os from "os";
 import { join, dirname, extname } from "path";
@@ -125,7 +125,7 @@ export async function handleMatches(f) {
   for (const m of result.incoming_accepts) {
     console.log(`📩 WANTS TO MEET YOU: ${m.emoji} ${m.name}`);
     if (m.line1) console.log(`   ${m.line1}`);
-    console.log(`   Accept: antenna accept --id ${f.id} --target ${m.device_id}`);
+    console.log(`   Accept: antenna accept --id ${f.id} --ref ${m.ref}`);
     console.log();
   }
 }
@@ -483,6 +483,20 @@ export async function handleWatch(f) {
   // Write PID file for health check
   const pidDir = path.join(os.homedir(), '.antenna');
   const pidFile = path.join(pidDir, 'watch.pid');
+
+  // Check for existing watch process
+  if (existsSync(pidFile)) {
+    try {
+      const existingPid = parseInt(readFileSync(pidFile, 'utf8').trim());
+      process.kill(existingPid, 0); // throws if not running
+      console.error(`❌ Watch already running (PID ${existingPid}). Kill it first or remove ${pidFile}`);
+      process.exit(1);
+    } catch (e) {
+      if (e.code !== 'ESRCH') { /* process exists */ throw e; }
+      // Process not running, stale PID file — continue
+    }
+  }
+
   try {
     if (!existsSync(pidDir)) mkdirSync(pidDir, { recursive: true });
     writeFileSync(pidFile, String(process.pid));
@@ -492,25 +506,52 @@ export async function handleWatch(f) {
   process.on('SIGTERM', () => { try { unlinkSync(pidFile); } catch {} process.exit(0); });
 
   const sb = getClient();
-  const notified = new Set();
 
-  // Detect local agent framework for push notifications
-  let pushMethod = "terminal"; // default: just print
-  try {
-    execSync("which openclaw", { stdio: "pipe" });
-    // Verify gateway is running
+  // Persist notified set to disk
+  const notifiedFile = path.join(pidDir, 'notified.json');
+
+  function loadNotified() {
     try {
-      execSync("openclaw gateway health", { stdio: "pipe", timeout: 5000 });
-      pushMethod = "openclaw";
-    } catch { /* gateway not running */ }
-  } catch { /* openclaw not installed */ }
+      const data = JSON.parse(readFileSync(notifiedFile, 'utf8'));
+      const now = Date.now();
+      const TTL = 48 * 60 * 60 * 1000;
+      const set = new Set();
+      for (const [key, ts] of Object.entries(data)) {
+        if (now - ts < TTL) set.add(key);
+      }
+      return set;
+    } catch { return new Set(); }
+  }
 
-  if (pushMethod === "terminal") {
+  function saveNotified(set) {
+    const now = Date.now();
+    const obj = {};
+    for (const key of set) obj[key] = now;
+    const tmp = notifiedFile + '.tmp';
+    writeFileSync(tmp, JSON.stringify(obj));
+    renameSync(tmp, notifiedFile);
+  }
+
+  const notified = loadNotified();
+
+  // Detect local agent frameworks for push notifications
+  // Push to ALL available frameworks, not just one
+  const pushMethods = new Set();
+  if (f.push) {
+    f.push.split(",").forEach(m => pushMethods.add(m.trim()));
+  } else {
+    try {
+      execSync("which openclaw", { stdio: "pipe" });
+      try {
+        execSync("openclaw gateway health", { stdio: "pipe", timeout: 5000 });
+        pushMethods.add("openclaw");
+      } catch { /* gateway not running */ }
+    } catch { /* openclaw not installed */ }
     try {
       execSync("which hermes", { stdio: "pipe" });
       try {
         execSync("hermes gateway status", { stdio: "pipe", timeout: 5000 });
-        pushMethod = "hermes";
+        pushMethods.add("hermes");
       } catch { /* hermes gateway not running */ }
     } catch { /* hermes not installed */ }
   }
@@ -530,10 +571,8 @@ export async function handleWatch(f) {
   };
 
   _log(`📡 Watching for new matches for ${id}...`);
-  if (pushMethod === "openclaw") {
-    _log(`   🔗 Detected OpenClaw — will push notifications to your channel.`);
-  } else if (pushMethod === "hermes") {
-    _log(`   🔗 Detected Hermes — will push notifications to your channel.`);
+  if (pushMethods.size > 0) {
+    _log(`   🔗 Push targets: ${[...pushMethods].join(", ")}`);
   } else {
     _log(`   ℹ️  No agent framework detected — notifications will print here.`);
   }
@@ -546,9 +585,9 @@ export async function handleWatch(f) {
   async function pushNotify(message) {
     _log(message); // always print to terminal
 
-    if (pushMethod === "openclaw") {
+    // Push to ALL available frameworks
+    if (pushMethods.has("openclaw")) {
       try {
-        // Try to get chat_id from DB for direct message send
         const profile = await getProfile({ device_id: id });
         const chatId = profile?.last_chat_id;
         const parts = id.split(":");
@@ -565,7 +604,8 @@ export async function handleWatch(f) {
           );
         }
       } catch (err) { /* terminal output is the fallback */ }
-    } else if (pushMethod === "hermes") {
+    }
+    if (pushMethods.has("hermes")) {
       try {
         execSync(
           `hermes cron create --name "Antenna notification" --run-now --once --message ${JSON.stringify(message)}`,
@@ -580,19 +620,21 @@ export async function handleWatch(f) {
   if (initial.mutual_matches?.length) {
     _log(`🎉 You have ${initial.mutual_matches.length} mutual match(es)!`);
     for (const m of initial.mutual_matches) {
-      const key = `mutual:${m.device_id}`;
+      const key = `mutual:${m._device_id}`;
       notified.add(key);
       _log(`   ${m.emoji || "👤"} ${m.name}${m.their_contact ? " — contact: " + m.their_contact : ""}`);
     }
+    saveNotified(notified);
     _log();
   }
   if (initial.incoming_accepts?.length) {
     _log(`📩 ${initial.incoming_accepts.length} person(s) want to meet you!`);
     for (const m of initial.incoming_accepts) {
-      const key = `incoming:${m.device_id}`;
+      const key = `incoming:${m._device_id}`;
       notified.add(key);
       _log(`   ${m.emoji || "👤"} ${m.name} — ${m.line1 || ""}`);
     }
+    saveNotified(notified);
     _log();
   }
 
@@ -618,26 +660,30 @@ export async function handleWatch(f) {
 
             // Check if mutual
             const matches = await checkMatches({ device_id: id });
-            const isMutual = matches.mutual_matches?.some(m => m.device_id === row.device_id_a);
+            const isMutual = matches.mutual_matches?.some(m => m._device_id === row.device_id_a);
 
             if (isMutual) {
               const mutualKey = `mutual:${row.device_id_a}`;
               notified.add(mutualKey);
+              saveNotified(notified);
               const contact = row.contact_info_a;
               pushNotify(`🎉 MUTUAL MATCH! ${emoji} ${name} also accepted you!${contact ? " Contact: " + contact : ""}`);
             } else {
-              pushNotify(`📩 ${emoji} ${name} wants to meet you! Run: antenna accept --id ${id} --target ${row.device_id_a}`);
+              notified.add(key);
+              saveNotified(notified);
+              pushNotify(`📩 ${emoji} ${name} wants to meet you! Use 'antenna matches --id ${id}' to respond.`);
             }
           }
 
           // I accepted someone and they also accepted me
           if (row.device_id_a === id) {
             const matches = await checkMatches({ device_id: id });
-            const mutual = matches.mutual_matches?.find(m => m.device_id === row.device_id_b);
+            const mutual = matches.mutual_matches?.find(m => m._device_id === row.device_id_b);
             if (mutual) {
               const mutualKey = `mutual:${row.device_id_b}`;
               if (!notified.has(mutualKey)) {
                 notified.add(mutualKey);
+                saveNotified(notified);
                 pushNotify(`🎉 MUTUAL MATCH! ${mutual.emoji || "👤"} ${mutual.name}!${mutual.their_contact ? " Contact: " + mutual.their_contact : ""}`);
               }
             }
@@ -649,12 +695,28 @@ export async function handleWatch(f) {
     )
     .subscribe((status) => {
       if (status === "SUBSCRIBED") {
+        retryCount = 0;
         _log("✅ Connected — listening for matches in real-time.");
       } else if (status === "CHANNEL_ERROR" || status === "TIMED_OUT") {
-        _log(`⚠️  Connection issue (${status}), retrying...`);
+        retryCount++;
+        if (retryCount < MAX_FAST_RETRIES) {
+          const delay = Math.min(1000 * Math.pow(2, retryCount), 60000);
+          _log(`⚠️  Connection issue (${status}), retry #${retryCount} in ${Math.round(delay/1000)}s...`);
+          setTimeout(() => { try { channel.subscribe(); } catch {} }, delay);
+        } else if (retryCount === MAX_FAST_RETRIES) {
+          _log(`⚠️  Connection unstable after ${MAX_FAST_RETRIES} retries. Switching to ${COOLDOWN_MS/1000}s cooldown. Polling fallback still active.`);
+          setTimeout(() => { try { channel.subscribe(); } catch {} }, COOLDOWN_MS);
+        } else {
+          setTimeout(() => { try { channel.subscribe(); } catch {} }, COOLDOWN_MS);
+        }
       }
     });
 
+  // Reconnection state for matches channel
+  let retryCount = 0;
+  const MAX_FAST_RETRIES = 20;
+  const COOLDOWN_MS = 5 * 60 * 1000; // 5 min
+
   // Subscribe to event_participants changes (approval notifications)
   sb
     .channel("antenna-cli-watch-events")
@@ -704,16 +766,18 @@ export async function handleWatch(f) {
     try {
       const result = await checkMatches({ device_id: id });
       for (const m of (result.mutual_matches || [])) {
-        const key = `mutual:${m.device_id}`;
+        const key = `mutual:${m._device_id}`;
         if (!notified.has(key)) {
           notified.add(key);
+          saveNotified(notified);
           pushNotify(`🎉 MUTUAL MATCH! ${m.emoji || "👤"} ${m.name}!${m.their_contact ? " Contact: " + m.their_contact : ""}`);
         }
       }
       for (const m of (result.incoming_accepts || [])) {
-        const key = `incoming:${m.device_id}`;
+        const key = `incoming:${m._device_id}`;
         if (!notified.has(key)) {
           notified.add(key);
+          saveNotified(notified);
           pushNotify(`📩 ${m.emoji || "👤"} ${m.name} wants to meet you!`);
         }
       }
@@ -741,7 +805,7 @@ Usage:
   antenna matches    --id telegram:123
   antenna discover   --id telegram:123
   antenna event      --create --name 'AI Meetup' [--desc '...'] [--og-image 'url'] [--requires-approval] [--screening-questions 'Q1|Q2'] | --join --code abc123 | --scan --code abc123 | --end --code abc123 --id telegram:123 | --upload-image --code abc123 --file /path/to/image.png | --update --code abc123 --name 'New Name' | --approve --code abc123 --ref 1 | --reject --code abc123 --ref 1 | --add-host --code abc123 --ref 1
-  antenna watch       --id telegram:123  Watch for new matches in real-time (Ctrl+C to stop)
+  antenna watch       --id telegram:123 [--push hermes|openclaw|terminal]  Watch for new matches in real-time (Ctrl+C to stop)
   antenna bind       --id telegram:123
   antenna serve      Start MCP server (stdio transport)
   antenna setup      Interactive profile setup [--id telegram:123]

package/lib/core.js

@@ -79,20 +79,12 @@ export async function scan({ lat, lng, radius_m = 500, device_id, supabaseUrl, s
       lat = loc.lat;
       lng = loc.lng;
     } else {
-      return { count: 0, radius_m, profiles: [], message: "还没有位置信息。请先通过链接分享位置，或者发送位置消息。" };
+      return { count: 0, radius_m, profiles: [], message: "还没有位置信息。请先用 'antenna checkin' 分享位置，或通过链接分享位置。" };
     }
   }
 
   const fuzzy = fuzzyCoord(lat, lng);
 
-  if (device_id) {
-    await sb.rpc("upsert_profile_location", {
-      p_device_id: device_id,
-      p_lng: fuzzy.lng,
-      p_lat: fuzzy.lat,
-    });
-  }
-
   const { data, error } = await sb.rpc("nearby_profiles", {
     p_lat: fuzzy.lat,
     p_lng: fuzzy.lng,
@@ -323,60 +315,43 @@ export async function checkin({ lat, lng, device_id, supabaseUrl, supabaseKey })
 export async function checkMatches({ device_id, supabaseUrl, supabaseKey }) {
   const sb = getClient(supabaseUrl, supabaseKey);
 
-  const { data: allMatches, error } = await sb.rpc("get_my_matches", { p_device_id: device_id });
+  // Single RPC with JOINed profiles — no N+1
+  const { data, error } = await sb.rpc("get_my_matches_with_profiles", { p_device_id: device_id });
   if (error) throw new Error(error.message);
 
-  if (!allMatches?.length) {
-    return {
-      mutual_matches: [],
-      incoming_accepts: [],
-      message: "目前没有进行中的匹配。",
-    };
-  }
-
-  const myMatches = allMatches.filter((m) => m.device_id_a === device_id);
-  const incomingMatches = allMatches.filter((m) => m.device_id_b === device_id);
-
-  // Mutual
-  const mutualMatches = [];
-  for (const match of myMatches) {
-    const reverse = incomingMatches.find((m) => m.device_id_a === match.device_id_b);
-    if (reverse) {
-      const profile = await getProfile({ device_id: match.device_id_b, supabaseUrl, supabaseKey });
-      mutualMatches.push({
-        device_id: match.device_id_b,
-        name: profile?.display_name || "匿名",
-        emoji: profile?.emoji || "👤",
-        line1: profile?.line1,
-        line2: profile?.line2,
-        line3: profile?.line3,
-        their_contact: reverse.contact_info_a || null,
-        you_shared: match.contact_info_a || null,
-      });
-    }
-  }
-
-  // Incoming only
-  const incomingAccepts = [];
-  for (const match of incomingMatches) {
-    const iAccepted = myMatches.find((m) => m.device_id_b === match.device_id_a);
-    if (!iAccepted) {
-      const profile = await getProfile({ device_id: match.device_id_a, supabaseUrl, supabaseKey });
-      incomingAccepts.push({
-        device_id: match.device_id_a,
-        name: profile?.display_name || "匿名",
-        emoji: profile?.emoji || "👤",
-        line1: profile?.line1,
-        line2: profile?.line2,
-        line3: profile?.line3,
-      });
-    }
-  }
+  const raw = data || { mutual_matches: [], incoming_accepts: [] };
+
+  // Add refs and rename target_id to _device_id (internal only)
+  const mutualMatches = (raw.mutual_matches || []).map((m, i) => ({
+    ref: String(i + 1),
+    _device_id: m.target_id,
+    name: m.name || "匿名",
+    emoji: m.emoji || "👤",
+    line1: m.line1,
+    line2: m.line2,
+    line3: m.line3,
+    their_contact: m.their_contact || null,
+    you_shared: m.you_shared || null,
+  }));
+
+  const incomingAccepts = (raw.incoming_accepts || []).map((m, i) => ({
+    ref: String(i + 1),
+    _device_id: m.target_id,
+    name: m.name || "匿名",
+    emoji: m.emoji || "👤",
+    line1: m.line1,
+    line2: m.line2,
+    line3: m.line3,
+  }));
 
   const messages = [];
   if (mutualMatches.length > 0) messages.push(`${mutualMatches.length} 个双向匹配！可以交换联系方式了`);
   if (incomingAccepts.length > 0) messages.push(`${incomingAccepts.length} 个人想认识你，等你回应`);
-  if (messages.length === 0) messages.push("你接受了一些匹配，但对方还没有回应。耐心等等 ⏳");
+  if (messages.length === 0 && mutualMatches.length === 0 && incomingAccepts.length === 0) {
+    messages.push("目前没有进行中的匹配。");
+  } else if (messages.length === 0) {
+    messages.push("你接受了一些匹配，但对方还没有回应。耐心等等 ⏳");
+  }
 
   return {
     mutual_matches: mutualMatches,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antenna-fyi",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "description": "Antenna — nearby people discovery. CLI + MCP server + OpenClaw skill & plugin, all in one package.",
   "type": "module",
   "bin": {