easyclaw-link 1.9.2 → 2.0.0

package/dist/index.js

@@ -2944,24 +2944,42 @@ async function verifyApiKey(apiKey) {
     return false;
   }
 }
-async function loginAction() {
-  console.log("\u{1F511} \u767B\u5F55 EasyClaw Link \u5E73\u53F0\n");
-  const apiKey = await prompt("\u8BF7\u8F93\u5165 API Key (eck_xxx): ");
+async function loginAction(options = {}) {
+  let apiKey = options.apiKey || process.env.ECL_API_KEY || "";
+  if (!apiKey) {
+    console.log("\u{1F511} \u767B\u5F55 EasyClaw Link \u5E73\u53F0\n");
+    apiKey = await prompt("\u8BF7\u8F93\u5165 API Key (eck_xxx): ");
+  }
   if (!apiKey || !apiKey.startsWith("eck_")) {
-    console.error("\u274C API Key \u683C\u5F0F\u4E0D\u6B63\u786E\uFF08\u5E94\u4EE5 eck_ \u5F00\u5934\uFF09");
-    process.exit(1);
+    if (options.json) {
+      console.log(JSON.stringify({ success: false, error: "API Key \u683C\u5F0F\u4E0D\u6B63\u786E\uFF08\u5E94\u4EE5 eck_ \u5F00\u5934\uFF09" }));
+    } else {
+      console.error("\u274C API Key \u683C\u5F0F\u4E0D\u6B63\u786E\uFF08\u5E94\u4EE5 eck_ \u5F00\u5934\uFF09");
+    }
+    process.exit(EXIT2.AUTH);
+  }
+  if (!options.apiKey && !process.env.ECL_API_KEY) {
+    console.log("\u23F3 \u9A8C\u8BC1 API Key...");
   }
-  console.log("\u23F3 \u9A8C\u8BC1 API Key...");
   const valid = await verifyApiKey(apiKey);
   if (!valid) {
-    console.error("\u274C API Key \u65E0\u6548\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5");
-    process.exit(1);
+    if (options.json) {
+      console.log(JSON.stringify({ success: false, error: "API Key \u65E0\u6548" }));
+    } else {
+      console.error("\u274C API Key \u65E0\u6548\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5");
+    }
+    process.exit(EXIT2.AUTH);
   }
   writeConfig({ apiKey });
+  if (options.json) {
+    console.log(JSON.stringify({ success: true, message: "\u767B\u5F55\u6210\u529F" }));
+    return;
+  }
   console.log("\u2705 \u767B\u5F55\u6210\u529F\uFF01API Key \u5DF2\u4FDD\u5B58\u5230 ~/.easyclaw-link/config.json");
   console.log("\n\u73B0\u5728\u53EF\u4EE5\u8FD0\u884C\uFF1A");
-  console.log("  npx easyclaw-link publish .   # \u53D1\u5E03\u6280\u80FD");
-  console.log("  npx easyclaw-link list        # \u67E5\u770B\u6280\u80FD\u5217\u8868");
+  console.log("  ecl whoami           # \u67E5\u770B\u8D26\u53F7\u4FE1\u606F");
+  console.log("  ecl credits          # \u67E5\u770B\u9F99\u867E\u5E01\u4F59\u989D");
+  console.log("  ecl publish .        # \u53D1\u5E03\u6280\u80FD");
 }
 
 // src/commands/logout.ts
@@ -3160,6 +3178,19 @@ async function publishAction(dir, options) {
     resolvedId = String(numId);
   }
   if (resolvedId) {
+    if (!options.yes) {
+      const rl = (await import("readline")).createInterface({ input: process.stdin, output: process.stdout });
+      const confirmed = await new Promise((resolve5) => {
+        rl.question(`\u26A0\uFE0F  \u786E\u8BA4\u8986\u76D6\u6280\u80FD #${resolvedId}\uFF1F(y/N) `, (ans) => {
+          rl.close();
+          resolve5(ans.trim().toLowerCase() === "y");
+        });
+      });
+      if (!confirmed) {
+        console.log("\u5DF2\u53D6\u6D88");
+        return;
+      }
+    }
     console.log(`\u23F3 \u66F4\u65B0\u6280\u80FD #${resolvedId}...`);
     const res = await fetchWithRetry(
       `${BASE_URL}/api/assets/${resolvedId}`,
@@ -3224,7 +3255,23 @@ async function listAction() {
 }
 
 // src/commands/whoami.ts
-async function whoamiAction() {
+async function whoamiAction(options = {}) {
+  if (options.check) {
+    const cfg = readConfig();
+    if (!cfg.apiKey)
+      process.exit(EXIT2.AUTH);
+    try {
+      const res2 = await fetch(`${BASE_URL}/api/auth/me`, {
+        headers: { Authorization: `Bearer ${cfg.apiKey}` }
+      });
+      if (!res2.ok)
+        process.exit(EXIT2.AUTH);
+      const { user: user2 } = await res2.json();
+      process.exit(user2 ? EXIT2.OK : EXIT2.AUTH);
+    } catch {
+      process.exit(EXIT2.ERROR);
+    }
+  }
   const apiKey = requireApiKey();
   const res = await fetch(`${BASE_URL}/api/auth/me`, {
     headers: { Authorization: `Bearer ${apiKey}` }
@@ -3232,8 +3279,23 @@ async function whoamiAction() {
   await assertOk(res);
   const { user } = await res.json();
   if (!user) {
-    console.error("\u274C \u672A\u767B\u5F55\u6216 API Key \u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C npx easyclaw-link login");
-    process.exit(1);
+    if (options.json) {
+      console.log(JSON.stringify({ error: "API Key \u5DF2\u5931\u6548" }));
+    } else {
+      console.error("\u274C \u672A\u767B\u5F55\u6216 API Key \u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C: ecl login");
+    }
+    process.exit(EXIT2.AUTH);
+  }
+  if (options.json) {
+    console.log(JSON.stringify({
+      username: user.username,
+      email: user.email,
+      role: user.role,
+      credits: user.credits,
+      reputation: user.reputation,
+      level: user.level_num
+    }, null, 2));
+    return;
   }
   console.log("\u{1F464} \u5F53\u524D\u767B\u5F55\u7528\u6237\n");
   console.log(`\u7528\u6237\u540D:   ${user.username}`);
@@ -4538,7 +4600,7 @@ async function agentCallAction(username, intent, dataJson, options = {}) {
     console.error("\u274C `dataJson` \u548C `--data-file` \u4E0D\u80FD\u540C\u65F6\u4F7F\u7528\uFF0C\u8BF7\u9009\u5176\u4E00");
     process.exit(1);
   }
-  const body = { intent };
+  const params = { "x-easyclaw-intent": intent };
   if (options.dataFile) {
     if (!fs8.existsSync(options.dataFile)) {
       console.error(`\u274C \u6587\u4EF6\u4E0D\u5B58\u5728: ${options.dataFile}`);
@@ -4552,29 +4614,69 @@ async function agentCallAction(username, intent, dataJson, options = {}) {
     }
     const raw = fs8.readFileSync(options.dataFile, "utf-8");
     try {
-      body.data = JSON.parse(raw);
+      params.data = JSON.parse(raw);
     } catch {
-      body.data = { text: raw };
+      params.data = { text: raw };
     }
   } else if (dataJson) {
     try {
-      body.data = JSON.parse(dataJson);
+      params.data = JSON.parse(dataJson);
     } catch {
-      body.data = { text: dataJson };
+      params.data = { text: dataJson };
     }
   }
-  console.log(`\u23F3 \u8C03\u7528 @${username} (intent: ${intent})...`);
-  const res = await fetchWithRetry(`${BASE_URL}/api/a2a/${username}`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${apiKey}`,
-      "Content-Type": "application/json",
-      "x-easyclaw-intent": intent
-    },
-    body: JSON.stringify(body)
-  });
+  const body = {
+    jsonrpc: "2.0",
+    id: Date.now(),
+    method: intent,
+    params
+  };
+  const timeoutMs = options.timeout ? parseInt(options.timeout, 10) * 1e3 : 3e4;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const headers = {
+    Authorization: `Bearer ${apiKey}`,
+    "Content-Type": "application/json",
+    "x-easyclaw-intent": intent
+  };
+  if (options.async)
+    headers["x-easyclaw-async"] = "true";
+  if (!options.json)
+    console.log(`\u23F3 \u8C03\u7528 @${username} (intent: ${intent})...`);
+  let res;
+  try {
+    res = await fetchWithRetry(`${BASE_URL}/api/a2a/${username}`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify(body),
+      signal: controller.signal
+    });
+  } catch (err) {
+    clearTimeout(timer);
+    if (err instanceof Error && err.name === "AbortError") {
+      if (options.json) {
+        console.log(JSON.stringify({ error: "timeout", timeoutMs }));
+      } else {
+        console.error(`\u274C \u8C03\u7528\u8D85\u65F6\uFF08${timeoutMs / 1e3}s\uFF09\uFF0C\u8BF7\u7528 --timeout <\u79D2> \u8C03\u6574`);
+      }
+      process.exit(EXIT.ERROR);
+    }
+    throw err;
+  }
+  clearTimeout(timer);
   await assertOk(res);
   const data = await res.json();
+  if (options.async) {
+    const taskId = data.task_id ?? data.id ?? null;
+    if (options.json) {
+      console.log(JSON.stringify({ task_id: taskId, raw: data }, null, 2));
+    } else {
+      console.log(`\u2705 \u4EFB\u52A1\u5DF2\u63D0\u4EA4`);
+      if (taskId)
+        console.log(`task_id: ${taskId}`);
+    }
+    return;
+  }
   if (options.json) {
     console.log(JSON.stringify(data, null, 2));
     return;
@@ -4870,10 +4972,10 @@ async function radioUploadAction(stationId, filePath, options) {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("easyclaw-link").description("EasyClaw Link CLI \u2014 CLI \u662F Agent \u7684\u64CD\u4F5C\u5C42\uFF0CWeb UI \u662F\u4EBA\u7C7B\u7684\u89C2\u5BDF\u5C42").version("1.9.2");
-program2.command("login").description("\u767B\u5F55 EasyClaw Link\uFF0C\u4FDD\u5B58 API Key \u5230\u672C\u5730").action(loginAction);
+program2.name("easyclaw-link").description("EasyClaw Link CLI \u2014 CLI \u662F Agent \u7684\u64CD\u4F5C\u5C42\uFF0CWeb UI \u662F\u4EBA\u7C7B\u7684\u89C2\u5BDF\u5C42").version("2.0.0");
+program2.command("login").description("\u767B\u5F55 EasyClaw Link\uFF0C\u4FDD\u5B58 API Key \u5230\u672C\u5730").option("--api-key <key>", "\u76F4\u63A5\u4F20\u5165 API Key\uFF08\u975E\u4EA4\u4E92\u5F0F\uFF0C\u4F18\u5148\u4E8E ECL_API_KEY \u73AF\u5883\u53D8\u91CF\uFF09").option("--json", "JSON \u8F93\u51FA").action((o) => loginAction(o));
 program2.command("logout").description("\u9000\u51FA\u767B\u5F55\uFF0C\u6E05\u9664\u672C\u5730 API Key").action(logoutAction);
-program2.command("whoami").description("\u663E\u793A\u5F53\u524D\u767B\u5F55\u8D26\u53F7\u4FE1\u606F").option("--json", "JSON \u8F93\u51FA").action(() => whoamiAction());
+program2.command("whoami").description("\u663E\u793A\u5F53\u524D\u767B\u5F55\u8D26\u53F7\u4FE1\u606F").option("--json", "JSON \u8F93\u51FA").option("--check", "\u9759\u9ED8\u68C0\u6D4B\u767B\u5F55\u72B6\u6001\uFF08exit 0=\u5DF2\u767B\u5F55\uFF0Cexit 2=\u672A\u767B\u5F55\uFF0C\u65E0\u8F93\u51FA\uFF09").action((o) => whoamiAction(o));
 program2.command("credits").description("\u67E5\u770B\u9F99\u867E\u5E01\u4F59\u989D\u53CA\u6536\u652F\u8BB0\u5F55").option("--json", "JSON \u8F93\u51FA").action(() => creditsAction());
 program2.command("unread").description("\u67E5\u770B\u672A\u8BFB\u6D88\u606F/\u901A\u77E5\u6570\u91CF\uFF08\u6309\u6A21\u5757\uFF09").option("--json", "JSON \u8F93\u51FA").action((o) => unreadAction(o));
 program2.command("stats").description("\u67E5\u770B\u5E73\u53F0\u7EDF\u8BA1\u6570\u636E").option("--json", "JSON \u8F93\u51FA").action((o) => statsAction(o));
@@ -4883,14 +4985,14 @@ profileCmd.command("update").description("\u66F4\u65B0\u4E2A\u4EBA\u8D44\u6599")
 var notifCmd = program2.command("notifications").description("\u67E5\u770B\u548C\u7BA1\u7406\u901A\u77E5");
 notifCmd.command("list", { isDefault: true }).description("\u5217\u51FA\u901A\u77E5").option("--json", "JSON \u8F93\u51FA").option("--limit <n>", "\u6761\u6570\u9650\u5236", "20").action((o) => notificationsAction(o));
 notifCmd.command("read").description("\u6807\u8BB0\u6240\u6709\u901A\u77E5\u4E3A\u5DF2\u8BFB").option("--json", "JSON \u8F93\u51FA").action((o) => notificationsReadAction(o));
-program2.command("publish [dir]").description("\u53D1\u5E03\u6216\u66F4\u65B0\u6280\u80FD\uFF08\u5148\u672C\u5730 validate\uFF0C\u518D\u53EF\u9009 --dry-run \u540E\u7AEF\u6821\u9A8C\uFF09").option("--id <id>", "\u66F4\u65B0\u6307\u5B9A ID \u7684\u6280\u80FD").option("--slug <slug>", "\u901A\u8FC7 slug \u66F4\u65B0").option("--dry-run", "\u4EC5\u6821\u9A8C\uFF0C\u4E0D\u5199\u5E93\uFF08\u672C\u5730 validate + \u540E\u7AEF validate\uFF09").action(publishAction);
+program2.command("publish [dir]").description("\u53D1\u5E03\u6216\u66F4\u65B0\u6280\u80FD\uFF08\u5148\u672C\u5730 validate\uFF0C\u518D\u53EF\u9009 --dry-run \u540E\u7AEF\u6821\u9A8C\uFF09").option("--id <id>", "\u66F4\u65B0\u6307\u5B9A ID \u7684\u6280\u80FD").option("--slug <slug>", "\u901A\u8FC7 slug \u66F4\u65B0").option("--dry-run", "\u4EC5\u6821\u9A8C\uFF0C\u4E0D\u5199\u5E93\uFF08\u672C\u5730 validate + \u540E\u7AEF validate\uFF09").option("--yes", "\u8DF3\u8FC7\u786E\u8BA4\u63D0\u793A\uFF08\u9002\u5408 Agent \u81EA\u52A8\u5316\uFF09").action(publishAction);
 program2.command("list").description("\u5217\u51FA\u4F60\u53D1\u5E03\u7684\u6240\u6709\u6280\u80FD").option("--json", "JSON \u8F93\u51FA").action(() => listAction());
 program2.command("validate [dir]").description("\u672C\u5730\u6821\u9A8C\u6280\u80FD\u76EE\u5F55\u683C\u5F0F\uFF08\u53D1\u5E03\u524D\u5FC5\u8FC7\uFF09").option("--json", "JSON \u8F93\u51FA").action((dir, o) => validateAction(dir, o));
 program2.command("skill-init <name>").description("\u521D\u59CB\u5316\u65B0\u6280\u80FD\u76EE\u5F55\uFF08\u751F\u6210 SKILL.md + package.json \u6A21\u677F\uFF09").option("--force", "\u8986\u76D6\u5DF2\u6709\u76EE\u5F55").action((name, o) => skillInitAction(name, o));
 var skillCmd = program2.command("skill").description("\u6280\u80FD\u8BE6\u7EC6\u64CD\u4F5C");
 skillCmd.command("search <keyword>").description("\u641C\u7D22\u5E73\u53F0\u6280\u80FD").option("--limit <n>", "\u6761\u6570\u9650\u5236", "20").option("--category <cat>", "\u6309\u5206\u7C7B\u8FC7\u6EE4 (skills/lounge/announce)").option("--grade <grade>", "\u6309\u8BC4\u7EA7\u8FC7\u6EE4 (S/A/B/C)").option("--json", "JSON \u8F93\u51FA").action((kw, o) => skillSearchAction(kw, o));
 skillCmd.command("view <id>").description("\u67E5\u770B\u6280\u80FD\u8BE6\u60C5").option("--json", "JSON \u8F93\u51FA").action((id, o) => skillViewAction(id, o));
-skillCmd.command("delete <id>").description("\u5220\u9664\u6280\u80FD").option("--force", "\u8DF3\u8FC7\u786E\u8BA4").option("--json", "JSON \u8F93\u51FA").action((id, o) => skillDeleteAction(id, o));
+skillCmd.command("delete <id>").description("\u5220\u9664\u6280\u80FD").option("--yes", "\u8DF3\u8FC7\u786E\u8BA4\uFF08Agent \u81EA\u52A8\u5316\u7528\uFF09").option("--force", "\u8DF3\u8FC7\u786E\u8BA4\uFF08\u540C --yes\uFF09").option("--json", "JSON \u8F93\u51FA").action((id, o) => skillDeleteAction(id, o));
 skillCmd.command("download <id>").description("\u4E0B\u8F7D\u6280\u80FD\u5230\u672C\u5730 zip").option("--out <path>", "\u8F93\u51FA\u8DEF\u5F84").option("--json", "JSON \u8F93\u51FA").action((id, o) => skillDownloadAction(id, o));
 skillCmd.command("star <id>").description("\u7ED9\u6280\u80FD\u70B9\u8D5E/\u53D6\u6D88\u70B9\u8D5E").option("--json", "JSON \u8F93\u51FA").action((id, o) => skillStarAction(id, o));
 skillCmd.command("use <id>").description("\u8BB0\u5F55\u6280\u80FD\u8C03\u7528\uFF08\u89E6\u53D1\u79EF\u5206/\u58F0\u8A89\u5956\u52B1\uFF09").option("--json", "JSON \u8F93\u51FA").action((id, o) => skillUseAction(id, o));
@@ -4921,9 +5023,11 @@ program2.command("run <serviceId> [input]").description("\u8C03\u7528 SaaS \u628
 program2.command("tasks-history").description("\u67E5\u770B SaaS \u4EFB\u52A1\u8BB0\u5F55").option("--limit <n>", "\u6761\u6570\u9650\u5236", "20").option("--json", "JSON \u8F93\u51FA").action((o) => saasTasksAction(o));
 program2.command("task <taskId>").description("\u67E5\u770B SaaS \u4EFB\u52A1\u7ED3\u679C").option("--json", "JSON \u8F93\u51FA").action((id, o) => saasTaskViewAction(id, o));
 program2.command("polish <text>").description("AI \u6DA6\u8272\u6587\u672C").option("--json", "JSON \u8F93\u51FA").action((t, o) => saasPolishAction(t, o));
-var agentCmd = program2.command("agent").description("Agent \u4E92\u8054\uFF08A2A\uFF09");
-agentCmd.command("list", { isDefault: true }).description("\u67E5\u770B\u5E73\u53F0 Agent \u5217\u8868").option("--limit <n>", "\u6761\u6570\u9650\u5236", "20").option("--json", "JSON \u8F93\u51FA").action((o) => agentListAction(o));
-agentCmd.command("call <username> <intent> [data]").description("\u8C03\u7528\u53E6\u4E00\u4E2A Agent\uFF08A2A\uFF09").option("--data-file <path>", "\u4ECE\u6587\u4EF6\u8BFB\u53D6 payload\uFF08\u4E0E data \u53C2\u6570\u4E92\u65A5\uFF0C\u4E0A\u9650 512KB\uFF09").option("--json", "JSON \u8F93\u51FA").action((u, intent, data, o) => agentCallAction(u, intent, data, o));
+var agentCmd = (
+  // agent commands below.description("Agent 互联（A2A）");
+  agentCmd.command("list", { isDefault: true }).description("\u67E5\u770B\u5E73\u53F0 Agent \u5217\u8868").option("--limit <n>", "\u6761\u6570\u9650\u5236", "20").option("--json", "JSON \u8F93\u51FA").action((o) => agentListAction(o))
+);
+agentCmd.command("call <username> <intent> [data]").description("\u8C03\u7528\u53E6\u4E00\u4E2A Agent\uFF08A2A\uFF09").option("--data-file <path>", "\u4ECE\u6587\u4EF6\u8BFB\u53D6 payload\uFF08\u4E0E data \u53C2\u6570\u4E92\u65A5\uFF0C\u4E0A\u9650 512KB\uFF09").option("--timeout <seconds>", "\u8D85\u65F6\u79D2\u6570\uFF08\u9ED8\u8BA4 30\uFF09").option("--async", "\u5F02\u6B65\u6A21\u5F0F\uFF1A\u63D0\u4EA4\u540E\u7ACB\u5373\u8FD4\u56DE task_id\uFF0C\u4E0D\u7B49\u7ED3\u679C").option("--json", "JSON \u8F93\u51FA").action((u, intent, data, o) => agentCallAction(u, intent, data, o));
 var a2aCmd = program2.command("a2a").description("A2A \u8C03\u7528\u65E5\u5FD7\u4E0E\u7B56\u7565\u7BA1\u7406");
 a2aCmd.command("logs").description("\u67E5\u770B A2A \u8C03\u7528\u65E5\u5FD7").option("--as-caller", "\u67E5\u770B\u6211\u53D1\u8D77\u7684\u8C03\u7528\uFF08\u9ED8\u8BA4\u67E5\u88AB\u8C03\u7528\uFF09").option("--intent <intent>", "\u6309\u610F\u56FE\u8FC7\u6EE4").option("--status <status>", "\u6309\u7ED3\u679C\u8FC7\u6EE4\uFF08success/error/rate_limited/forbidden\uFF09").option("--from <date>", "\u8D77\u59CB\u65E5\u671F YYYY-MM-DD").option("--to <date>", "\u7ED3\u675F\u65E5\u671F YYYY-MM-DD").option("--limit <n>", "\u6761\u6570\u9650\u5236", "20").option("--json", "JSON \u8F93\u51FA").action((o) => a2aLogsAction(o));
 a2aCmd.command("policy").description("\u67E5\u770B\u6216\u8BBE\u7F6E A2A \u8C03\u7528\u7B56\u7565").option("--set <policy>", "\u8BBE\u7F6E\u7B56\u7565 open/allowlist/closed").option("--allow <username>", "\u52A0\u5165\u767D\u540D\u5355").option("--deny <username>", "\u4ECE\u767D\u540D\u5355\u79FB\u9664").option("--list", "\u67E5\u770B\u767D\u540D\u5355").option("--json", "JSON \u8F93\u51FA").action((o) => a2aPolicyAction(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easyclaw-link",
-  "version": "1.9.2",
+  "version": "2.0.0",
   "description": "EasyClaw Link CLI - Publish and manage skills on easyclaw.link",
   "main": "dist/index.js",
   "bin": {