@manturhub/cli 0.6.0 → 0.7.0

package/bin/cli.js

@@ -5,6 +5,7 @@ import { runMcpBridge } from "../lib/mcp.js";
 import { runInit, runMcpInstall } from "../lib/setup.js";
 import { skillLs, skillAdd } from "../lib/skill-install.js";
 import { suiteLs, suiteInstall } from "../lib/suite-install.js";
+import { loginViaBrowser } from "../lib/login-link.js";
 import { maybeNotifyUpdate } from "../lib/update-check.js";
 import { readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -37,7 +38,8 @@ function getFlag(name, def) {
 const HELP = `manturhub — ManturHub 算子广场 CLI  v${VERSION}
 
 用法:
-  manturhub login --key sk-xxx        配置 API Key（存 ~/.manturhub/config.json）
+  manturhub login                     浏览器授权登录（生成链接→登录创建 Key→自动导入，推荐）
+  manturhub login --key sk-xxx        手动配置 API Key（存 ~/.manturhub/config.json）
   manturhub ls [--cat <分类>]         列出上线算子（分类: text/image/video/audio/data）
   manturhub describe <算子ID>         查看算子入参字段（喂参数前先看）
   manturhub run <算子ID> --json '{}'  调用算子（异步算子自动轮询到出结果；--no-wait 只拿 job_id）
@@ -71,8 +73,9 @@ async function main() {
     case "login": {
       const key = getFlag("key");
       if (!key) {
-        console.error("用法: manturhub login --key sk-xxx");
-        process.exit(1);
+        // 无 --key → 浏览器授权流:生成链接,登录创建 key 后自动导入
+        await loginViaBrowser();
+        break;
       }
       const cfg = loadConfig();
       cfg.key = key;

package/lib/login-link.js

@@ -0,0 +1,88 @@
+// 浏览器授权登录(OAuth 2.0 Device Authorization Grant 变体)。
+// manturhub login(不带 --key)→ 生成链接 → 浏览器登录创建 key → 自动回传 CLI。
+// key 只经后端 poll(device_code)下发,绝不进浏览器 URL。
+import { spawn } from "node:child_process";
+import { getBaseUrl, loadConfig, saveConfig } from "./config.js";
+import { apiFetch } from "./api.js";
+
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+// 尽力自动打开浏览器;打不开也没关系,链接已打印在终端
+function openBrowser(url) {
+  const p = process.platform;
+  const cmd = p === "darwin" ? "open" : p === "win32" ? "cmd" : "xdg-open";
+  const cmdArgs = p === "win32" ? ["/c", "start", "", url] : [url];
+  try {
+    const child = spawn(cmd, cmdArgs, { stdio: "ignore", detached: true });
+    child.on("error", () => {});
+    child.unref();
+  } catch {
+    /* ignore */
+  }
+}
+
+export async function loginViaBrowser() {
+  const base = getBaseUrl();
+
+  // 1. 发起 CLI 会话(无鉴权)
+  let session;
+  try {
+    const r = await fetch(base + "/api/v1/cli/session", { method: "POST" });
+    if (!r.ok) throw new Error("HTTP " + r.status);
+    session = await r.json();
+  } catch (e) {
+    console.error(
+      `\n  发起登录失败(${e.message})。可改用手动方式:\n    manturhub login --key sk-xxx\n`
+    );
+    process.exit(1);
+  }
+  const { device_code, user_code, verify_url, interval = 2, expires_in = 600 } = session;
+
+  console.log("\n  在浏览器里打开以下链接,登录后创建并授权 Key(已尝试自动打开):\n");
+  console.log("    \x1b[36m" + verify_url + "\x1b[0m\n");
+  console.log(
+    "  核对码(请确认浏览器页面显示的码与此一致再创建): \x1b[1m" + user_code + "\x1b[0m\n"
+  );
+  openBrowser(verify_url);
+  console.log("  等待授权中…(在网页里给这次登录起个 Key 名称并点「创建」)");
+
+  // 2. 轮询领 key
+  const deadline = Date.now() + expires_in * 1000;
+  while (Date.now() < deadline) {
+    await sleep(interval * 1000);
+    let poll;
+    try {
+      const r = await fetch(
+        base + "/api/v1/cli/poll?device_code=" + encodeURIComponent(device_code)
+      );
+      poll = await r.json();
+      if (r.status === 410 || poll.status === "expired") {
+        console.error("\n  授权码已过期,请重新运行 manturhub login。\n");
+        process.exit(1);
+      }
+    } catch {
+      continue; // 网络抖动,继续轮询
+    }
+    if (poll.status === "ready" && poll.key) {
+      const cfg = loadConfig();
+      cfg.key = poll.key;
+      saveConfig(cfg);
+      const me = await apiFetch("/api/v1/me", { key: poll.key });
+      if (me.ok) {
+        console.log(
+          `\n  ✓ 授权成功,Key 已导入 ~/.manturhub/config.json。账号: ${
+            me.json.email || "-"
+          }   余额: ${me.json.balance ?? "-"} 馒头\n`
+        );
+      } else {
+        console.log(
+          `\n  ✓ Key 已导入,但验证返回 HTTP ${me.status}(稍后可用 manturhub balance 再确认)。\n`
+        );
+      }
+      return;
+    }
+    // pending → 继续等
+  }
+  console.error("\n  等待超时(未在时限内完成授权)。请重新运行 manturhub login。\n");
+  process.exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manturhub/cli",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "ManturHub 算子广场 CLI：命令行直调 AI 算子 + 安装平台 Skill + 给 Claude Code / Codex / Cursor 等当 stdio MCP server",
   "type": "module",
   "bin": {