@lawrenceliang-btc/atel-sdk 1.1.2 → 1.1.4

package/bin/atel.mjs

@@ -86,6 +86,7 @@ const NETWORK_FILE = resolve(ATEL_DIR, 'network.json');
 const TRACES_DIR = resolve(ATEL_DIR, 'traces');
 const PENDING_FILE = resolve(ATEL_DIR, 'pending-tasks.json');
 const RESULT_PUSH_QUEUE_FILE = resolve(ATEL_DIR, 'pending-result-pushes.json');
+const NOTIFY_TARGETS_FILE = resolve(ATEL_DIR, 'notify-targets.json');
 const KEYS_DIR = resolve(ATEL_DIR, 'keys');
 const ANCHOR_FILE = resolve(KEYS_DIR, 'anchor.json');
 
@@ -95,6 +96,144 @@ const DEFAULT_POLICY = { rateLimit: 60, maxPayloadBytes: 1048576, maxConcurrent:
 
 function ensureDir() { if (!existsSync(ATEL_DIR)) mkdirSync(ATEL_DIR, { recursive: true }); }
 
+// ═══════════════════════════════════════════════════════════════════
+// Notification Target System — auto-discover gateway, manage targets
+// ═══════════════════════════════════════════════════════════════════
+
+function loadNotifyTargets() {
+  try { return JSON.parse(readFileSync(NOTIFY_TARGETS_FILE, 'utf-8')); }
+  catch { return { version: 1, defaultChannel: 'telegram', targets: [] }; }
+}
+
+function saveNotifyTargets(data) {
+  ensureDir();
+  writeFileSync(NOTIFY_TARGETS_FILE, JSON.stringify(data, null, 2));
+}
+
+// Auto-detect current TG chat from OpenClaw session state
+function discoverTelegramChat() {
+  const sessionPaths = [
+    join(process.env.HOME || '', '.openclaw/agents/main/sessions/sessions.json'),
+    join(process.env.HOME || '', '.openclaw/sessions/sessions.json'),
+  ];
+  for (const p of sessionPaths) {
+    try {
+      const data = JSON.parse(readFileSync(p, 'utf-8'));
+      // sessions.json can be { "agent:main:main": { lastChannel, lastTo, ... } } or flat
+      const entries = typeof data === 'object' ? Object.values(data) : [];
+      for (const session of entries) {
+        if (session?.lastChannel === 'telegram' && typeof session?.lastTo === 'string' && session.lastTo.startsWith('telegram:')) {
+          return session.lastTo.split(':', 2)[1]; // "telegram:123456" → "123456"
+        }
+      }
+      // Also check top-level
+      if (data?.lastChannel === 'telegram' && typeof data?.lastTo === 'string' && data.lastTo.startsWith('telegram:')) {
+        return data.lastTo.split(':', 2)[1];
+      }
+    } catch {}
+  }
+  return null;
+}
+
+// Auto-bind TG notification target if not already bound
+function autoBindNotifications() {
+  const targets = loadNotifyTargets();
+  if (targets.targets.length > 0) return; // already has targets
+
+  const chatId = discoverTelegramChat();
+  if (!chatId) return;
+
+  const botToken = discoverTelegramBot();
+  const id = `tg_${chatId}`;
+  targets.targets.push({
+    id, channel: 'telegram', target: chatId,
+    botToken: botToken || undefined,
+    label: 'owner', enabled: true,
+    createdAt: new Date().toISOString(), lastUsedAt: null,
+  });
+  saveNotifyTargets(targets);
+  console.log(`🔔 Auto-bound TG notifications to chat ${chatId}`);
+}
+
+// Auto-discover OpenClaw gateway: read token + find port
+function discoverGateway() {
+  // 1. Env override
+  if (process.env.ATEL_NOTIFY_GATEWAY || process.env.OPENCLAW_GATEWAY_URL) {
+    const url = process.env.ATEL_NOTIFY_GATEWAY || process.env.OPENCLAW_GATEWAY_URL;
+    let token = '';
+    try { token = JSON.parse(readFileSync(join(process.env.HOME || '', '.openclaw/openclaw.json'), 'utf-8')).gateway?.auth?.token || ''; } catch {}
+    return { url, token };
+  }
+  // 2. Read from ~/.openclaw/openclaw.json
+  try {
+    const cfg = JSON.parse(readFileSync(join(process.env.HOME || '', '.openclaw/openclaw.json'), 'utf-8'));
+    const token = cfg.gateway?.auth?.token || '';
+    const port = cfg.gateway?.port || 18789;
+    const bind = cfg.gateway?.bind || '127.0.0.1';
+    return { url: `http://${bind}:${port}`, token };
+  } catch { return null; }
+}
+
+// Read TG bot token from openclaw config
+function discoverTelegramBot() {
+  try {
+    const cfg = JSON.parse(readFileSync(join(process.env.HOME || '', '.openclaw/openclaw.json'), 'utf-8'));
+    const botToken = cfg.channels?.telegram?.botToken;
+    if (!botToken || botToken.includes('${')) return null; // template var, not resolved
+    return botToken;
+  } catch { return null; }
+  // Also check env
+}
+
+// Send notification to all enabled targets (fire-and-forget, never blocks)
+async function pushTradeNotification(eventType, payload, body) {
+  const targets = loadNotifyTargets();
+  const enabled = (targets.targets || []).filter(t => t.enabled !== false);
+  if (enabled.length === 0) return;
+
+  const templates = {
+    'order_accepted': (p) => `📋 订单已被接单\n订单: ${p.orderId || body?.orderId || '?'}\n执行方已开始处理，进入里程碑阶段`,
+    'milestone_submitted': (p) => `📝 里程碑 M${p.milestoneIndex ?? '?'} 已提交\n订单: ${p.orderId || body?.orderId || '?'}\n等待审核`,
+    'milestone_verified': (p) => `✅ 里程碑 M${p.milestoneIndex ?? '?'} 审核通过\n订单: ${p.orderId || body?.orderId || '?'}`,
+    'milestone_rejected': (p) => `❌ 里程碑 M${p.milestoneIndex ?? '?'} 被拒绝\n订单: ${p.orderId || body?.orderId || '?'}\n原因: ${p.rejectReason || '未说明'}`,
+    'order_settled': (p) => `💰 订单已结算完成\n订单: ${p.orderId || body?.orderId || '?'}\nUSDC 已支付`,
+  };
+  const tmpl = templates[eventType];
+  if (!tmpl) return;
+  const message = tmpl(payload);
+
+  for (const target of enabled) {
+    try {
+      if (target.channel === 'telegram' && target.botToken) {
+        // Direct TG Bot API — no gateway needed
+        await fetch(`https://api.telegram.org/bot${target.botToken}/sendMessage`, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ chat_id: target.target, text: message, parse_mode: 'HTML' }),
+          signal: AbortSignal.timeout(5000),
+        }).catch(() => {});
+      } else if (target.channel === 'gateway') {
+        // OpenClaw gateway
+        const gw = discoverGateway();
+        if (gw?.url && gw?.token) {
+          await fetch(`${gw.url}/tools/invoke`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${gw.token}` },
+            body: JSON.stringify({ tool: 'message', args: { action: 'send', message, target: target.target } }),
+            signal: AbortSignal.timeout(5000),
+          }).catch(() => {});
+        }
+      }
+      // Update lastUsedAt
+      target.lastUsedAt = new Date().toISOString();
+    } catch (e) {
+      // Never block main flow
+    }
+  }
+  // Best-effort save lastUsedAt
+  try { saveNotifyTargets(targets); } catch {}
+}
+
 // ═══════════════════════════════════════════════════════════════════
 // CLI UX Improvements - Helper Functions
 // ═══════════════════════════════════════════════════════════════════
@@ -2241,29 +2380,10 @@ async function cmdStart(port) {
       }
     }
 
-    // 3.5. Trade event → push status summary to user via NOTIFY_GATEWAY (TG etc.)
-    // This runs BEFORE the hook so user sees status even if hook is slow/fails.
-    const tradeNotifyEvents = {
-      'order_accepted': (p) => `📋 订单已被接单\n订单: ${p.orderId || body.orderId}\nExecutor 开始工作，进入里程碑流程`,
-      'milestone_submitted': (p) => `📝 里程碑 M${p.milestoneIndex ?? '?'} 已提交\n订单: ${p.orderId || body.orderId}\n等待审核`,
-      'milestone_verified': (p) => `✅ 里程碑 M${p.milestoneIndex ?? '?'} 审核通过\n订单: ${p.orderId || body.orderId}`,
-      'milestone_rejected': (p) => `❌ 里程碑 M${p.milestoneIndex ?? '?'} 被拒绝\n订单: ${p.orderId || body.orderId}\n原因: ${p.rejectReason || '未说明'}`,
-      'order_settled': (p) => `💰 订单已结算完成\n订单: ${p.orderId || body.orderId}\nUSDC 已支付`,
-    };
-    if (ATEL_NOTIFY_GATEWAY && ATEL_NOTIFY_TARGET && tradeNotifyEvents[event]) {
-      try {
-        const summaryMsg = tradeNotifyEvents[event](payload);
-        const token = (() => { try { return JSON.parse(readFileSync(join(process.env.HOME || '', '.openclaw/openclaw.json'), 'utf-8')).gateway?.auth?.token || ''; } catch { return ''; } })();
-        if (token) {
-          fetch(`${ATEL_NOTIFY_GATEWAY}/tools/invoke`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
-            body: JSON.stringify({ tool: 'message', args: { action: 'send', message: summaryMsg, target: ATEL_NOTIFY_TARGET } }),
-            signal: AbortSignal.timeout(5000),
-          }).then(() => log({ event: 'trade_notify_user_sent', eventType: event })).catch(e => log({ event: 'trade_notify_user_failed', eventType: event, error: e.message }));
-        }
-      } catch (e) { log({ event: 'trade_notify_user_error', eventType: event, error: e.message }); }
-    }
+    // 3.5. Trade event → push status summary to user via notify targets (TG etc.)
+    // Runs BEFORE the hook so user sees status even if hook is slow/fails.
+    // Uses .atel/notify-targets.json — auto-discovered, no manual config needed.
+    pushTradeNotification(event, payload, body).catch(e => log({ event: 'trade_notify_error', error: e.message }));
 
     // 4. Agent command hook: forward notification to agent's AI
     // Skip order_created — accepting orders requires human confirmation
@@ -3131,6 +3251,9 @@ async function cmdStart(port) {
 
   await endpoint.start();
 
+  // Auto-bind TG notifications on first start
+  try { autoBindNotifications(); } catch (e) { /* never block startup */ }
+
   // Background retry for failed result pushes (durable queue)
   const flushResultPushQueue = async () => {
     if (!resultPushQueue.length) return;
@@ -6467,6 +6590,151 @@ const commands = {
     }
     return cmdSend({ _: args, json: rawArgs.includes('--json') });
   },
+  // Notification Management
+  notify: async () => {
+    const subCmd = args[0];
+    if (!subCmd || subCmd === 'help' || subCmd === '--help') {
+      console.log('Usage: atel notify <status|bind|add|remove|enable|disable|test>');
+      console.log('  status                          Show current notification targets');
+      console.log('  bind <chatId> [--bot-token T]   Bind TG chat as notification target');
+      console.log('  add telegram <chatId> [--label name] [--bot-token T]  Add a target');
+      console.log('  remove <id>                     Remove a target');
+      console.log('  enable <id>                     Enable a target');
+      console.log('  disable <id>                    Disable a target (mute)');
+      console.log('  test                            Send test notification to all targets');
+      process.exit(0);
+    }
+    const targets = loadNotifyTargets();
+
+    if (subCmd === 'status') {
+      const gw = discoverGateway();
+      console.log('Gateway:', gw ? `${gw.url} (token: ${gw.token ? '✅' : '❌'})` : '❌ not found');
+      const botToken = discoverTelegramBot();
+      console.log('TG Bot:', botToken ? `✅ (${botToken.split(':')[0]})` : '❌ not configured');
+      console.log(`\nTargets (${targets.targets.length}):`);
+      if (targets.targets.length === 0) {
+        console.log('  (none) — use "atel notify bind <chatId>" to add');
+      }
+      for (const t of targets.targets) {
+        const status = t.enabled !== false ? '✅' : '🔇';
+        console.log(`  ${status} [${t.id}] ${t.channel}:${t.target} label=${t.label || '-'} last=${t.lastUsedAt || 'never'}`);
+      }
+      return;
+    }
+
+    if (subCmd === 'bind') {
+      let chatId = args[1];
+      // Auto-detect from OpenClaw session if not provided
+      if (!chatId) {
+        chatId = discoverTelegramChat();
+        if (chatId) {
+          console.log(`🔍 Auto-detected TG chat: ${chatId}`);
+        } else {
+          console.error('Could not auto-detect TG chat. Usage: atel notify bind <chatId> [--bot-token TOKEN]');
+          process.exit(1);
+        }
+      }
+      // Get bot token: --bot-token flag > env > openclaw config
+      let botToken = rawArgs.includes('--bot-token') ? rawArgs[rawArgs.indexOf('--bot-token') + 1] : '';
+      if (!botToken) botToken = process.env.TELEGRAM_BOT_TOKEN || '';
+      if (!botToken) botToken = discoverTelegramBot() || '';
+      const id = `tg_${chatId}`;
+      // Remove existing with same id
+      targets.targets = targets.targets.filter(t => t.id !== id);
+      targets.targets.push({
+        id, channel: 'telegram', target: String(chatId),
+        botToken: botToken || undefined,
+        label: 'owner', enabled: true,
+        createdAt: new Date().toISOString(), lastUsedAt: null,
+      });
+      saveNotifyTargets(targets);
+      console.log(`✅ Bound TG chat ${chatId} as notification target (id: ${id})`);
+      if (!botToken) console.log('⚠️  No bot token found. Set TELEGRAM_BOT_TOKEN or use --bot-token');
+      return;
+    }
+
+    if (subCmd === 'add') {
+      const channel = args[1]; const target = args[2];
+      if (!channel || !target) { console.error('Usage: atel notify add telegram <chatId> [--label name] [--bot-token T]'); process.exit(1); }
+      let label = '';
+      if (rawArgs.includes('--label')) label = rawArgs[rawArgs.indexOf('--label') + 1] || '';
+      let botToken = rawArgs.includes('--bot-token') ? rawArgs[rawArgs.indexOf('--bot-token') + 1] : '';
+      if (!botToken && channel === 'telegram') botToken = process.env.TELEGRAM_BOT_TOKEN || discoverTelegramBot() || '';
+      const id = `${channel.substring(0,2)}_${target}`;
+      targets.targets = targets.targets.filter(t => t.id !== id);
+      targets.targets.push({
+        id, channel, target: String(target),
+        botToken: (channel === 'telegram' && botToken) ? botToken : undefined,
+        label: label || '', enabled: true,
+        createdAt: new Date().toISOString(), lastUsedAt: null,
+      });
+      saveNotifyTargets(targets);
+      console.log(`✅ Added ${channel}:${target} (id: ${id})`);
+      return;
+    }
+
+    if (subCmd === 'remove') {
+      const id = args[1];
+      if (!id) { console.error('Usage: atel notify remove <id>'); process.exit(1); }
+      const before = targets.targets.length;
+      targets.targets = targets.targets.filter(t => t.id !== id);
+      saveNotifyTargets(targets);
+      console.log(targets.targets.length < before ? `✅ Removed ${id}` : `⚠️ Target ${id} not found`);
+      return;
+    }
+
+    if (subCmd === 'enable' || subCmd === 'disable') {
+      const id = args[1];
+      if (!id) { console.error(`Usage: atel notify ${subCmd} <id>`); process.exit(1); }
+      const t = targets.targets.find(t => t.id === id);
+      if (!t) { console.error(`Target ${id} not found`); process.exit(1); }
+      t.enabled = subCmd === 'enable';
+      saveNotifyTargets(targets);
+      console.log(`✅ ${id} ${subCmd}d`);
+      return;
+    }
+
+    if (subCmd === 'test') {
+      console.log('Sending test notification to all enabled targets...');
+      const enabled = targets.targets.filter(t => t.enabled !== false);
+      if (enabled.length === 0) { console.log('No enabled targets. Use "atel notify bind <chatId>" first.'); return; }
+      for (const target of enabled) {
+        try {
+          if (target.channel === 'telegram' && target.botToken) {
+            const resp = await fetch(`https://api.telegram.org/bot${target.botToken}/sendMessage`, {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ chat_id: target.target, text: '🔔 ATEL 通知测试\n如果你看到这条消息，说明通知已正确配置！' }),
+              signal: AbortSignal.timeout(10000),
+            });
+            const data = await resp.json();
+            console.log(`  ${target.id}: ${data.ok ? '✅ sent' : '❌ ' + (data.description || 'failed')}`);
+          } else if (target.channel === 'gateway') {
+            const gw = discoverGateway();
+            if (gw?.url && gw?.token) {
+              const resp = await fetch(`${gw.url}/tools/invoke`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${gw.token}` },
+                body: JSON.stringify({ tool: 'message', args: { action: 'send', message: '🔔 ATEL notification test', target: target.target } }),
+                signal: AbortSignal.timeout(10000),
+              });
+              console.log(`  ${target.id}: ${resp.ok ? '✅ sent' : '❌ status ' + resp.status}`);
+            } else {
+              console.log(`  ${target.id}: ❌ gateway not found`);
+            }
+          } else {
+            console.log(`  ${target.id}: ❌ unsupported channel ${target.channel}`);
+          }
+        } catch (e) {
+          console.log(`  ${target.id}: ❌ ${e.message}`);
+        }
+      }
+      return;
+    }
+
+    console.error('Unknown subcommand. Use: atel notify help');
+    process.exit(1);
+  },
   // Alias System
   alias: () => {
     const subCmd = args[0];
@@ -6596,6 +6864,15 @@ Alias Commands:
   alias list [--json]                  List all aliases
   alias remove <alias>                 Remove an alias
 
+Notification Commands:
+  notify status                        Show notification targets and gateway status
+  notify bind <chatId> [--bot-token T] Bind TG chat as default notification target
+  notify add telegram <chatId>         Add a notification target [--label name] [--bot-token T]
+  notify remove <id>                   Remove a notification target
+  notify enable <id>                   Enable a muted target
+  notify disable <id>                  Mute a target (keep but don't send)
+  notify test                          Send test notification to all enabled targets
+
 Environment:
   ATEL_DIR                Identity directory (default: .atel)
   ATEL_REGISTRY           Registry URL (default: https://api.atelai.org)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lawrenceliang-btc/atel-sdk",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "ATEL Protocol SDK - Agent Trust & Exchange Layer",
   "repository": {
     "type": "git",

package/skill/atel-agent/SKILL.md

@@ -64,6 +64,36 @@ pm2 save 2>/dev/null || true
 
 echo "⏳ Waiting for wallet (15s)..."
 sleep 15
+
+# 自动绑定当前 TG 会话为通知目标
+SESSION_FILE="$HOME/.openclaw/agents/main/sessions/sessions.json"
+CHAT_ID=""
+if [ -f "$SESSION_FILE" ]; then
+  CHAT_ID=$(python3 - <<'PY'
+import json, os
+p=os.path.expanduser("~/.openclaw/agents/main/sessions/sessions.json")
+try:
+    data=json.load(open(p))
+    for v in (data.values() if isinstance(data,dict) else [data]):
+        if isinstance(v,dict) and v.get("lastChannel")=="telegram":
+            lt=v.get("lastTo","")
+            if lt.startswith("telegram:"):
+                print(lt.split(":",1)[1])
+                break
+except:
+    pass
+PY
+)
+fi
+
+if [ -n "$CHAT_ID" ]; then
+  echo "🔔 Binding notifications to current Telegram chat: $CHAT_ID"
+  cd "$WORKSPACE" && atel notify bind "$CHAT_ID" 2>/dev/null || true
+  cd "$WORKSPACE" && atel notify test 2>/dev/null || true
+else
+  echo "⚠️ Could not auto-detect Telegram chat. Run: atel notify bind <chat_id>"
+fi
+
 echo "========================================="
 echo "🤝 ATEL Agent Ready!"
 cd "$WORKSPACE" && ATEL_PLATFORM=https://api.atelai.org atel info 2>&1 | head -6 || true
@@ -341,6 +371,20 @@ atel approve <taskId>         # 批准任务
 - `order status must be created` → 订单已被接，不用重复操作
 - `session file locked` → 等 30 秒再试
 
+## 通知管理
+
+订单状态推送由 SDK 自动完成，你不需要手动给用户发重复的状态摘要。
+
+```bash
+atel notify status                     # 查看当前通知配置
+atel notify bind <chatId>              # 绑定 TG 聊天
+atel notify add telegram <chatId>      # 添加通知目标
+atel notify remove <id>                # 删除目标
+atel notify disable <id>               # 临时静默
+atel notify enable <id>                # 恢复通知
+atel notify test                       # 发送测试通知
+```
+
 ## 重要规则
 
 1. **所有 atel 命令必须在 ~/atel-workspace 目录执行**
@@ -350,3 +394,5 @@ atel approve <taskId>         # 批准任务
 5. 里程碑按顺序完成：0 → 1 → 2 → 3 → 4
 6. 命令失败等几秒重试
 7. 环境变量用 `ATEL_PLATFORM`（不是 `ATEL_API`）
+8. **订单状态推送由 SDK 自动做，你不需要重复给用户发状态摘要**。只在需要解释、追问、异常处理时主动回复用户
+9. **setup 成功后，必须尝试自动绑定当前 TG 会话**（`atel notify bind`）。绑定成功告诉用户"通知已启用"；失败了再提示用户手动补绑

package/skill/atel-agent/setup.sh

@@ -84,6 +84,35 @@ echo "========================================="
 echo "🤝 ATEL Agent Ready!"
 echo "========================================="
 cd "$WORKSPACE" && ATEL_PLATFORM=https://api.atelai.org atel info 2>&1 | head -6 || true
+# 自动绑定当前 TG 会话为通知目标
+SESSION_FILE="$HOME/.openclaw/agents/main/sessions/sessions.json"
+CHAT_ID=""
+if [ -f "$SESSION_FILE" ]; then
+  CHAT_ID=$(python3 - <<'PY'
+import json, os
+p=os.path.expanduser("~/.openclaw/agents/main/sessions/sessions.json")
+try:
+    data=json.load(open(p))
+    for v in (data.values() if isinstance(data,dict) else [data]):
+        if isinstance(v,dict) and v.get("lastChannel")=="telegram":
+            lt=v.get("lastTo","")
+            if lt.startswith("telegram:"):
+                print(lt.split(":",1)[1])
+                break
+except:
+    pass
+PY
+)
+fi
+
+if [ -n "$CHAT_ID" ]; then
+  echo "🔔 Binding notifications to current Telegram chat: $CHAT_ID"
+  cd "$WORKSPACE" && atel notify bind "$CHAT_ID" 2>/dev/null || true
+  cd "$WORKSPACE" && atel notify test 2>/dev/null || true
+else
+  echo "⚠️ Could not auto-detect Telegram chat. Run: atel notify bind <chat_id>"
+fi
+
 echo "DID: $DID"
 echo "Port: $PORT"
 echo "pm2: $(pm2 jlist 2>/dev/null | python3 -c "import sys,json; d=json.load(sys.stdin); print(d[0]['pm2_env']['status'] if d else 'unknown')" 2>/dev/null || echo 'check: pm2 status')"