@a2hmarket/a2hmarket 0.6.1 → 0.6.3

package/package.json

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

package/scripts/install.mjs

@@ -468,11 +468,32 @@ 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`);
     log(`  更新:    npx -y ${NPM_SPEC} update`);
     log(`  卸载:    npx -y ${NPM_SPEC} uninstall\n`);
+    log(`  选项:`);
+    log(`    --agent <id:key>       跳过浏览器授权，直接使用凭证`);
+    log(`    --notify <channel:id>  指定通知渠道（如 feishu:ou_xxx, discord:123456）`);
+    log(`    --yes                  跳过所有确认提示\n`);
     process.exit(0);
   }
 
+  // Parse global 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 ─────────────────────────────────────
@@ -507,9 +528,14 @@ 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();
+        } else {
+          log(`    ${DIM}--yes: 自动使用现有凭证${RESET}`);
+        }
         if (reuse.toLowerCase() !== "n") {
           agentId = existingId;
           agentKey = existing.agent_key ?? existing.agentKey ?? "";
@@ -663,52 +689,59 @@ 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) {
+    // --notify flag: skip interactive selection
+    credsData.notify = presetNotify;
+    log(`    ${CHECK} 通知渠道已配置: ${presetNotify.channel} → ${presetNotify.target}`);
+  } else {
+    // Interactive channel selection
+    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}`);
   }
 
   // Save credentials file (fallback for dev mode)

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