alink-cli 0.7.3 → 0.7.5

package/README.md

@@ -9,14 +9,24 @@ npx alink-cli
 首次运行输入 AgentLink 账号和密码，这台电脑会自动加入账号并上线。之后直接重复 `npx alink-cli` 即可上线；密码不会保存到本机。
 
 ```bash
+npm install -g alink-cli
+alink-cli help
+alink-cli login
+alink-cli status
+alink-cli machines
+alink-cli logout
+
 npx alink-cli --hub wss://your-hub.example.com
 npx alink-cli --dir /path/to/project
-npx alink-cli logout
 ```
 
+- 全局安装后可直接使用 `alink-cli`（兼容旧命令 `agentlink`）。
+- `login`：登录账号并注册这台电脑，但不启动服务。
+- `status`：查看当前登录状态和 Hub。
+- `machines`：验证账号密码后查看账号下的所有机器，不展示内部凭证。
+- `logout`：退出当前账号并清除本机登录记录，下次运行重新输入账号密码。
 - `--hub`：Hub 地址，默认 `wss://link.harmopath.com`。
 - `--dir`：默认工作目录，缺省为当前目录。
-- `logout`：退出当前账号并清除本机登录记录，下次运行重新输入账号密码。
 - `--legacy`：临时运行旧 daemon；默认始终是 daemon-t3。
 
 Node.js 22.16+。连接为出站 WebSocket，无需端口转发；Hub 只转发 E2EE 密文。

package/bin/agentlink-account.js

@@ -1,4 +1,9 @@
 import { randomBytes } from "node:crypto";
+import { createRequire } from "node:module";
+
+// CloudBase's Node adapter resolves optional dependencies through a runtime
+// `require`; expose this package's resolver so its bundled `ws` dependency is found.
+globalThis.require ??= createRequire(import.meta.url);
 
 const MACHINE_BUCKET = "agentlink-machines";
 const REQUEST_TIMEOUT_MS = 10_000;
@@ -131,3 +136,21 @@ export async function registerAgentLinkAccountMachine({
     await auth.signOut().catch(() => undefined);
   }
 }
+
+export async function listAgentLinkAccountMachines({ config, identifier, password, cloudbaseSdk }) {
+  if (!config?.cloudbaseEnvId) throw new Error("当前 Hub 尚未配置账号机器目录。");
+  const sdk = cloudbaseSdk ?? (await import("@cloudbase/js-sdk")).default;
+  const app = sdk.init({ env: config.cloudbaseEnvId, region: "ap-shanghai" });
+  const auth = app.auth();
+  const signedIn = await auth.signInWithPassword(
+    identifier.includes("@") ? { email: identifier, password } : { username: identifier, password },
+  );
+  if (signedIn?.error) throw new Error(signedIn.error.message || "账号或密码错误。");
+  try {
+    const user = await auth.getCurrentUser();
+    if (!user?.uid) throw new Error("CloudBase 账号登录状态无效。");
+    return readMachines(app.storage.from(MACHINE_BUCKET), `${user.uid}/machines.json`);
+  } finally {
+    await auth.signOut().catch(() => undefined);
+  }
+}

package/bin/agentlink.js

@@ -9,6 +9,7 @@ import { fileURLToPath } from "node:url";
 import WebSocket from "ws";
 
 import {
+  listAgentLinkAccountMachines,
   loadAgentLinkAccountConfig,
   registerAgentLinkAccountMachine,
 } from "./agentlink-account.js";
@@ -17,6 +18,7 @@ const OFFICIAL_HUB = process.env.AGENTLINK_DEFAULT_HUB || "wss://link.harmopath.
 const STATE_DIR = process.env.AGENTLINK_STATE_DIR || join(homedir(), ".agentlink");
 const CREDENTIAL_FILE = join(STATE_DIR, "credential");
 const args = process.argv.slice(2);
+const legacyCredentialCommands = process.env.AGENTLINK_ENABLE_LEGACY_CREDENTIALS === "1";
 
 function value(name) {
   const index = args.findIndex((arg) => arg === `--${name}` || arg.startsWith(`--${name}=`));
@@ -206,20 +208,61 @@ async function pair(hub) {
   });
 }
 
