@a2hmarket/a2hmarket 1.0.9 → 1.0.11

package/index.ts

@@ -70,7 +70,7 @@ export default {
       registerAddressTools(api, apiClient);
       registerDiscussionTools(api, apiClient);
       // registerPaymentTools(api, apiClient);
-      registerTempoPaymentTools(api, apiClient, creds);
+      // registerTempoPaymentTools(api, apiClient, creds);  // Tempo 内测中，暂不注册
       registerInboxHistoryTool(api, apiClient);
       registerApprovalTools(api);
     }
@@ -86,7 +86,7 @@ export default {
       if (Array.isArray(alsoAllow)) {
         const a2hTools = [
           "a2h_status", "a2h_profile_get", "a2h_profile_upload_qrcode",
-          "a2h_profile_delete_qrcode", "a2h_file_upload",
+          "a2h_profile_delete_qrcode", "a2h_profile_set_default_payment", "a2h_file_upload",
           "a2h_works_search", "a2h_works_list", "a2h_works_publish",
           "a2h_works_update", "a2h_works_delete",
           "a2h_order_create", "a2h_order_action", "a2h_order_get", "a2h_order_list",
@@ -94,7 +94,8 @@ export default {
           "a2h_address_list", "a2h_address_create", "a2h_address_delete", "a2h_address_set_default",
           "a2h_discussion_publish", "a2h_discussion_reply", "a2h_discussion_list",
           "a2h_create_approval", "a2h_approval_response", "a2h_approval_list",
-          "a2h_tempo_balance", "a2h_tempo_checkout", "a2h_tempo_transfer", "a2h_tempo_confirm",
+          // Tempo 内测中，暂不加入 allowlist
+          // "a2h_tempo_balance", "a2h_tempo_checkout", "a2h_tempo_transfer", "a2h_tempo_confirm",
         ];
         const missing = a2hTools.filter((t) => !alsoAllow.includes(t));
         if (missing.length > 0) {
@@ -169,6 +170,7 @@ export default {
     });
 
     // ── Register agent service ───────────────────────────────────
+    let serviceAbort: AbortController | null = null;
     api.registerService({
       id: "a2hmarket-agent",
       start: async (ctx) => {
@@ -195,11 +197,11 @@ export default {
           warn: (m: string) => ctx.logger.warn(`[a2hmarket] ${m}`),
         };
 
+        serviceAbort = new AbortController();
         try {
-          const abort = new AbortController();
           await startAgentService({
             cfg: ctx.config,
-            abortSignal: abort.signal,
+            abortSignal: serviceAbort.signal,
             log: serviceLog,
           });
         } catch (err) {
@@ -208,6 +210,9 @@ export default {
           );
         }
       },
+      stop: async () => {
+        serviceAbort?.abort();
+      },
     });
   },
 };

package/openclaw.plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "a2hmarket",
   "name": "A2H Market",
-  "description": "A2H Market — AI agent marketplace with self-managed A2A messaging via MQTT.",
-  "version": "1.0.9",
+  "description": "A2H Market \u2014 AI agent marketplace with self-managed A2A messaging via MQTT.",
+  "version": "1.0.11",
   "hosts": [
     "openclaw"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2hmarket/a2hmarket",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "type": "module",
   "files": [
     "index.ts",
@@ -9,7 +9,7 @@
     "skills/",
     "src/"
   ],
-  "description": "A2H Market OpenClaw plugin — AI agent marketplace with A2A messaging via MQTT.",
+  "description": "A2H Market OpenClaw plugin \u2014 AI agent marketplace with A2A messaging via MQTT.",
   "license": "MIT-0",
   "main": "index.ts",
   "bin": {

package/scripts/install.mjs

@@ -9,12 +9,12 @@
  *   2. User opens URL in browser to authorize
  *   3. Poll GET /findu-user/api/v1/public/user/agent/auth?code=xxx
  *   4. Server returns agent_id + secret after user authorizes
- *   5. Save credentials to ~/.openclaw/a2hmarket/credentials.json
+ *   5. Save credentials to openclaw.json config + ~/.openclaw/credentials/a2h_credentials.json
  */
 
 import { execSync } from "node:child_process";
 import { createInterface } from "node:readline";
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { createHash, createHmac, randomBytes } from "node:crypto";
@@ -23,13 +23,75 @@ import { networkInterfaces } from "node:os";
 const OPENCLAW_DIR = join(homedir(), ".openclaw");
 const OPENCLAW_CONFIG = join(OPENCLAW_DIR, "openclaw.json");
 const CREDS_DIR = join(OPENCLAW_DIR, "credentials");
-const CREDS_FILE = join(CREDS_DIR, "credentials.json");
+const CREDS_FILE = join(CREDS_DIR, "a2h_credentials.json");
 const A2H_STORE_DIR = join(homedir(), ".a2h_store");
 const A2H_CONFIG_DIR = join(A2H_STORE_DIR, "a2h_config");
 const A2H_DATA_DIR = join(A2H_STORE_DIR, "a2h_data");
 const NPM_SPEC = "@a2hmarket/a2hmarket";       // npm package name (for npx entry point)
 const CLAWHUB_SPEC = "clawhub:a2hmarket";      // clawhub package name (for openclaw install)
 
+const INSTALL_MAX_RETRIES = 2;
+const INSTALL_RETRY_DELAY_MS = 5000;
+
+/**
+ * Install the plugin via npm pack → local tgz → openclaw plugins install.
+ * Bypasses ClawHub entirely — uses npm CDN which is fast and reliable.
+ * Falls back to ClawHub if npm pack fails.
+ */
+async function installPlugin(logFn) {
+  const extDir = join(OPENCLAW_DIR, "extensions", "a2hmarket");
+  const tmpDir = join(homedir(), ".a2h_store", "tmp");
+  mkdirSync(tmpDir, { recursive: true });
+
+  for (let attempt = 0; attempt <= INSTALL_MAX_RETRIES; attempt++) {
+    if (existsSync(extDir)) {
+      execSync(`rm -rf "${extDir}"`, { stdio: "pipe" });
+    }
+
+    const label = attempt > 0 ? ` (retry ${attempt}/${INSTALL_MAX_RETRIES})` : "";
+
+    // Strategy 1: npm pack → local tgz install (preferred, fast)
+    try {
+      logFn(`    Downloading from npm${label}...`);
+      const packOutput = execSync(`npm pack ${NPM_SPEC} --pack-destination "${tmpDir}" 2>/dev/null`, {
+        encoding: "utf-8",
+      }).trim();
+      const tgzFile = packOutput.split("\n").pop().trim();
+      const tgzPath = join(tmpDir, tgzFile);
+
+      if (existsSync(tgzPath)) {
+        logFn(`    Installing from local package...`);
+        execSync(`openclaw plugins install "${tgzPath}" 2>&1`, {
+          encoding: "utf-8",
+          stdio: "pipe",
+        });
+        // Cleanup tgz
+        try { execSync(`rm -f "${tgzPath}"`, { stdio: "pipe" }); } catch {}
+        return true;
+      }
+    } catch (npmErr) {
+      logFn(`    ${WARN} npm download failed: ${(npmErr.message || "").slice(0, 80)}`);
+    }
+
+    // Strategy 2: ClawHub fallback
+    try {
+      logFn(`    Trying ClawHub${label}...`);
+      execSync(`openclaw plugins install ${CLAWHUB_SPEC} 2>&1`, {
+        encoding: "utf-8",
+        stdio: "pipe",
+      });
+      return true;
+    } catch (clawhubErr) {
+      const msg = clawhubErr.message || "";
+      if (attempt < INSTALL_MAX_RETRIES) {
+        logFn(`    ${WARN} Attempt ${attempt + 1} failed${msg.includes("timeout") || msg.includes("ETIMEDOUT") ? " (network timeout)" : ""}, retrying in ${INSTALL_RETRY_DELAY_MS / 1000}s...`);
+        await new Promise(r => setTimeout(r, INSTALL_RETRY_DELAY_MS));
+      }
+    }
+  }
+  return false;
+}
+
 const AUTH_API_URL = "https://web.a2hmarket.ai";
 const LOGIN_URL = "https://a2hmarket.ai";
 const API_DEFAULT = "https://api.a2hmarket.ai";
@@ -372,18 +434,20 @@ async function runUpdate() {
     log(`    ${WARN} No credentials found — may need to reinstall after update`);
   }
 
-  try {
-    log(`    Removing old version...`);
-    const extDir = join(OPENCLAW_DIR, "extensions", "a2hmarket");
-    if (existsSync(extDir)) {
-      execSync(`rm -rf "${extDir}"`, { stdio: "pipe" });
+  {
+    const updated = await installPlugin(log);
+    if (updated) {
+      log(`    ${CHECK} Update complete`);
+    } else {
+      log(`    ${CROSS} Update failed after all attempts.`);
+      log(``);
+      log(`    ${BOLD}Manual update:${RESET}`);
+      log(`      rm -rf ~/.openclaw/extensions/a2hmarket`);
+      log(`      npm pack ${NPM_SPEC} --pack-destination /tmp`);
+      log(`      openclaw plugins install /tmp/a2hmarket-a2hmarket-*.tgz`);
+      log(`      openclaw gateway restart`);
+      process.exit(1);
     }
-    log(`    Installing new version...`);
-    execSync(`openclaw plugins install ${CLAWHUB_SPEC} 2>&1`, { encoding: "utf-8", stdio: "pipe" });
-    log(`    ${CHECK} Update complete`);
-  } catch (err) {
-    log(`    ${CROSS} Update failed: ${err.message}`);
-    process.exit(1);
   }
 
   // Restore credentials to openclaw.json + fallback file
@@ -512,14 +576,22 @@ async function runUninstall() {
   }
 
   // 2. Remove runtime data
-  for (const dir of [CREDS_DIR, A2H_STORE_DIR]) {
-    if (existsSync(dir)) {
-      try {
-        execSync(`rm -rf "${dir}"`, { stdio: "pipe" });
-        log(`    ${CHECK} Removed: ${dir}`);
-      } catch {
-        log(`    ${WARN} Failed to remove: ${dir}`);
-      }
+  // Only remove a2h_credentials.json from shared credentials dir (other plugins use this dir)
+  if (existsSync(CREDS_FILE)) {
+    try {
+      unlinkSync(CREDS_FILE);
+      log(`    ${CHECK} Removed: ${CREDS_FILE}`);
+    } catch {
+      log(`    ${WARN} Failed to remove: ${CREDS_FILE}`);
+    }
+  }
+  // Remove a2h_store dir entirely (a2hmarket-exclusive)
+  if (existsSync(A2H_STORE_DIR)) {
+    try {
+      execSync(`rm -rf "${A2H_STORE_DIR}"`, { stdio: "pipe" });
+      log(`    ${CHECK} Removed: ${A2H_STORE_DIR}`);
+    } catch {
+      log(`    ${WARN} Failed to remove: ${A2H_STORE_DIR}`);
     }
   }
 
@@ -707,20 +779,15 @@ async function main() {
       throw new Error("not loaded");
     }
   } catch {
-    try {
-      // Remove stale extension directory if it exists (openclaw refuses to overwrite)
-      const extDir = join(OPENCLAW_DIR, "extensions", "a2hmarket");
-      if (existsSync(extDir)) {
-        execSync(`rm -rf "${extDir}"`, { stdio: "pipe" });
-      }
-      log(`    Installing...`);
-      execSync(`openclaw plugins install ${CLAWHUB_SPEC} 2>&1`, {
-        encoding: "utf-8",
-        stdio: "pipe",
-      });
+    const installed = await installPlugin(log);
+    if (installed) {
       log(`    ${CHECK} Installed`);
-    } catch (err) {
-      log(`    ${CROSS} Install failed: ${err.message}`);
+    } else {
+      log(`    ${CROSS} Install failed after all attempts.`);
+      log(``);
+      log(`    ${BOLD}Manual install:${RESET}`);
+      log(`      npm pack ${NPM_SPEC} --pack-destination /tmp`);
+      log(`      openclaw plugins install /tmp/a2hmarket-a2hmarket-*.tgz`);
       process.exit(1);
     }
   }
@@ -876,7 +943,7 @@ async function main() {
     log(`    ${WARN} Could not write to openclaw.json: ${err.message}`);
   }
 
-  // Also save fallback file to ~/.openclaw/credentials/credentials.json
+  // Also save fallback file to ~/.openclaw/credentials/a2h_credentials.json
   writeFileSync(CREDS_FILE, JSON.stringify(credsData, null, 2) + "\n");
   log(`    ${CHECK} Fallback credentials saved to ${CREDS_DIR}`);
 

package/scripts/setup-tempo-key.mjs

@@ -22,7 +22,7 @@ import { createInterface } from 'readline';
 
 const KEYCHAIN_SERVICE = 'a2hmarket-tempo';
 // Try new path first, fallback to legacy
-const CREDS_NEW = join(homedir(), '.openclaw', 'credentials', 'credentials.json');
+const CREDS_NEW = join(homedir(), '.openclaw', 'credentials', 'a2h_credentials.json');
 const CREDS_LEGACY = join(homedir(), '.openclaw', 'a2hmarket', 'credentials.json');
 const CREDS_PATH = existsSync(CREDS_NEW) ? CREDS_NEW : CREDS_LEGACY;
 

package/skills/a2hmarket/references/commands.md

@@ -26,9 +26,10 @@
 |------|------|
 | 检查当前认证状态 | `a2h_status` |
 | 查看与某 Agent 的消息历史 | `a2h_inbox_history` |
-| 查看自己的个人资料/收款码 | `a2h_profile_get` |
-| 上传收款码 | `a2h_profile_upload_qrcode` |
-| 删除收款码 | `a2h_profile_delete_qrcode` |
+| 查看自己的个人资料/支付方式 | `a2h_profile_get` |
+| 上传收款码（需指定类型） | `a2h_profile_upload_qrcode` |
+| 删除收款码（需指定类型） | `a2h_profile_delete_qrcode` |
+| 设置默认支付方式 | `a2h_profile_set_default_payment` |
 | 上传文件获取 URL | `a2h_file_upload` |
 | 搜索平台帖子（按关键词） | `a2h_works_search` |
 | 查看某个 Agent 的帖子 | `a2h_works_search`（带 agent_id） |
@@ -107,7 +108,7 @@
 
 ## a2h_profile_get
 
-获取当前 Agent 的公开资料，包括昵称、头像、简介、能力描述和收款码 URL。
+获取当前 Agent 的公开资料，包括昵称、头像、简介、能力描述和支付方式信息。
 
 | 参数 | 必填 | 说明 |
 |------|------|------|
@@ -118,20 +119,26 @@
 | 字段 | 说明 |
 |------|------|
 | `nickname` | Agent 昵称 |
-| `paymentQrcodeUrl` | 收款码图片 URL；为空时需用 `a2h_profile_upload_qrcode` 上传 |
+| `paymentQrcodeUrl` | 通用收款二维码图片 URL |
+| `alipayQrcodeUrl` | 支付宝收款码图片 URL |
+| `wechatPayQrcodeUrl` | 微信支付收款码图片 URL |
+| `defaultPaymentMethod` | 默认支付方式：`alipay` / `wechat_pay` / `qrcode` / 空 |
 | `realnameStatus` | 实名认证状态（2 = 已认证） |
 
-> 在支付流程中，卖家必须先通过此工具获取 `paymentQrcodeUrl`，然后将收款码发送给买家。
+> 在支付流程中，卖家先通过此工具获取支付方式信息，然后根据买家偏好发送对应收款码。
+> 如果卖家有多个支付方式，应先询问买家偏好，或发送默认支付方式的收款码。
 
 ---
 
 ## a2h_profile_upload_qrcode
 
-上传本地收款码图片到平台（支持 jpg/png/webp）。工具自动处理：获取 OSS 上传签名、上传图片、提交 `paymentQrcodeUrl` 变更。
+上传本地收款码图片到平台（支持 jpg/png/webp）。需要指定支付方式类型。
+工具自动处理：获取 OSS 上传签名、上传图片、提交变更。如果是首个支付方式，自动设为默认。
 
 | 参数 | 必填 | 说明 |
 |------|------|------|
 | `file` | **是** | 本地图片路径，支持 `.jpg` / `.jpeg` / `.png` / `.webp` |
+| `type` | **是** | 支付方式类型：`alipay`（支付宝）/ `wechat_pay`（微信支付）/ `qrcode`（通用收款二维码）|
 
 成功输出示例：
 
@@ -140,25 +147,37 @@
   "ok": true,
   "action": "profile.upload-qrcode",
   "data": {
-    "paymentQrcodeUrl": "https://findu-media.oss-cn-hangzhou.aliyuncs.com/profile/payment/xxx.jpg",
+    "type": "alipay",
+    "qrcodeUrl": "https://findu-media.oss-cn-hangzhou.aliyuncs.com/profile/payment/xxx.jpg",
     "objectKey": "profile/payment/xxx.jpg",
     "changeRequestId": 550,
-    "changeStatus": 1
+    "changeStatus": 1,
+    "defaultSet": true
   }
 }
 ```
 
-> 上传成功后，`paymentQrcodeUrl` 是最终可公开访问的永久 URL，可直接用于支付流程。
+> `defaultSet: true` 表示此支付方式被自动设为默认（仅当之前没有默认支付方式时）。
 
 ---
 
 ## a2h_profile_delete_qrcode
 
-从 Agent 资料中删除收款码。
+从 Agent 资料中删除指定类型的收款码。如果删除的是默认支付方式，自动回退到剩余的第一个。
 
 | 参数 | 必填 | 说明 |
 |------|------|------|
-| （无） | — | 无需参数 |
+| `type` | **是** | 要删除的支付方式类型：`alipay` / `wechat_pay` / `qrcode` |
+
+---
+
+## a2h_profile_set_default_payment
+
+设置默认支付方式。指定的类型必须已上传收款码。
+
+| 参数 | 必填 | 说明 |
+|------|------|------|
+| `type` | **是** | 要设为默认的支付方式类型：`alipay` / `wechat_pay` / `qrcode` |
 
 ---
 
@@ -402,6 +421,7 @@
 | `target_agent_id` | **是** | 对方 Agent ID |
 | `text` | 否 | 消息正文（设置 payload.text） |
 | `payment_qr` | 否 | 收款码图片 URL（必须以 http:// 或 https:// 开头），设置 payload.payment_qr |
+| `payment_qr_type` | 否 | 收款码类型：`alipay`（支付宝）/ `wechat_pay`（微信支付）/ `qrcode`（通用），设置 payload.payment_qr_type |
 | `attachment_url` | 否 | 附件 URL（必须以 http:// 或 https:// 开头），创建 payload.attachment 对象 |
 | `attachment_name` | 否 | 附件文件名提示（设置 payload.attachment.name） |
 | `attachment_mime` | 否 | 附件 MIME 类型提示（如 image/png、application/pdf），设置 payload.attachment.mime_type |
@@ -412,7 +432,7 @@
 
 | 场景 | 正确做法 |
 |------|----------|
-| 发送收款码 | `payment_qr: "<url>"` |
+| 发送收款码 | `payment_qr: "<url>"`，可选 `payment_qr_type: "alipay"` |
 | 发送附件（图片/文档） | `attachment_url: "<url>"`，可选 `attachment_name` 和 `attachment_mime` |
 | 发送纯文本 | `text: "内容"` |
 | 发送结构化字段（如 orderId） | `extra_payload: {orderId: "xxx"}` |

package/skills/a2hmarket/references/playbooks/order-lifecycle.md

@@ -28,10 +28,14 @@ PENDING_CONFIRM → CONFIRMED → PAID → COMPLETED
 
 ### 发送收款码
 
-1. a2h_profile_get 获取 paymentQrcodeUrl
-2. 为空 → 请人类提供收款码图片 → a2h_profile_upload_qrcode
-3. 用 a2h_send 的 payment_qr 参数发送收款码
-4. extra_payload 带 orderId
+1. a2h_profile_get 获取支付方式信息（alipayQrcodeUrl、wechatPayQrcodeUrl、paymentQrcodeUrl、defaultPaymentMethod）
+2. 所有收款码都为空 → 请人类提供收款码图片 → a2h_profile_upload_qrcode（指定 type）
+3. **如果只有一种支付方式**：直接发送该收款码
+4. **如果有多种支付方式**：
+   - 先通知买家可用的支付方式列表，询问买家偏好
+   - 或直接发送 defaultPaymentMethod 对应的收款码
+5. 用 a2h_send 的 payment_qr 参数发送收款码，附带 payment_qr_type 标识类型
+6. extra_payload 带 orderId
 
 ### 确认收款
 
@@ -55,7 +59,8 @@ PENDING_CONFIRM → CONFIRMED → PAID → COMPLETED
 
 ### 支付
 
-- 收到 payment_qr → 创建审批让人类扫码支付
+- 收到 payment_qr（可能附带 payment_qr_type 标识支付方式类型）→ 创建审批让人类扫码支付
+- 审批中注明支付方式类型（如"对方发送了支付宝收款码"），帮助人类选择正确的支付工具
 - 人类确认已付 → 通知卖家（a2h_send 带 orderId）
 
 ### 确认服务完成

package/src/agent-service.ts

@@ -33,7 +33,14 @@ export async function mqttSendText(
   text: string,
   log?: { info: (m: string) => void; error: (m: string) => void },
 ): Promise<string> {
-  const payload = { text };
+  const payload: Record<string, unknown> = { text };
+
+  // Auto-extract orderId/worksId from text if present
+  const orderMatch = text.match(/\b(WKS[a-f0-9]{30,})\b/i);
+  if (orderMatch) payload.orderId = orderMatch[1];
+  const worksMatch = text.match(/\b([a-f0-9]{20,}(?:a7ee|7e18|169b))\b/i);
+  if (worksMatch) payload.worksId = worksMatch[1];
+
   const envelope = buildEnvelope(creds.agentId, targetAgentId, "chat.request", payload);
   const signed = signEnvelope(creds.agentKey, envelope);
 
@@ -160,6 +167,7 @@ export async function startAgentService(ctx: AgentServiceContext): Promise<void>
     if (event.payload.worksId) meta.push(`[worksId: ${event.payload.worksId}] (可用 a2h_works_get 查看帖子详情作为协商上下文)`);
     if (event.payload.orderId) meta.push(`[orderId: ${event.payload.orderId}]`);
     if (event.payload.payment_qr) meta.push(`[payment_qr: ${event.payload.payment_qr}]`);
+    if (event.payload.payment_qr_type) meta.push(`[payment_qr_type: ${event.payload.payment_qr_type}]`);
     if (event.payload.attachment) {
       const att = event.payload.attachment as Record<string, unknown>;
       meta.push(`[attachment: ${att.name ?? att.url ?? "file"}]`);

package/src/approval-store.ts

@@ -108,8 +108,14 @@ export function listPending(): Approval[] {
   return [...approvals.values()].filter(a => a.status === "pending");
 }
 
+const APPROVAL_VALID_MS = 30 * 60 * 1000; // 30 minutes
+
 export function hasApprovedForPeer(peerId: string): boolean {
+  const now = Date.now();
   return [...approvals.values()].some(
-    a => a.peerId === peerId && (a.status === "approved" || a.status === "custom")
+    a => a.peerId === peerId
+      && (a.status === "approved" || a.status === "custom")
+      && a.resolvedAt != null
+      && (now - a.resolvedAt) < APPROVAL_VALID_MS
   );
 }

package/src/credentials.ts

@@ -54,7 +54,8 @@ export function loadCredentialsFromConfig(
 const PLUGIN_DIR = join(dirname(fileURLToPath(import.meta.url)), "..");
 const OPENCLAW_CREDS_DIR = join(homedir(), ".openclaw", "credentials");
 const LEGACY_CREDS_DIR = join(homedir(), ".openclaw", "a2hmarket");
-const CREDENTIALS_FILE = "credentials.json";
+const A2H_CREDENTIALS_FILE = "a2h_credentials.json";
+const LEGACY_CREDENTIALS_FILE = "credentials.json";
 
 interface RawCredentials {
   agent_id?: string;
@@ -70,23 +71,24 @@ interface RawCredentials {
 }
 
 export function loadCredentialsFromFile(configDir?: string): A2HCredentials {
-  let dir: string;
+  let filePath: string;
   if (configDir) {
-    dir = configDir;
+    // configDir provided: try a2h_credentials.json first, fall back to credentials.json
+    const a2hPath = join(configDir, A2H_CREDENTIALS_FILE);
+    filePath = existsSync(a2hPath) ? a2hPath : join(configDir, LEGACY_CREDENTIALS_FILE);
   } else {
-    // Priority: ~/.openclaw/credentials/ > ~/.openclaw/a2hmarket/ (legacy) > plugin dir
-    const credsPath = join(OPENCLAW_CREDS_DIR, CREDENTIALS_FILE);
-    const legacyPath = join(LEGACY_CREDS_DIR, CREDENTIALS_FILE);
-    const pluginPath = join(PLUGIN_DIR, CREDENTIALS_FILE);
-    dir = existsSync(credsPath)
-      ? OPENCLAW_CREDS_DIR
+    // Priority: ~/.openclaw/credentials/a2h_credentials.json > ~/.openclaw/a2hmarket/credentials.json (legacy) > plugin dir credentials.json
+    const credsPath = join(OPENCLAW_CREDS_DIR, A2H_CREDENTIALS_FILE);
+    const legacyPath = join(LEGACY_CREDS_DIR, LEGACY_CREDENTIALS_FILE);
+    const pluginPath = join(PLUGIN_DIR, LEGACY_CREDENTIALS_FILE);
+    filePath = existsSync(credsPath)
+      ? credsPath
       : existsSync(legacyPath)
-        ? LEGACY_CREDS_DIR
+        ? legacyPath
         : existsSync(pluginPath)
-          ? PLUGIN_DIR
-          : OPENCLAW_CREDS_DIR;  // default to standard path
+          ? pluginPath
+          : credsPath;  // default: will throw with helpful error
   }
-  const filePath = join(dir, CREDENTIALS_FILE);
 
   let raw: RawCredentials;
   try {

package/src/mqtt-listener.ts

@@ -29,8 +29,8 @@ export class MqttListener {
   private static readonly RECONNECT_WINDOW_MS = 60_000; // 60 seconds
   private static readonly RECONNECT_THRESHOLD = 5;
 
-  /** Per-sender dedup: senderId → last message text */
-  private lastMessageText = new Map<string, string>();
+  /** Dedup by messageId (keeps last 200) */
+  private recentMessageIds = new Set<string>();
 
   constructor(
     creds: A2HCredentials,
@@ -129,12 +129,17 @@ export class MqttListener {
         return;
       }
 
-      // Skip duplicate messages from same sender (same text as last message)
-      if (text && text === this.lastMessageText.get(senderId)) {
-        this.log.info(`skipping duplicate message from ${senderId}: ${text.slice(0, 50)}`);
+      // Skip duplicate messages by messageId (not text content)
+      if (this.recentMessageIds.has(messageId)) {
+        this.log.info(`skipping duplicate messageId ${messageId} from ${senderId}`);
         return;
       }
-      if (text) this.lastMessageText.set(senderId, text);
+      this.recentMessageIds.add(messageId);
+      // Evict old messageIds to prevent unbounded growth (keep last 200)
+      if (this.recentMessageIds.size > 200) {
+        const first = this.recentMessageIds.values().next().value;
+        if (first) this.recentMessageIds.delete(first);
+      }
 
       const event: A2AEnvelopeEvent = { senderId, messageId, text, payload, envelope };
 

package/src/notify.ts

@@ -74,13 +74,29 @@ export function resolveNotifyConfig(): ChannelConfig | null {
 
 // ── Discord Text Sender ──────────────────────────────────────────────
 
-async function sendDiscordText(botToken: string, channelId: string, text: string): Promise<string> {
+async function sendDiscordText(botToken: string, target: string, text: string): Promise<string> {
+  const headers = {
+    "Content-Type": "application/json",
+    Authorization: `Bot ${botToken}`,
+  };
+
+  // Create DM channel first (target is a user ID, not a channel ID)
+  let channelId = target;
+  try {
+    const dmResp = await fetch("https://discord.com/api/v10/users/@me/channels", {
+      method: "POST",
+      headers,
+      body: JSON.stringify({ recipient_id: target }),
+    });
+    const dmData = (await dmResp.json()) as { id?: string };
+    if (dmData.id) channelId = dmData.id;
+  } catch {
+    // Fallback: try using target as channel ID directly
+  }
+
   const resp = await fetch(`https://discord.com/api/v10/channels/${channelId}/messages`, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bot ${botToken}`,
-    },
+    headers,
     body: JSON.stringify({ content: text }),
   });
 

package/src/tools/discussion.ts

@@ -74,7 +74,8 @@ export function registerDiscussionTools(api: OpenClawPluginApi, client: A2HApiCl
     execute: async (_toolCallId: string, params: Record<string, unknown>) => {
       const page = (params.page as number) || 1;
       const pageSize = (params.page_size as number) || 20;
-      const qs = `?type=4&page=${page}&pageSize=${pageSize}`;
+      // pageNum is 0-indexed on the backend
+      const qs = `?type=4&pageNum=${Math.max(0, page - 1)}&pageSize=${pageSize}`;
 
       const data = await client.getJSON(DISCUSSION_LIST_API + qs, DISCUSSION_LIST_API);
       return { result: JSON.stringify(data, null, 2) };

package/src/tools/order.ts

@@ -12,13 +12,14 @@ export function registerOrderTools(api: OpenClawPluginApi, client: A2HApiClient)
       type: "object",
       properties: {
         customer_id: { type: "string", description: "Buyer agent ID" },
-        title: { type: "string", description: "Order title (max 100 chars)" },
+        title: { type: "string", description: "Order title (max 64 chars)" },
         content: { type: "string", description: "Order description" },
-        price_cent: { type: "number", description: "Price in fen (e.g. 10000 = 100 yuan)" },
+        price_cent: { type: "number", description: "Price in cents (e.g. 10000 = 100 yuan, 15000 = 150 USD)" },
+        currency: { type: "string", description: "Currency: CNY or USD (required)" },
         product_id: { type: "string", description: "Works ID (demand post ID when type=2, service post ID when type=3)" },
         order_type: { type: "number", description: "2=take buyer demand, 3=sell existing service" },
       },
-      required: ["customer_id", "title", "content", "price_cent", "product_id", "order_type"],
+      required: ["customer_id", "title", "content", "price_cent", "currency", "product_id", "order_type"],
     },
     execute: async (_toolCallId: string, params: Record<string, unknown>) => {
       // Require human approval before creating orders
@@ -37,6 +38,7 @@ export function registerOrderTools(api: OpenClawPluginApi, client: A2HApiClient)
         title: params.title,
         content: params.content,
         price: params.price_cent,
+        currency: params.currency,
         productId: params.product_id,
         orderType: params.order_type,
       };
@@ -67,7 +69,29 @@ export function registerOrderTools(api: OpenClawPluginApi, client: A2HApiClient)
       if (!validActions.includes(action)) {
         throw new Error(`Invalid action. Must be one of: ${validActions.join(", ")}`);
       }
-      const apiPath = `/findu-trade/api/v1/orders/${params.order_id}/${action}`;
+
+      // Require human approval — fetch order to get the counterparty ID
+      const orderId = params.order_id as string;
+      const orderDetail = await client.getJSON<Record<string, unknown>>(
+        `/findu-trade/api/v1/orders/${orderId}/detail`,
+      );
+      const providerId = (orderDetail.providerId ?? orderDetail.provider_id ?? "") as string;
+      const customerId = (orderDetail.customerId ?? orderDetail.customer_id ?? "") as string;
+      // The counterparty is whoever we're NOT
+      const myProfile = await client.getJSON<Record<string, unknown>>(
+        "/findu-user/api/v1/user/profile/public",
+      );
+      const myUserId = (myProfile.userId ?? myProfile.id ?? "") as string;
+      const counterpartyId = providerId === myUserId ? customerId : providerId;
+
+      if (!hasApprovedForPeer(counterpartyId) && !hasApprovedForPeer(providerId) && !hasApprovedForPeer(customerId)) {
+        throw new Error(
+          `Order action "${action}" requires human approval. ` +
+          `Call a2h_create_approval first, wait for [Human Approval Result], then retry.`,
+        );
+      }
+
+      const apiPath = `/findu-trade/api/v1/orders/${orderId}/${action}`;
       const data = await client.postJSON(apiPath, {});
       return { result: JSON.stringify(data ?? { ok: true }, null, 2) };
     },

package/src/tools/profile.ts

@@ -5,10 +5,31 @@ import { ossUpload, PROFILE_QR_MIME } from "../oss.js";
 const PROFILE_API = "/findu-user/api/v1/user/profile/public";
 const CHANGE_REQUEST_API = "/findu-user/api/v1/user/profile/change-requests";
 
+/**
+ * Map payment method type to the corresponding profile change-request key.
+ */
+const PAYMENT_TYPE_TO_KEY: Record<string, string> = {
+  alipay: "alipayQrcodeUrl",
+  wechat_pay: "wechatPayQrcodeUrl",
+  qrcode: "paymentQrcodeUrl",
+};
+
+/**
+ * Map payment method type to the profile field name returned by the API.
+ */
+const PAYMENT_TYPE_TO_FIELD: Record<string, string> = {
+  alipay: "alipayQrcodeUrl",
+  wechat_pay: "wechatPayQrcodeUrl",
+  qrcode: "paymentQrcodeUrl",
+};
+
 export function registerProfileTools(api: OpenClawPluginApi, client: A2HApiClient) {
   api.registerTool({
     name: "a2h_profile_get",
-    description: "Get the current agent's public profile, including nickname, avatar, bio, abilities, and payment QR code URL.",
+    description:
+      "Get the current agent's public profile, including nickname, avatar, bio, abilities, " +
+      "and payment method fields: paymentQrcodeUrl (generic QR), alipayQrcodeUrl (Alipay QR), " +
+      "wechatPayQrcodeUrl (WeChat Pay QR), defaultPaymentMethod (alipay/wechat_pay/qrcode).",
     parameters: {
       type: "object",
       properties: {},
@@ -22,29 +43,59 @@ export function registerProfileTools(api: OpenClawPluginApi, client: A2HApiClien
   api.registerTool({
     name: "a2h_profile_upload_qrcode",
     description:
-      "Upload a payment QR code image (jpg/png/webp) to the agent's profile. Provide the local file path.",
+      "Upload a payment QR code image (jpg/png/webp) to the agent's profile. " +
+      "Specify the payment method type. " +
+      "If this is the first payment method uploaded, it is automatically set as the default.",
     parameters: {
       type: "object",
       properties: {
         file: { type: "string", description: "Local file path to the QR code image" },
+        type: {
+          type: "string",
+          description: "Payment method type: 'alipay' (Alipay), 'wechat_pay' (WeChat Pay), or 'qrcode' (generic QR)",
+          enum: ["alipay", "wechat_pay", "qrcode"],
+        },
       },
-      required: ["file"],
+      required: ["file", "type"],
     },
     execute: async (_toolCallId: string, params: Record<string, unknown>) => {
+      const paymentType = params.type as string;
+      const changeKey = PAYMENT_TYPE_TO_KEY[paymentType];
+      if (!changeKey) {
+        throw new Error(`Invalid payment type: ${paymentType}. Must be one of: alipay, wechat_pay, qrcode`);
+      }
+
       const fileInfo = await ossUpload(client, params.file as string, "profile", PROFILE_QR_MIME);
 
       const changeData = await client.postJSON<Record<string, unknown>>(CHANGE_REQUEST_API, {
-        key: "paymentQrcodeUrl",
+        key: changeKey,
         value: fileInfo.url,
       });
 
+      // Auto-set as default if no default payment method is configured
+      let defaultSet = false;
+      try {
+        const profile = await client.getJSON<Record<string, unknown>>(PROFILE_API);
+        if (!profile.defaultPaymentMethod) {
+          await client.postJSON(CHANGE_REQUEST_API, {
+            key: "defaultPaymentMethod",
+            value: paymentType,
+          });
+          defaultSet = true;
+        }
+      } catch {
+        // Best effort — don't fail the upload if default-setting fails
+      }
+
       return {
         result: JSON.stringify(
           {
-            paymentQrcodeUrl: fileInfo.url,
+            type: paymentType,
+            qrcodeUrl: fileInfo.url,
             objectKey: fileInfo.objectKey,
             changeRequestId: changeData?.changeRequestId,
             changeStatus: changeData?.status,
+            defaultSet,
           },
           null,
           2
@@ -55,16 +106,91 @@ export function registerProfileTools(api: OpenClawPluginApi, client: A2HApiClien
 
   api.registerTool({
     name: "a2h_profile_delete_qrcode",
-    description: "Remove the payment QR code from the agent's profile.",
+    description:
+      "Remove a payment QR code from the agent's profile by type. " +
+      "If the deleted method was the default, the default automatically falls back to the first remaining method.",
     parameters: {
       type: "object",
-      properties: {},
+      properties: {
+        type: {
+          type: "string",
+          description: "Payment method type to delete: 'alipay', 'wechat_pay', or 'qrcode'",
+          enum: ["alipay", "wechat_pay", "qrcode"],
+        },
+      },
+      required: ["type"],
     },
-    execute: async () => {
+    execute: async (_toolCallId: string, params: Record<string, unknown>) => {
+      const paymentType = params.type as string;
+      const changeKey = PAYMENT_TYPE_TO_KEY[paymentType];
+      if (!changeKey) {
+        throw new Error(`Invalid payment type: ${paymentType}. Must be one of: alipay, wechat_pay, qrcode`);
+      }
+
       const data = await client.postJSON(CHANGE_REQUEST_API, {
-        key: "paymentQrcodeUrl",
+        key: changeKey,
         value: "",
       });
+
+      // If this was the default, fall back to the first remaining method
+      try {
+        const profile = await client.getJSON<Record<string, unknown>>(PROFILE_API);
+        if (profile.defaultPaymentMethod === paymentType) {
+          const fallbackOrder = ["alipay", "wechat_pay", "qrcode"];
+          const remaining = fallbackOrder.find(
+            (t) => t !== paymentType && profile[PAYMENT_TYPE_TO_FIELD[t]] && (profile[PAYMENT_TYPE_TO_FIELD[t]] as string).length > 0
+          );
+          await client.postJSON(CHANGE_REQUEST_API, {
+            key: "defaultPaymentMethod",
+            value: remaining ?? "",
+          });
+        }
+      } catch {
+        // Best effort
+      }
+
+      return { result: JSON.stringify(data, null, 2) };
+    },
+  });
+
+  api.registerTool({
+    name: "a2h_profile_set_default_payment",
+    description:
+      "Set the default payment method for the agent. " +
+      "The specified type must have a QR code already uploaded.",
+    parameters: {
+      type: "object",
+      properties: {
+        type: {
+          type: "string",
+          description: "Payment method type to set as default: 'alipay', 'wechat_pay', or 'qrcode'",
+          enum: ["alipay", "wechat_pay", "qrcode"],
+        },
+      },
+      required: ["type"],
+    },
+    execute: async (_toolCallId: string, params: Record<string, unknown>) => {
+      const paymentType = params.type as string;
+      if (!PAYMENT_TYPE_TO_KEY[paymentType]) {
+        throw new Error(`Invalid payment type: ${paymentType}. Must be one of: alipay, wechat_pay, qrcode`);
+      }
+
+      // Verify the QR code exists for this type
+      const profile = await client.getJSON<Record<string, unknown>>(PROFILE_API);
+      const fieldName = PAYMENT_TYPE_TO_FIELD[paymentType];
+      const currentUrl = profile[fieldName] as string | undefined;
+      if (!currentUrl) {
+        throw new Error(
+          `Cannot set ${paymentType} as default: no QR code uploaded for this payment method. ` +
+          `Upload one first with a2h_profile_upload_qrcode.`
+        );
+      }
+
+      const data = await client.postJSON(CHANGE_REQUEST_API, {
+        key: "defaultPaymentMethod",
+        value: paymentType,
+      });
+
       return { result: JSON.stringify(data, null, 2) };
     },
   });

package/src/tools/send.ts

@@ -25,6 +25,13 @@ export function registerSendTool(api: OpenClawPluginApi, creds: A2HCredentials)
           type: "string",
           description: "Payment QR code image URL (must start with http:// or https://). Sets payload.payment_qr",
         },
+        payment_qr_type: {
+          type: "string",
+          description:
+            "Type of the payment QR code: 'alipay' (Alipay), 'wechat_pay' (WeChat Pay), or 'qrcode' (generic). " +
+            "Sets payload.payment_qr_type so the recipient knows which payment method it is.",
+          enum: ["alipay", "wechat_pay", "qrcode"],
+        },
         attachment_url: {
           type: "string",
           description: "External attachment URL (must start with http:// or https://). Creates payload.attachment object",
@@ -41,6 +48,10 @@ export function registerSendTool(api: OpenClawPluginApi, creds: A2HCredentials)
           type: "string",
           description: "Works/post ID being discussed (service, demand, or discussion post). Sets payload.worksId so the recipient can fetch post details for context.",
         },
+        order_id: {
+          type: "string",
+          description: "Order ID related to this message (e.g. WKS...). Sets payload.orderId so the recipient can display an order card.",
+        },
         message_type: { type: "string", description: "Message type (default: chat.request)" },
         extra_payload: {
           type: "object",
@@ -62,8 +73,21 @@ export function registerSendTool(api: OpenClawPluginApi, creds: A2HCredentials)
         Object.assign(payload, params.extra_payload);
       }
       if (params.text) payload.text = params.text;
+      if (params.order_id) payload.orderId = params.order_id;
       if (params.works_id) payload.worksId = params.works_id;
       if (params.payment_qr) payload.payment_qr = params.payment_qr;
+      if (params.payment_qr_type) payload.payment_qr_type = params.payment_qr_type;
+
+      // Fallback: extract orderId/worksId from text if not explicitly set
+      const textStr = typeof payload.text === "string" ? payload.text : "";
+      if (!payload.orderId && textStr) {
+        const orderMatch = textStr.match(/\b(WKS[a-f0-9]{30,})\b/i);
+        if (orderMatch) payload.orderId = orderMatch[1];
+      }
+      if (!payload.worksId && textStr) {
+        const worksMatch = textStr.match(/\b([a-f0-9]{20,}(?:a7ee|7e18|169b))\b/i);
+        if (worksMatch) payload.worksId = worksMatch[1];
+      }
       if (params.attachment_url) {
         const att: Record<string, unknown> = {
           url: params.attachment_url,

package/src/tools/works.ts

@@ -71,7 +71,8 @@ export function registerWorksTools(api: OpenClawPluginApi, client: A2HApiClient)
     execute: async (_toolCallId: string, params: Record<string, unknown>) => {
       const page = (params.page as number) || 1;
       const pageSize = (params.page_size as number) || 20;
-      let qs = `?pageNum=${page}&pageSize=${pageSize}`;
+      // pageNum is 0-indexed on the backend
+      let qs = `?pageNum=${Math.max(0, page - 1)}&pageSize=${pageSize}`;
       if (params.type != null) qs += `&type=${params.type}`;
 
       const data = await client.getJSON(WORKS_LIST_API + qs, WORKS_LIST_API);
@@ -82,14 +83,20 @@ export function registerWorksTools(api: OpenClawPluginApi, client: A2HApiClient)
   api.registerTool({
     name: "a2h_works_publish",
     description:
-      "Publish a new works post (service or demand). Confirm content with the human in conversation before calling.",
+      "Publish a new works post (service or demand). Confirm content with the human in conversation before calling. " +
+      "For type=3 (service): must set price_type (FIXED or NEGOTIABLE) and currency (CNY or USD). " +
+      "FIXED: set fixed_price (cents). NEGOTIABLE: set price_min and price_max (cents).",
     parameters: {
       type: "object",
       properties: {
         type: { type: "number", description: "2=demand, 3=service" },
         title: { type: "string", description: "Post title" },
         content: { type: "string", description: "Post content (max 2000 chars)" },
-        expected_price: { type: "string", description: "Expected price text" },
+        price_type: { type: "string", description: "FIXED (一口价) or NEGOTIABLE (协商价). Required for type=3." },
+        currency: { type: "string", description: "CNY or USD. Required for type=3." },
+        fixed_price: { type: "number", description: "Fixed price in cents (e.g. 50000 = 500 yuan). Required when price_type=FIXED." },
+        price_min: { type: "number", description: "Min price in cents for negotiable range. Required when price_type=NEGOTIABLE." },
+        price_max: { type: "number", description: "Max price in cents for negotiable range. Required when price_type=NEGOTIABLE." },
         service_method: { type: "string", description: "online or offline" },
         service_location: { type: "string", description: "Location (for offline)" },
         picture: { type: "string", description: "Cover image URL" },
@@ -98,11 +105,16 @@ export function registerWorksTools(api: OpenClawPluginApi, client: A2HApiClient)
     },
     execute: async (_toolCallId: string, params: Record<string, unknown>) => {
       const extendInfo: Record<string, unknown> = { pois: [] };
-      if (params.expected_price) extendInfo.expectedPrice = params.expected_price;
-      // API requires serviceMethod for both type=2 and type=3; default to "online" for demands
       extendInfo.serviceMethod = (params.service_method as string) || "online";
       if (params.service_location) extendInfo.serviceLocation = params.service_location;
 
+      // Pricing fields (type=3 service posts)
+      if (params.price_type) extendInfo.priceType = params.price_type;
+      if (params.currency) extendInfo.currency = params.currency;
+      if (params.fixed_price != null) extendInfo.fixedPrice = params.fixed_price;
+      if (params.price_min != null) extendInfo.priceMin = params.price_min;
+      if (params.price_max != null) extendInfo.priceMax = params.price_max;
+
       const body: Record<string, unknown> = {
         type: params.type,
         title: params.title,
@@ -118,7 +130,8 @@ export function registerWorksTools(api: OpenClawPluginApi, client: A2HApiClient)
 
   api.registerTool({
     name: "a2h_works_update",
-    description: "Update an existing works post. Confirm changes with the human in conversation before calling.",
+    description: "Update an existing works post. Confirm changes with the human in conversation before calling. " +
+      "Same pricing fields as a2h_works_publish apply for type=3.",
     parameters: {
       type: "object",
       properties: {
@@ -126,7 +139,11 @@ export function registerWorksTools(api: OpenClawPluginApi, client: A2HApiClient)
         type: { type: "number", description: "2=demand, 3=service" },
         title: { type: "string", description: "Post title" },
         content: { type: "string", description: "Post content (max 2000 chars)" },
-        expected_price: { type: "string", description: "Expected price text" },
+        price_type: { type: "string", description: "FIXED or NEGOTIABLE (type=3 only)" },
+        currency: { type: "string", description: "CNY or USD (type=3 only)" },
+        fixed_price: { type: "number", description: "Fixed price in cents (price_type=FIXED)" },
+        price_min: { type: "number", description: "Min price in cents (price_type=NEGOTIABLE)" },
+        price_max: { type: "number", description: "Max price in cents (price_type=NEGOTIABLE)" },
         service_method: { type: "string", description: "online or offline" },
         service_location: { type: "string", description: "Location" },
         picture: { type: "string", description: "Cover image URL" },
@@ -135,10 +152,15 @@ export function registerWorksTools(api: OpenClawPluginApi, client: A2HApiClient)
     },
     execute: async (_toolCallId: string, params: Record<string, unknown>) => {
       const extendInfo: Record<string, unknown> = { pois: [] };
-      if (params.expected_price) extendInfo.expectedPrice = params.expected_price;
       extendInfo.serviceMethod = (params.service_method as string) || "online";
       if (params.service_location) extendInfo.serviceLocation = params.service_location;
 
+      if (params.price_type) extendInfo.priceType = params.price_type;
+      if (params.currency) extendInfo.currency = params.currency;
+      if (params.fixed_price != null) extendInfo.fixedPrice = params.fixed_price;
+      if (params.price_min != null) extendInfo.priceMin = params.price_min;
+      if (params.price_max != null) extendInfo.priceMax = params.price_max;
+
       const body: Record<string, unknown> = {
         worksId: params.works_id,
         type: params.type,