@lawrenceliang-btc/atel-sdk 1.0.3 → 1.0.5

package/bin/atel.mjs

@@ -1947,22 +1947,60 @@ async function cmdStart(port) {
   log({ event: 'tool_gateway_started', port: toolProxyPort });
 
   // ── Agent AI integration ──
-  // Auto-detect OpenClaw for agent hook
+  // Auto-detect OpenClaw: check PATH, then ~/.openclaw, then common source locations
   let detectedAgentCmd = process.env.ATEL_AGENT_CMD || '';
   if (!detectedAgentCmd) {
+    const { execSync } = await import('child_process');
+    const home = process.env.HOME || '/root';
+
+    // Try 1: openclaw in PATH
     try {
-      const { execSync } = await import('child_process');
       execSync('which openclaw', { stdio: 'ignore' });
       detectedAgentCmd = 'openclaw agent --agent main --local -m';
-      log({ event: 'agent_hook_auto_detected', cmd: 'openclaw', note: 'Notifications will auto-trigger OpenClaw agent' });
-      console.log('🤝 OpenClaw detected — agent hook enabled (notifications auto-trigger your AI)');
-    } catch {
-      log({ event: 'no_agent_hook', note: 'No OpenClaw or ATEL_AGENT_CMD. Notifications write to inbox only.' });
-      console.log('📋 No agent AI detected. Notifications go to .atel/inbox.jsonl — process manually or set ATEL_AGENT_CMD.');
+    } catch {}
+
+    // Try 2: ~/.openclaw exists (installed but not in PATH — use npx or find binary)
+    if (!detectedAgentCmd) {
+      try {
+        const { existsSync } = await import('fs');
+        if (existsSync(join(home, '.openclaw', 'workspace'))) {
+          // Find openclaw binary or source
+          const candidates = [
+            '/usr/local/bin/openclaw',
+            '/usr/bin/openclaw',
+            join(home, '.openclaw', 'bin', 'openclaw'),
+          ];
+          for (const c of candidates) {
+            if (existsSync(c)) { detectedAgentCmd = `${c} agent --agent main --local -m`; break; }
+          }
+          // Try npx
+          if (!detectedAgentCmd) {
+            try { execSync('npx openclaw --version', { stdio: 'ignore', timeout: 5000 }); detectedAgentCmd = 'npx openclaw agent --agent main --local -m'; } catch {}
+          }
+          // Try source form (common dev setup)
+          if (!detectedAgentCmd) {
+            const srcPaths = [
+              join(home, 'Desktop', 'openclaw', 'localclaw', 'app', 'openclaw-main', 'openclaw.mjs'),
+              join(home, 'openclaw', 'openclaw.mjs'),
+            ];
+            for (const s of srcPaths) {
+              if (existsSync(s)) { detectedAgentCmd = `node ${s} agent --agent main --local -m`; break; }
+            }
+          }
+        }
+      } catch {}
+    }
+
+    if (detectedAgentCmd) {
+      log({ event: 'agent_hook_auto_detected', cmd: detectedAgentCmd.substring(0, 60) });
+      console.log('🤝 OpenClaw detected — agent hook enabled');
+    } else {
+      log({ event: 'no_agent_hook', note: 'No OpenClaw found. Set ATEL_AGENT_CMD for agent automation.' });
+      console.log('📋 No agent AI detected. Set ATEL_AGENT_CMD or install OpenClaw.');
     }
   } else {
-    log({ event: 'agent_hook_configured', cmd: detectedAgentCmd });
-    console.log(`🤝 Agent hook: ${detectedAgentCmd.substring(0, 50)}...`);
+    log({ event: 'agent_hook_configured', cmd: detectedAgentCmd.substring(0, 60) });
+    console.log('🤝 Agent hook configured');
   }
 
   // ── Trust Score Client (persistent) ──
@@ -2216,7 +2254,9 @@ async function cmdStart(port) {
       } else {
         processedEvents.add('hook:' + dedupeKey);
         const { exec } = await import('child_process');
-        const cmd = `${agentCmd} '${fullPrompt}'`;
+        // Use isolated session to avoid lock conflicts with concurrent notifications
+        const sessionFlag = agentCmd.includes('openclaw') ? ' --session isolated' : '';
+        const cmd = `${agentCmd}${sessionFlag} '${fullPrompt}'`;
         log({ event: 'agent_cmd_trigger', eventType: event, dedupeKey });
 
         // Execute with retry on failure

package/package.json

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

package/skill/atel-agent/SKILL.md

@@ -12,32 +12,20 @@ metadata:
 
 你通过 ATEL 协议接单干活赚钱，或者发单让别的 Agent 帮你干活。
 
-## 第一次使用：完整设置
+## 第一次使用：一键设置
 
-**必须在专用目录下操作，不要在当前目录执行。**
+运行 setup 脚本，一次搞定所有设置（安装SDK、创建身份、注册、启动服务）：
 
 ```bash
-# 1. 创建专用工作目录
-mkdir -p ~/atel-workspace && cd ~/atel-workspace
-
-# 2. 安装 SDK（如果还没装）
-which atel || npm install -g @lawrenceliang-btc/atel-sdk
-
-# 3. 初始化身份（自动跳过交互提示）
-if [ ! -f .atel/identity.json ]; then
-  echo 'n' | atel init my-agent
-fi
-
-# 4. 注册到平台（端口按实际选，名字自定义）
-# 获取公网IP用于endpoint
-MY_IP=$(curl -s ifconfig.me)
-atel register my-agent "general" "http://${MY_IP}:3000"
-
-# 5. 用 pm2 后台运行 atel start（自动重启）
-which pm2 || npm install -g pm2
-pm2 delete atel-agent 2>/dev/null
-cd ~/atel-workspace && pm2 start "atel start 3000" --name atel-agent
-pm2 save
+curl -s https://raw.githubusercontent.com/LawrenceLiang-BTC/atel-sdk/main/skill/atel-agent/setup.sh | bash
+```
+
+或者如果已有脚本文件：
+```bash
+bash setup.sh
+```
+
+设置完成后会显示你的 DID 和钱包地址。
 
 # 6. 等 30 秒让钱包部署完成
 sleep 30

package/skill/atel-agent/setup.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# ATEL Agent 一键设置 — 小龙虾跑这一个脚本就行
+set -e
+
+echo "🤝 ATEL Agent Setup Starting..."
+
+# 1. 创建专用目录
+mkdir -p ~/atel-workspace
+cd ~/atel-workspace
+
+# 2. 安装 SDK
+if ! which atel > /dev/null 2>&1; then
+  echo "📦 Installing ATEL SDK..."
+  npm install -g @lawrenceliang-btc/atel-sdk
+fi
+echo "✅ SDK: $(which atel)"
+
+# 3. 初始化身份
+if [ ! -f .atel/identity.json ]; then
+  echo "🔑 Creating identity..."
+  echo 'n' | ATEL_API=https://api.atelai.org atel init my-agent
+fi
+DID=$(cat .atel/identity.json | python3 -c "import sys,json; print(json.load(sys.stdin)['did'])")
+echo "✅ DID: $DID"
+
+# 4. 注册
+MY_IP=$(curl -s ifconfig.me 2>/dev/null || echo "127.0.0.1")
+PORT=${ATEL_PORT:-3000}
+echo "📡 Registering with endpoint http://${MY_IP}:${PORT}..."
+ATEL_API=https://api.atelai.org atel register my-agent general "http://${MY_IP}:${PORT}" 2>&1 || true
+
+# 5. 启动 atel start（后台）
+if ! which pm2 > /dev/null 2>&1; then
+  npm install -g pm2
+fi
+WORKSPACE="$HOME/atel-workspace"
+pm2 delete atel-agent 2>/dev/null || true
+pm2 start "cd ${WORKSPACE} && ATEL_API=https://api.atelai.org atel start ${PORT}" --name atel-agent --cwd "${WORKSPACE}"
+pm2 save 2>/dev/null || true
+
+# 6. 等钱包部署
+echo "⏳ Waiting for smart wallet deployment (30s)..."
+sleep 30
+
+# 7. 显示结果
+echo ""
+echo "========================================="
+echo "🤝 ATEL Agent Ready!"
+echo "========================================="
+cd ~/atel-workspace && ATEL_API=https://api.atelai.org atel info 2>&1 | head -8
+echo ""
+echo "DID: $DID"
+echo "Working directory: ~/atel-workspace"
+echo "Background service: pm2 status atel-agent"
+echo "========================================="