@a2hmarket/a2hmarket 0.6.0 → 0.6.2

package/openclaw.plugin.json

@@ -6,7 +6,20 @@
   "skills": ["./skills"],
   "configSchema": {
     "type": "object",
-    "properties": {},
+    "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" }
+        }
+      }
+    },
     "additionalProperties": false
   }
 }

package/package.json

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

package/scripts/install.mjs

@@ -424,7 +424,22 @@ async function runUninstall() {
     }
   }
 
-  // 3. Restart gateway
+  // 3. Clean openclaw.json plugin config
+  try {
+    const configPath = join(OPENCLAW_DIR, "openclaw.json");
+    const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
+    const entry = cfg?.plugins?.entries?.a2hmarket;
+    if (entry) {
+      // Reset to minimal — keep enabled:false so openclaw knows it was uninstalled
+      cfg.plugins.entries.a2hmarket = { enabled: false };
+      writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+      log(`    ${CHECK} openclaw.json 已清理`);
+    }
+  } catch {
+    log(`    ${WARN} openclaw.json 清理跳过`);
+  }
+
+  // 4. Restart gateway
   try {
     execSync("openclaw gateway restart 2>&1", { encoding: "utf-8", stdio: "pipe" });
     log(`    ${CHECK} Gateway 已重启`);
@@ -637,43 +652,7 @@ async function main() {
     log(`    ${WARN} 模块链接失败: ${err.message}`);
   }
 
-  // ── Step 3.6: Ensure a2h tools in alsoAllow ────────────────────
-  // If tools.alsoAllow exists (whitelist mode), add a2h tools to it.
-  log(`    配置工具权限...`);
-  try {
-    const configPath = join(OPENCLAW_DIR, "openclaw.json");
-    const cfg = JSON.parse(readFileSync(configPath, "utf-8"));
-    const alsoAllow = cfg?.tools?.alsoAllow;
-    if (Array.isArray(alsoAllow)) {
-      const a2hTools = [
-        "a2h_status", "a2h_profile_get", "a2h_profile_upload_qrcode",
-        "a2h_profile_delete_qrcode", "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",
-        "a2h_send",
-      ];
-      let added = 0;
-      for (const t of a2hTools) {
-        if (!alsoAllow.includes(t)) {
-          alsoAllow.push(t);
-          added++;
-        }
-      }
-      if (added > 0) {
-        writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
-        log(`    ${CHECK} ${added} 个 a2h 工具已添加到工具白名单`);
-      } else {
-        log(`    ${CHECK} 工具白名单已包含 a2h 工具`);
-      }
-    } else {
-      log(`    ${CHECK} 无工具白名单限制`);
-    }
-  } catch {
-    log(`    ${WARN} 工具权限配置跳过`);
-  }
-
-  // ── Step 4: Save credentials ───────────────────────────────────
+  // ── Step 4: Save credentials & configure openclaw.json ───────
   logStep(4, "保存配置");
   mkdirSync(DATA_DIR, { recursive: true });
 
@@ -705,7 +684,6 @@ async function main() {
         let target = "";
 
         if (chosen.name === "feishu") {
-          // Auto-detect feishu target or ask
           target = detectFeishuTarget() || "";
           if (target) {
             log(`    检测到飞书用户: ${CYAN}${target}${RESET}`);
@@ -733,8 +711,63 @@ async function main() {
     log(`    ${DIM}未检测到可用渠道，跳过通知配置${RESET}`);
   }
 
+  // Save credentials file (fallback for dev mode)
   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...`);
+  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)) {
+      const a2hTools = [
+        "a2h_status", "a2h_profile_get", "a2h_profile_upload_qrcode",
+        "a2h_profile_delete_qrcode", "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",
+        "a2h_send", "a2h_inbox_history",
+        "a2h_address_list", "a2h_address_create", "a2h_address_delete", "a2h_address_set_default",
+        "a2h_discussion_publish", "a2h_discussion_reply", "a2h_discussion_list",
+        "a2h_tempo_pay", "a2h_tempo_balance",
+      ];
+      let added = 0;
+      for (const t of a2hTools) {
+        if (!cfg.tools.alsoAllow.includes(t)) {
+          cfg.tools.alsoAllow.push(t);
+          added++;
+        }
+      }
+      if (added > 0) log(`    ${CHECK} ${added} 个工具已添加到白名单`);
+    }
+
+    writeFileSync(configPath, JSON.stringify(cfg, null, 2) + "\n");
+    log(`    ${CHECK} openclaw.json 已更新`);
+  } catch (err) {
+    log(`    ${WARN} openclaw.json 写入失败: ${err.message}`);
+    log(`    ${DIM}插件将使用凭证文件作为回退${RESET}`);
+  }
 
   // ── Step 5: Restart gateway ────────────────────────────────────
   logStep(5, "启动服务");

package/src/agent-service.ts

@@ -45,7 +45,7 @@ async function mqttSendText(
   }
 }
 
-// ── Re-export notifyHuman for external callers ──────────────────────────
+// ── Re-export for external callers ──────────────────────────────────────
 
 export { notifyHuman as notifyHumanCard } from "./notify.js";
 
@@ -81,7 +81,7 @@ export async function startAgentService(ctx: AgentServiceContext): Promise<void>
     ctx.log.info(`inbound from ${event.senderId}: ${event.text.slice(0, 80)}`);
 
     // ① Custom notification: notify human about incoming message
-    notifyHumanCard("inbound", event.senderId, event.text.slice(0, 500), creds.agentId, notifyLog);
+    notifyHuman("inbound", event.senderId, event.text.slice(0, 500), creds.agentId, notifyLog);
 
     // ② Dispatch to OpenClaw Agent via Channel Plugin SDK
     //    Agent has full access to a2h_* tools