-if (args.includes("--help") || args.includes("-h")) {
+if (args[0] === "help" || args.includes("--help") || args.includes("-h")) {
   console.log(
-    `用法: npx alink-cli [--hub <wss://…>] [--dir <目录>]\n      npx alink-cli logout\n\n首次运行输入 AgentLink 账号密码，这台电脑会自动加入账号；以后直接运行即可上线。\nlogout 退出当前账号；--legacy 临时运行旧 daemon。`,
+    `用法:\n  alink-cli                 登录（首次）并让这台电脑上线\n  alink-cli login           登录账号，不启动服务\n  alink-cli status          查看登录状态\n  alink-cli machines        查看账号下的所有机器\n  alink-cli logout          退出账号\n  alink-cli help            查看帮助\n\n选项:\n  --hub <wss://…>           Hub 地址\n  --dir <目录>              默认工作目录\n  --legacy                  临时运行旧 daemon`,
   );
   process.exit(0);
 }
 
+if (args[0] === "status") {
+  const hub = value("hub") || OFFICIAL_HUB;
+  console.log(`[agentlink] 登录状态：${savedCredential(hub) ? "已登录" : "未登录"}`);
+  console.log(`[agentlink] Hub：${normalizeHub(hub)}`);
+  process.exit(0);
+}
+
 if (args[0] === "logout") {
-  rmSync(CREDENTIAL_FILE, { force: true });
-  console.log("[agentlink] 已退出账号；下次启动时需要重新登录。");
+  const loggedIn = savedCredential(value("hub") || OFFICIAL_HUB);
+  if (loggedIn) rmSync(CREDENTIAL_FILE, { force: true });
+  console.log(
+    loggedIn ? "[agentlink] 已退出账号；下次启动时需要重新登录。" : "[agentlink] 当前未登录。",
+  );
+  process.exit(0);
+}
+
+if (args[0] === "login") {
+  const hub = value("hub") || OFFICIAL_HUB;
+  if (savedCredential(hub)) {
+    console.log("[agentlink] 已登录。需要切换或修复机器时，请先运行 alink-cli logout。");
+    process.exit(0);
+  }
+  const config = await loadAgentLinkAccountConfig(hub);
+  if (config?.mode !== "multi") throw new Error("当前 Hub 不使用账号登录。");
+  await loginAndCreateCredential(hub, config);
   process.exit(0);
 }
 
-if (args[0] === "credential") {
+if (args[0] === "machines") {
+  const hub = value("hub") || OFFICIAL_HUB;
+  const config = await loadAgentLinkAccountConfig(hub);
+  if (config?.mode !== "multi") throw new Error("当前 Hub 不使用账号机器目录。");
+  console.log("[agentlink] 查看账号机器，请验证 AgentLink 账号。");
+  const { identifier, password } = await accountCredentials();
+  const machines = await listAgentLinkAccountMachines({ config, identifier, password });
+  if (machines.length === 0) console.log("[agentlink] 账号下还没有机器。");
+  else {
+    console.log(`[agentlink] 账号下共 ${machines.length} 台机器：`);
+    for (const machine of machines) {
+      console.log(
+        `- ${machine.name || machine.hostname || machine.machineId} (${machine.machineId})`,
+      );
+    }
+  }
+  process.exit(0);
+}
+
+if (args[0] === "credential" && legacyCredentialCommands) {
   const hub = value("hub") || OFFICIAL_HUB;
   const command = args[1] || "status";
   if (command === "path") console.log(CREDENTIAL_FILE);
@@ -231,7 +274,7 @@ if (args[0] === "credential") {
   process.exit(0);
 }
 
-if (args[0] === "qr") {
+if (args[0] === "qr" && legacyCredentialCommands) {
   const credential =
     value("token") || process.env.AGENTLINK_TOKEN || savedCredential(value("hub") || OFFICIAL_HUB);
   if (!credential) throw new Error("这台电脑还没有凭证，请先运行 npx alink-cli 完成配对。");
@@ -239,6 +282,11 @@ if (args[0] === "qr") {
   process.exit(0);
 }
 
+if (args[0] && !args[0].startsWith("-")) {
+  console.error(`[agentlink] 未知命令：${args[0]}。运行 alink-cli help 查看帮助。`);
+  process.exit(1);
+}
+
 if (args.includes("--legacy")) {
   process.argv = process.argv.filter((arg) => arg !== "--legacy");
   await import(new URL("../dist/daemon.js", import.meta.url));
@@ -252,13 +300,13 @@ if (args.includes("--legacy")) {
   const credential =
     explicit ||
     (!args.includes("--pair") && savedCredential(hub)) ||
-    (config?.mode === "multi"
-      ? await loginAndCreateCredential(hub, config)
-      : await createSingleCredential(hub));
+    (args.includes("--pair")
+      ? await pair(hub)
+      : config?.mode === "multi"
+        ? await loginAndCreateCredential(hub, config)
+        : await createSingleCredential(hub));
   if (explicit && explicit !== savedCredential(hub)) saveCredential(explicit, hub);
-  if (!explicit && savedCredential(hub) && !args.includes("--pair")) {
-    console.log("[agentlink] 已登录，正在让这台电脑上线。");
-  }
+  if (!explicit && !args.includes("--pair")) console.log("[agentlink] 正在让这台电脑上线。");
   const { machineToken, enckey } = parseCredential(credential);
   const daemon = fileURLToPath(new URL("../dist/bin.mjs", import.meta.url));
   const cwd = value("dir") || process.cwd();