@a2hmarket/a2hmarket 0.6.5 → 0.6.7

package/openclaw.plugin.json

@@ -6,20 +6,7 @@
   "skills": ["./skills"],
   "configSchema": {
     "type": "object",
-    "properties": {
-      "agentId": { "type": "string", "description": "A2H Market agent ID" },
-      "agentKey": { "type": "string", "description": "A2H Market agent key (HMAC signing)" },
-      "apiUrl": { "type": "string", "description": "A2H Market API base URL" },
-      "mqttUrl": { "type": "string", "description": "MQTT broker URL for A2A messaging" },
-      "tempoPrivateKey": { "type": "string", "description": "Solana private key for Tempo payments" },
-      "notify": {
-        "type": "object",
-        "properties": {
-          "channel": { "type": "string", "description": "Notification channel (feishu, discord, etc.)" },
-          "target": { "type": "string", "description": "Target ID for notifications" }
-        }
-      }
-    },
+    "properties": {},
     "additionalProperties": false
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2hmarket/a2hmarket",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "type": "module",
   "files": [
     "index.ts",

package/scripts/install.mjs

@@ -311,24 +311,12 @@ async function runUpdate() {
   // 3. Backup credentials before uninstall
   logStep(3, "更新插件");
   let savedCreds = null;
-  // Try openclaw.json plugin config first
   try {
-    const cfg = JSON.parse(readFileSync(join(OPENCLAW_DIR, "openclaw.json"), "utf-8"));
-    const entry = cfg?.plugins?.entries?.a2hmarket;
-    if (entry?.agentId && entry?.agentKey) {
-      savedCreds = entry;
-      log(`    ${CHECK} 凭证已备份 (openclaw.json)`);
+    if (existsSync(CREDS_FILE)) {
+      savedCreds = JSON.parse(readFileSync(CREDS_FILE, "utf-8"));
+      log(`    ${CHECK} 凭证已备份`);
     }
   } catch {}
-  // Fallback to credentials file
-  if (!savedCreds) {
-    try {
-      if (existsSync(CREDS_FILE)) {
-        savedCreds = JSON.parse(readFileSync(CREDS_FILE, "utf-8"));
-        log(`    ${CHECK} 凭证已备份 (credentials.json)`);
-      }
-    } catch {}
-  }
   if (!savedCreds) {
     log(`    ${WARN} 未找到凭证备份，更新后可能需要重新安装`);
   }
@@ -344,9 +332,8 @@ async function runUpdate() {
     process.exit(1);
   }
 
-  // Restore credentials to both locations
+  // Restore credentials file
   if (savedCreds) {
-    // Restore credentials file
     mkdirSync(DATA_DIR, { recursive: true });
     const fileData = {
       agent_id: savedCreds.agentId ?? savedCreds.agent_id,
@@ -356,23 +343,6 @@ async function runUpdate() {
     };
     if (savedCreds.notify) fileData.notify = savedCreds.notify;
     writeFileSync(CREDS_FILE, JSON.stringify(fileData, null, 2) + "\n");
-
-    // Restore openclaw.json plugin entry
-    try {
-      const configPath = join(OPENCLAW_DIR, "openclaw.json");
-      const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
-      if (!cfg.plugins) cfg.plugins = {};
-      if (!cfg.plugins.entries) cfg.plugins.entries = {};
-      cfg.plugins.entries.a2hmarket = {
-        enabled: true,
-        agentId: fileData.agent_id,
-        agentKey: fileData.agent_key,
-        apiUrl: fileData.api_url,
-        mqttUrl: fileData.mqtt_url,
-        ...(fileData.notify ? { notify: fileData.notify } : {}),
-      };
-      writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
-    } catch {}
     log(`    ${CHECK} 凭证已恢复`);
   }
 
@@ -523,11 +493,28 @@ async function main() {
     log(`\n${BOLD}A2H Market — OpenClaw Plugin${RESET}\n`);
     log(`  安装:    npx -y ${NPM_SPEC} install`);
     log(`  快速:    npx -y ${NPM_SPEC} install --agent ag_xxx:key`);
+    log(`  静默:    npx -y ${NPM_SPEC} install --agent ag_xxx:key --notify feishu:ou_xxx --yes`);
     log(`  更新:    npx -y ${NPM_SPEC} update`);
     log(`  卸载:    npx -y ${NPM_SPEC} uninstall\n`);
     process.exit(0);
   }
 
+  // Parse flags
+  const autoYes = args.includes("--yes") || args.includes("-y");
+
+  const notifyFlag = args.find((a) => a.startsWith("--notify"));
+  const notifyValue = notifyFlag
+    ? (args[args.indexOf(notifyFlag) + 1] ?? notifyFlag.split("=")[1])
+    : null;
+  let presetNotify = null;
+  if (notifyValue && notifyValue.includes(":")) {
+    const colonIdx = notifyValue.indexOf(":");
+    presetNotify = {
+      channel: notifyValue.slice(0, colonIdx),
+      target: notifyValue.slice(colonIdx + 1),
+    };
+  }
+
   log(`\n${BOLD}🏪 A2H Market — OpenClaw Plugin Installer${RESET}\n`);
 
   // ── Step 1: Check OpenClaw ─────────────────────────────────────
@@ -562,9 +549,12 @@ async function main() {
       const existingId = existing.agent_id ?? existing.agentId ?? "";
       if (existingId) {
         log(`    已有凭证: ${CYAN}${existingId}${RESET}`);
-        const prompt = createPrompt();
-        const reuse = await prompt.ask("使用现有凭证? (Y/n)", "Y");
-        prompt.close();
+        let reuse = "Y";
+        if (!autoYes) {
+          const prompt = createPrompt();
+          reuse = await prompt.ask("使用现有凭证? (Y/n)", "Y");
+          prompt.close();
+        }
         if (reuse.toLowerCase() !== "n") {
           agentId = existingId;
           agentKey = existing.agent_key ?? existing.agentKey ?? "";
@@ -718,84 +708,77 @@ async function main() {
     mqtt_url: mqttUrl,
   };
 
-  // Detect available channels and let user choose
-  const channels = detectChannels();
-  if (channels.length > 0) {
-    log(`    检测到 ${channels.length} 个可用渠道:`);
-    channels.forEach((ch, i) => {
-      log(`      ${CYAN}${i + 1}${RESET}. ${ch.name}`);
-    });
-
-    const prompt2 = createPrompt();
-    const choice = await prompt2.ask(
-      `选择通知渠道 (1-${channels.length}，回车跳过)`,
-      "",
-    );
+  // Configure notification channel
+  if (presetNotify) {
+    credsData.notify = presetNotify;
+    log(`    ${CHECK} 通知渠道: ${presetNotify.channel} → ${presetNotify.target}`);
+  } else if (!autoYes) {
+    const channels = detectChannels();
+    if (channels.length > 0) {
+      log(`    检测到 ${channels.length} 个可用渠道:`);
+      channels.forEach((ch, i) => {
+        log(`      ${CYAN}${i + 1}${RESET}. ${ch.name}`);
+      });
 
-    if (choice) {
-      const idx = parseInt(choice, 10) - 1;
-      if (idx >= 0 && idx < channels.length) {
-        const chosen = channels[idx];
-        let target = "";
+      const prompt2 = createPrompt();
+      const choice = await prompt2.ask(
+        `选择通知渠道 (1-${channels.length}，回车跳过)`,
+        "",
+      );
+
+      if (choice) {
+        const idx = parseInt(choice, 10) - 1;
+        if (idx >= 0 && idx < channels.length) {
+          const chosen = channels[idx];
+          let target = "";
+
+          if (chosen.name === "feishu") {
+            target = detectFeishuTarget() || "";
+            if (target) {
+              log(`    检测到飞书用户: ${CYAN}${target}${RESET}`);
+            } else {
+              target = await prompt2.ask("输入飞书 open_id (ou_xxx) 或 chat_id (oc_xxx)", "");
+            }
+          } else if (chosen.name === "discord") {
+            target = await prompt2.ask("输入 Discord 频道 ID", "");
+          } else {
+            target = await prompt2.ask(`输入 ${chosen.name} 目标 ID`, "");
+          }
 
-        if (chosen.name === "feishu") {
-          target = detectFeishuTarget() || "";
           if (target) {
-            log(`    检测到飞书用户: ${CYAN}${target}${RESET}`);
+            credsData.notify = { channel: chosen.name, target };
+            log(`    ${CHECK} 通知渠道已配置: ${chosen.name} → ${target}`);
           } else {
-            target = await prompt2.ask("输入飞书 open_id (ou_xxx) 或 chat_id (oc_xxx)", "");
+            log(`    ${WARN} 未输入目标 ID，跳过通知配置`);
           }
-        } else if (chosen.name === "discord") {
-          target = await prompt2.ask("输入 Discord 频道 ID", "");
-        } else {
-          target = await prompt2.ask(`输入 ${chosen.name} 目标 ID`, "");
-        }
-
-        if (target) {
-          credsData.notify = { channel: chosen.name, target };
-          log(`    ${CHECK} 通知渠道已配置: ${chosen.name} → ${target}`);
-        } else {
-          log(`    ${WARN} 未输入目标 ID，跳过通知配置`);
         }
+      } else {
+        log(`    ${DIM}跳过通知配置${RESET}`);
       }
+      prompt2.close();
     } else {
-      log(`    ${DIM}跳过通知配置${RESET}`);
+      log(`    ${DIM}未检测到可用渠道，跳过通知配置${RESET}`);
     }
-    prompt2.close();
   } else {
-    log(`    ${DIM}未检测到可用渠道，跳过通知配置${RESET}`);
+    // --yes without --notify: try auto-detect feishu
+    const feishuTarget = detectFeishuTarget();
+    if (feishuTarget) {
+      credsData.notify = { channel: "feishu", target: feishuTarget };
+      log(`    ${CHECK} 自动检测通知: feishu → ${feishuTarget}`);
+    } else {
+      log(`    ${DIM}跳过通知配置（使用 --notify 指定）${RESET}`);
+    }
   }
 
-  // Save credentials file (fallback for dev mode)
+  // Save credentials to ~/.openclaw/a2hmarket/credentials.json
   writeFileSync(CREDS_FILE, JSON.stringify(credsData, null, 2) + "\n");
-  log(`    ${CHECK} 凭证文件已保存`);
+  log(`    ${CHECK} 凭证已保存`);
 
-  // Write credentials into openclaw.json → plugins.entries.a2hmarket
-  // This is the primary config path — api.pluginConfig reads from here
-  log(`    写入 openclaw.json...`);
+  // Ensure a2h tools in alsoAllow (if whitelist mode is active)
   try {
     const configPath = join(OPENCLAW_DIR, "openclaw.json");
     const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
-
-    // Ensure plugins.entries.a2hmarket exists
-    if (!cfg.plugins) cfg.plugins = {};
-    if (!cfg.plugins.entries) cfg.plugins.entries = {};
-    const entry = cfg.plugins.entries.a2hmarket ?? {};
-
-    // Write credentials into plugin entry
-    entry.enabled = true;
-    entry.agentId = agentId;
-    entry.agentKey = agentKey;
-    entry.apiUrl = apiUrl;
-    entry.mqttUrl = mqttUrl;
-    if (credsData.notify) {
-      entry.notify = credsData.notify;
-    }
-    cfg.plugins.entries.a2hmarket = entry;
-
-    // Ensure a2h tools in alsoAllow (if whitelist mode is active)
-    if (!cfg.tools) cfg.tools = {};
-    if (Array.isArray(cfg.tools.alsoAllow)) {
+    if (Array.isArray(cfg?.tools?.alsoAllow)) {
       const a2hTools = [
         "a2h_status", "a2h_profile_get", "a2h_profile_upload_qrcode",
         "a2h_profile_delete_qrcode", "a2h_file_upload",
@@ -814,15 +797,24 @@ async function main() {
           added++;
         }
       }
-      if (added > 0) log(`    ${CHECK} ${added} 个工具已添加到白名单`);
+      if (added > 0) {
+        writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+        log(`    ${CHECK} ${added} 个工具已添加到白名单`);
+      }
     }
+  } catch {}
 
-    writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
-    log(`    ${CHECK} openclaw.json 已更新`);
-  } catch (err) {
-    log(`    ${WARN} openclaw.json 写入失败: ${err.message}`);
-    log(`    ${DIM}插件将使用凭证文件作为回退${RESET}`);
-  }
+  // Clean any stale credentials from plugins.entries (OpenClaw doesn't allow custom keys there)
+  try {
+    const configPath = join(OPENCLAW_DIR, "openclaw.json");
+    const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
+    const entry = cfg?.plugins?.entries?.a2hmarket;
+    if (entry && (entry.agentId || entry.agentKey)) {
+      cfg.plugins.entries.a2hmarket = { enabled: true };
+      writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+      log(`    ${CHECK} 清理 openclaw.json 中的旧凭证`);
+    }
+  } catch {}
 
   // ── Step 5: Restart gateway ────────────────────────────────────
   logStep(5, "启动服务");

package/skills/a2hmarket-setup/SKILL.md

@@ -0,0 +1,143 @@
+---
+name: a2hmarket-setup
+description: "安装、更新或卸载 A2H Market 插件。触发词：安装a2hmarket、装a2hmarket、setup a2h、卸载a2hmarket、更新a2hmarket、a2h market 安装。当用户要求安装/卸载/更新 a2hmarket 插件时触发。"
+---
+
+# A2H Market 安装引导
+
+本 Skill 指导你帮用户在 OpenClaw 上安装、更新或卸载 A2H Market 插件。
+
+## 判断用户意图
+
+| 用户说的 | 执行 |
+|---------|------|
+| 装/安装/setup a2hmarket | → 全新安装流程 |
+| 更新/升级 a2hmarket | → 更新流程 |
+| 卸载/删除 a2hmarket | → 卸载流程 |
+
+---
+
+## 全新安装流程
+
+### 第一步：清理旧版本
+
+A2H Market 有两个历史版本需要清理：
+
+**1. 旧版 a2hmarket skill（独立 skill 形态）**
+
+检查是否存在：
+```bash
+ls ~/.openclaw/skills/a2hmarket 2>/dev/null
+```
+
+如果存在，删除：
+```bash
+rm -rf ~/.openclaw/skills/a2hmarket
+```
+
+**2. 旧版 a2hmarket-cli（Go 二进制）**
+
+检查是否存在：
+```bash
+which a2hmarket-cli 2>/dev/null
+```
+
+如果存在，删除：
+```bash
+rm -f $(which a2hmarket-cli)
+```
+
+清理旧版配置目录（凭证会迁移到新位置）：
+```bash
+# 不要删除 ~/.a2hmarket/credentials.json —— 安装脚本会自动迁移
+ls ~/.a2hmarket/ 2>/dev/null
+```
+
+### 第二步：获取凭证
+
+用户需要一个 A2H Market 的 agentId 和 agentKey。有两种情况：
+
+**情况 A：用户已有凭证**
+- 用户直接提供 `ag_xxx:key` 格式的凭证
+- 或者旧版 `~/.a2hmarket/credentials.json` 中有凭证可以复用
+
+检查旧凭证：
+```bash
+cat ~/.a2hmarket/credentials.json 2>/dev/null
+```
+
+如果有，提取 `agent_id` 和 `agent_key`（或 `secret`），拼成 `agent_id:agent_key` 格式。
+
+**情况 B：用户没有凭证**
+- 需要浏览器授权流程
+- 这种情况不适合非交互安装，告诉用户在终端手动执行：
+  ```bash
+  npx -y @a2hmarket/a2hmarket install
+  ```
+- 安装脚本会生成授权链接，用户在浏览器中授权后自动完成
+
+### 第三步：检测通知渠道
+
+从当前对话的 session 上下文判断用户使用的渠道：
+
+- 如果用户在**飞书**对话 → 通知渠道是 `feishu`，target 是用户的 `ou_xxx` open_id
+- 如果用户在**Discord**对话 → 通知渠道是 `discord`，target 是频道 ID
+- 如果用户在**webchat**对话 → 可以跳过通知配置
+
+你可以用以下命令获取飞书 target：
+```bash
+openclaw gateway call status --json 2>/dev/null | grep -o "ou_[a-f0-9]*" | head -1
+```
+
+### 第四步：执行安装
+
+拼装非交互安装命令并执行：
+
+```bash
+npx -y @a2hmarket/a2hmarket install --agent {agentId}:{agentKey} --notify {channel}:{target} --yes
+```
+
+示例：
+```bash
+npx -y @a2hmarket/a2hmarket install --agent ag_t6PowP7DhseW8oBl:abc123secret --notify feishu:ou_9adf14b0f07ab565 --yes
+```
+
+如果不需要通知渠道：
+```bash
+npx -y @a2hmarket/a2hmarket install --agent ag_t6PowP7DhseW8oBl:abc123secret --yes
+```
+
+### 第五步：验证
+
+安装完成后验证插件状态：
+```bash
+openclaw plugins info a2hmarket
+```
+
+应该看到 `Status: loaded` 和工具列表。
+
+然后用 `a2h_status` 工具测试连接。
+
+### 第六步：引导用户
+
+安装成功后，参考 [onboarding.md](references/playbooks/onboarding.md) 向用户介绍三个核心能力并引导进入场景。
+
+---
+
+## 更新流程
+
+```bash
+npx -y @a2hmarket/a2hmarket update
+```
+
+这会自动：备份凭证 → 卸载旧版 → 安装新版 → 恢复凭证 → 重启 gateway。
+
+---
+
+## 卸载流程
+
+```bash
+npx -y @a2hmarket/a2hmarket uninstall
+```
+
+需要用户确认。卸载会删除插件和数据目录。