antenna-fyi 1.2.24 → 1.2.26

package/lib/cli.js

@@ -2,7 +2,9 @@
 
 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 } from "fs";
+import { existsSync, mkdirSync, copyFileSync, readFileSync, writeFileSync, unlinkSync } from "fs";
+import path from "path";
+import os from "os";
 import { join, dirname, extname } from "path";
 import { fileURLToPath } from "url";
 import { homedir } from "os";
@@ -334,9 +336,21 @@ export async function handleSetup(f) {
 
 export async function handleStatus(f) {
   const supabaseUrl = process.env.ANTENNA_SUPABASE_URL || process.env.ANTENNA_URL || "https://bcudjloikmpcqwcptuyd.supabase.co";
-  console.log("📡 Antenna Status\n");
+  console.log("\n📡 Antenna Status\n");
   console.log(`  Supabase URL: ${supabaseUrl}`);
 
+  // Check watch process
+  const pidFile = path.join(os.homedir(), '.antenna', 'watch.pid');
+  try {
+    if (existsSync(pidFile)) {
+      const pid = parseInt(readFileSync(pidFile, 'utf8').trim());
+      try { process.kill(pid, 0); console.log(`  Watch: ✅ running (PID ${pid})`); }
+      catch { console.log('  Watch: ❌ stale PID file (process dead)'); }
+    } else {
+      console.log('  Watch: ❌ not running');
+    }
+  } catch { console.log('  Watch: ❌ not running'); }
+
   if (f.id) {
     const profile = await getProfile({ device_id: f.id });
     if (profile) {
@@ -466,6 +480,17 @@ export async function handleWatch(f) {
     process.exit(1);
   }
 
+  // Write PID file for health check
+  const pidDir = path.join(os.homedir(), '.antenna');
+  const pidFile = path.join(pidDir, 'watch.pid');
+  try {
+    if (!existsSync(pidDir)) mkdirSync(pidDir, { recursive: true });
+    writeFileSync(pidFile, String(process.pid));
+  } catch {}
+  process.on('exit', () => { try { unlinkSync(pidFile); } catch {} });
+  process.on('SIGINT', () => { try { unlinkSync(pidFile); } catch {} process.exit(0); });
+  process.on('SIGTERM', () => { try { unlinkSync(pidFile); } catch {} process.exit(0); });
+
   const sb = getClient();
   const notified = new Set();
 
@@ -501,42 +526,35 @@ export async function handleWatch(f) {
   console.log(`   Press Ctrl+C to stop.\n`);
 
   // Push notification helper
-  function pushNotify(message) {
+  async function pushNotify(message) {
     console.log(message); // always print to terminal
 
     if (pushMethod === "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(":");
-        const channel = parts[0];
-        const userId = parts.slice(1).join(":");
-        execSync(
-          `openclaw agent` +
-          ` --message ${JSON.stringify(message)}` +
-          ` --deliver` +
-          ` --reply-channel ${channel}` +
-          ` --reply-to "${userId}"`,
-          { timeout: 30_000, stdio: "pipe" }
-        );
-      } catch (err) {
-        // silent — terminal output is the fallback
-      }
+        const chan = parts[0];
+        if (chatId) {
+          execSync(
+            `openclaw message send --channel ${chan} --target ${chatId} -m ${JSON.stringify(message)}`,
+            { timeout: 30_000, stdio: "pipe" }
+          );
+        } else {
+          execSync(
+            `openclaw agent --message ${JSON.stringify(message)} --deliver --agent main --to ${id}`,
+            { timeout: 30_000, stdio: "pipe" }
+          );
+        }
+      } catch (err) { /* terminal output is the fallback */ }
     } else if (pushMethod === "hermes") {
       try {
-        // Use hermes cron to create a one-shot notification
-        const parts = id.split(":");
-        const channel = parts[0];
         execSync(
-          `hermes cron create` +
-          ` --name "Antenna notification"` +
-          ` --run-now` +
-          ` --once` +
-          ` --message ${JSON.stringify(message)}` +
-          ` --deliver ${channel}`,
+          `hermes cron create --name "Antenna notification" --run-now --once --message ${JSON.stringify(message)}`,
           { timeout: 30_000, stdio: "pipe" }
         );
-      } catch (err) {
-        // silent — terminal output is the fallback
-      }
+      } catch (err) { /* terminal output is the fallback */ }
     }
   }
 
@@ -620,6 +638,50 @@ export async function handleWatch(f) {
       }
     });
 
+  // Subscribe to event_participants changes (approval notifications)
+  sb
+    .channel("antenna-cli-watch-events")
+    .on("postgres_changes",
+      { event: "INSERT", schema: "public", table: "event_participants" },
+      async (payload) => {
+        try {
+          const row = payload.new;
+          if (!row || row.status !== "pending") return;
+          // Someone applied to my event — check if I'm the creator
+          const event = await sb.rpc("get_event_by_id", { p_event_id: row.event_id }).then(r => r.data);
+          if (!event?.found || event.created_by !== id) return;
+          const applicant = await getProfile({ device_id: row.device_id });
+          const name = applicant?.display_name || "Someone";
+          const emoji = applicant?.emoji || "👤";
+          pushNotify(`📩 ${emoji} ${name} applied to join \"${event.name}\"! Run: antenna event --scan --code ${event.code} --id ${id}`);
+        } catch {}
+      }
+    )
+    .on("postgres_changes",
+      { event: "UPDATE", schema: "public", table: "event_participants" },
+      async (payload) => {
+        try {
+          const row = payload.new;
+          const old = payload.old;
+          if (!row || !old) return;
+          // My application was approved/rejected
+          if (row.device_id !== id) return;
+          if (old.status === "pending" && row.status === "active") {
+            const event = await sb.rpc("get_event_by_id", { p_event_id: row.event_id }).then(r => r.data);
+            pushNotify(`✅ Your application to \"${event?.name || 'an event'}\" was approved! You're in.`);
+          } else if (old.status === "pending" && row.status === "rejected") {
+            const event = await sb.rpc("get_event_by_id", { p_event_id: row.event_id }).then(r => r.data);
+            pushNotify(`❌ Your application to \"${event?.name || 'an event'}\" was not approved.`);
+          }
+        } catch {}
+      }
+    )
+    .subscribe((status) => {
+      if (status === "SUBSCRIBED") {
+        console.log("✅ Connected — listening for event notifications.");
+      }
+    });
+
   // Keep alive — also poll every 2 minutes as fallback
   const pollInterval = setInterval(async () => {
     try {

package/lib/core.js

@@ -502,7 +502,7 @@ export async function createEvent({ name, lat, lng, device_id, starts_at, ends_a
     p_description: description || null,
     p_og_image: og_image || null,
     p_requires_approval: requires_approval || false,
-    p_screening_questions: screening_questions || null,
+    p_screening_questions: screening_questions ? screening_questions.flatMap(q => q.includes('|') || q.includes('｜') ? q.split(/[|\uff5c]/).map(s => s.trim()).filter(Boolean) : [q]) : null,
   });
   if (error) throw new Error(error.message);
   return data;

package/lib/hermes-plugin/schemas.py

@@ -44,6 +44,7 @@ PROFILE_SCHEMA = {
             },
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "display_name": {"type": "string", "description": "Display name"},
             "emoji": {"type": "string", "description": "Profile emoji"},
             "line1": {"type": "string", "description": "Who you are / what you do"},
@@ -66,6 +67,7 @@ ACCEPT_SCHEMA = {
         "properties": {
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "ref": {
                 "type": "string",
                 "description": "Ref number from scan results (e.g. '1')",
@@ -95,6 +97,7 @@ CHECKIN_SCHEMA = {
             "lng": {"type": "number", "description": "Longitude"},
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "place_name": {
                 "type": "string",
                 "description": "Name of the place (optional)",
@@ -114,6 +117,7 @@ CHECK_MATCHES_SCHEMA = {
         "properties": {
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
         },
         "required": ["sender_id", "channel"],
     },
@@ -129,6 +133,7 @@ BIND_SCHEMA = {
         "properties": {
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "purpose": {"type": "string", "description": "'profile' (default) or 'event'"},
             "event_code": {"type": "string", "description": "Event code (when purpose=event)"},
         },
@@ -282,6 +287,7 @@ EVENT_UPDATE_SCHEMA = {
             "code": {"type": "string"},
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "name": {"type": "string"},
             "description": {"type": "string"},
             "og_image": {"type": "string"},
@@ -303,6 +309,7 @@ EVENT_APPROVE_SCHEMA = {
             "code": {"type": "string"},
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "ref": {"type": "string"},
         },
         "required": ["code", "sender_id", "channel", "ref"],
@@ -318,6 +325,7 @@ EVENT_REJECT_SCHEMA = {
             "code": {"type": "string"},
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "ref": {"type": "string"},
         },
         "required": ["code", "sender_id", "channel", "ref"],
@@ -333,6 +341,7 @@ EVENT_ADD_HOST_SCHEMA = {
             "code": {"type": "string"},
             "sender_id": {"type": "string"},
             "channel": {"type": "string"},
+            "chat_id": {"type": "string", "description": "Chat/channel ID for notifications"},
             "ref": {"type": "string"},
         },
         "required": ["code", "sender_id", "channel", "ref"],

package/lib/hermes-plugin/tools.py

@@ -54,9 +54,16 @@ def _sb():
     return _client
 
 
-def _device_id(sender_id: str, channel: str) -> str:
+def _device_id(sender_id: str, channel: str, chat_id: str = None) -> str:
     did = f"{channel}:{sender_id}"
     _my_device_ids.add(did)
+    # Persist chat_id for notifications
+    if chat_id:
+        try:
+            sb = _sb()
+            sb.rpc("upsert_profile", {"p_device_id": did, "p_last_chat_id": chat_id}).execute()
+        except Exception:
+            pass
     return did
 
 
@@ -72,7 +79,7 @@ def _ok(data) -> str:
 
 def handle_scan(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     radius = params.get("radius_m", 500)
 
     # Rate limit
@@ -137,7 +144,7 @@ def handle_scan(params: dict) -> str:
 
 def handle_profile(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     if params["action"] == "get":
         resp = sb.rpc("get_profile", {"p_device_id": did}).execute()
@@ -163,7 +170,7 @@ def handle_profile(params: dict) -> str:
 
 def handle_accept(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     # Resolve ref to device_id
     ref = params.get("ref")
@@ -202,7 +209,7 @@ def handle_accept(params: dict) -> str:
 
 def handle_checkin(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     flat, flng = _fuzzy(params["lat"], params["lng"])
 
     # Check profile exists
@@ -220,7 +227,7 @@ def handle_checkin(params: dict) -> str:
 
 def handle_check_matches(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     resp = sb.rpc("get_my_matches", {"p_device_id": did}).execute()
     all_matches = resp.data or []
@@ -280,7 +287,7 @@ BASE_URL = "https://www.antenna.fyi"
 
 def handle_pass(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     ref = params.get("ref")
     target = params.get("target_device_id")
@@ -307,7 +314,7 @@ def handle_pass(params: dict) -> str:
 
 def handle_discover(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     resp = sb.rpc("global_discover", {"p_device_id": did}).execute()
     results = resp.data or []
@@ -365,7 +372,7 @@ def handle_discover(params: dict) -> str:
 
 def handle_event_create(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     rpc_params = {
         "p_created_by": did,
@@ -403,7 +410,7 @@ def handle_event_create(params: dict) -> str:
 
 def handle_event_join(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     # Profile gate
     prof = sb.rpc("get_profile", {"p_device_id": did}).execute()
@@ -484,10 +491,10 @@ def handle_event_join(params: dict) -> str:
 
 def handle_event_scan(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     resp = sb.rpc("event_participants_list", {
-        "p_code": params["code"],
+        "p_code": params["code"], "p_device_id": did,
     }).execute()
     results = resp.data or []
 
@@ -496,32 +503,40 @@ def handle_event_scan(params: dict) -> str:
     if not others:
         return _ok({"count": 0, "profiles": [], "message": "活动里还没有其他人。"})
 
+    global _last_ref_map
     global _last_ref_map
     _last_ref_map = {}
+    checked_in_count = 0
     profiles = []
     for i, p in enumerate(others):
         ref = str(i + 1)
         _last_ref_map[ref] = p.get("device_id")
+        if p.get("checked_in"):
+            checked_in_count += 1
         profiles.append({
             "ref": ref,
-            "emoji": p.get("emoji") or "\ud83d\udc64",
+            "emoji": p.get("emoji") or "👤",
             "name": p.get("display_name") or "匿名",
             "line1": p.get("line1"),
             "line2": p.get("line2"),
             "line3": p.get("line3"),
+            "checked_in": bool(p.get("checked_in")),
+            "role": p.get("role") or "participant",
+            "status": p.get("status") or "active",
+            "application_context": p.get("application_context"),
             "source": "event",
         })
 
     return _ok({
         "count": len(profiles),
+        "checked_in_count": checked_in_count,
         "profiles": profiles,
         "instruction": "这些是活动参加者。根据你对用户的了解，推荐值得认识的人。使用 ref 编号引用。",
     })
 
-
 def handle_bind(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     purpose = params.get("purpose", "profile")
     event_code = params.get("event_code")
 
@@ -549,7 +564,7 @@ def handle_bind(params: dict) -> str:
 
 def handle_event_end(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     resp = sb.rpc("end_event", {
         "p_code": params["code"],
@@ -576,7 +591,7 @@ def handle_event_upload_image(params: dict) -> str:
 
 def handle_event_checkin(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
 
     lat = params.get("lat")
     lng = params.get("lng")
@@ -596,7 +611,7 @@ def handle_event_checkin(params: dict) -> str:
 
 def handle_event_update(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     resp = sb.rpc("update_event", {
         "p_code": params["code"], "p_device_id": did,
         "p_name": params.get("name"), "p_description": params.get("description"),
@@ -609,7 +624,7 @@ def handle_event_update(params: dict) -> str:
 
 def handle_event_approve(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     resp = sb.rpc("approve_participant", {
         "p_code": params["code"], "p_device_id": did, "p_target_ref": params["ref"],
     }).execute()
@@ -618,7 +633,7 @@ def handle_event_approve(params: dict) -> str:
 
 def handle_event_reject(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     resp = sb.rpc("reject_participant", {
         "p_code": params["code"], "p_device_id": did, "p_target_ref": params["ref"],
     }).execute()
@@ -627,7 +642,7 @@ def handle_event_reject(params: dict) -> str:
 
 def handle_event_add_host(params: dict) -> str:
     sb = _sb()
-    did = _device_id(params["sender_id"], params["channel"])
+    did = _device_id(params["sender_id"], params["channel"], params.get("chat_id"))
     resp = sb.rpc("add_cohost", {
         "p_code": params["code"], "p_device_id": did, "p_target_ref": params["ref"],
     }).execute()

package/package.json

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

package/skill/SKILL.md

@@ -60,6 +60,18 @@ cron 设完后，问用户一句：
 用户说要 → cron 每天调 `antenna_discover` 推送。
 用户说不要 → 只在 scan 没人时 fallback。
 
+**第六步：启动实时通知**
+
+onboarding 完成后，启动 `antenna watch` 后台进程，实时接收匹配通知和活动审批通知：
+```
+antenna watch --id <device_id> &
+```
+这会保持一个 WebSocket 连接，有新匹配或活动审批变更时立即通知。比 cron 更实时。
+
+**Health check:** 每次对话开始时，跑 `antenna status --id <device_id>` 检查 watch 是否在跑。如果显示 "Watch: ❌ not running"，重新启动 `antenna watch --id <device_id> &`。
+
+如果 exec 不支持后台进程，cron 是 fallback。
+
 ## When to use
 
 - **首次安装后**: 主动开始 onboarding（名片 → 位置）