alink-cli 0.7.4 → 0.8.0

package/README.md

@@ -6,17 +6,35 @@
 npx alink-cli
 ```
 
-首次运行输入 AgentLink 账号和密码，这台电脑会自动加入账号并上线。之后直接重复 `npx alink-cli` 即可上线；密码不会保存到本机。
+直接运行会进入基于 Ink 的交互式 TUI。TUI 采用扁平菜单，最多两级：
+
+- 顶部状态栏实时显示 daemon 是否运行、PID、Hub、凭证状态。
+- 主菜单：启动 / 停止 / 重启 daemon、查看状态详情、登录 / 配对 / 登出、查看机器、设置、帮助、退出。
+- 启动 daemon 后它在后台运行，退出 TUI 不会停止它。
+
+首次运行输入 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。
+- `--no-tui` / `AGENTLINK_TUI=0`：跳过交互式 TUI，按旧行为前台启动 daemon（适合脚本或非 TTY 环境）。
+- `CI=true` 或非 TTY 环境会自动跳过 TUI。
 
 Node.js 22.16+。连接为出站 WebSocket，无需端口转发；Hub 只转发 E2EE 密文。

package/bin/agentlink-account.js

@@ -1,6 +1,11 @@
 import { randomBytes } from "node:crypto";
+import { createRequire } from "node:module";
 
-const MACHINE_BUCKET = "agentlink-machines";
+// 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_TABLE = "agentlink_machine_keys";
 const REQUEST_TIMEOUT_MS = 10_000;
 
 function httpUrl(hub, pathname) {
@@ -14,12 +19,20 @@ async function json(response) {
   return response.json().catch(() => ({}));
 }
 
-export async function loadAgentLinkAccountConfig(hub, fetchFn = fetch) {
-  const response = await fetchFn(httpUrl(hub, "/api/config"), {
-    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
-  });
-  if (!response.ok) throw new Error(`Hub 配置读取失败 (${response.status})。`);
-  return json(response);
+function timestamp(value) {
+  const parsed = typeof value === "number" ? value : Number(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+function normalizeMachineRow(row) {
+  const createdAt = timestamp(row?.created_at);
+  return {
+    machineId: row?.machine_id,
+    ...(row?.name ? { name: row.name } : {}),
+    ...(row?.hostname ? { hostname: row.hostname } : {}),
+    ...(row?.enckey ? { enckey: row.enckey } : {}),
+    ...(createdAt !== undefined ? { createdAt } : {}),
+  };
 }
 
 function machineIdFromToken(authToken) {
@@ -33,18 +46,12 @@ function machineIdFromToken(authToken) {
   }
 }
 
-async function readMachines(bucket, path) {
-  const { data, error } = await bucket.download(path);
-  if (error) {
-    if (/not found|no such|404/i.test(error.message || "")) return [];
-    throw new Error(`读取账号机器列表失败：${error.message}`);
-  }
-  try {
-    const parsed = JSON.parse(await data.text());
-    return Array.isArray(parsed.machines) ? parsed.machines : [];
-  } catch {
-    throw new Error("账号机器列表格式损坏，请在 Web 端移除异常记录后重试。");
-  }
+export async function loadAgentLinkAccountConfig(hub, fetchFn = fetch) {
+  const response = await fetchFn(httpUrl(hub, "/api/config"), {
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+  });
+  if (!response.ok) throw new Error(`Hub 配置读取失败 (${response.status})。`);
+  return json(response);
 }
 
 export async function registerAgentLinkAccountMachine({
@@ -103,31 +110,56 @@ export async function registerAgentLinkAccountMachine({
   try {
     const user = await auth.getCurrentUser();
     if (!user?.uid) throw new Error("CloudBase 账号登录状态无效。");
-    const path = `${user.uid}/machines.json`;
-    const bucket = app.storage.from(MACHINE_BUCKET);
-    const machines = await readMachines(bucket, path);
-    const current = machines.find((machine) => machine?.machineId === machineId);
+
+    const database = app.rdb();
+    const { data, error: readError } = await database
+      .from(MACHINE_TABLE)
+      .select("machine_id,connected_at,created_at")
+      .order("updated_at", { ascending: false });
+    if (readError) throw new Error(`读取账号机器记录失败：${readError.message}`);
+    const current = (Array.isArray(data) ? data : []).find((row) => row?.machine_id === machineId);
+
     const enckey = randomBytesFn(32).toString("base64url");
-    const machine = {
-      machineId,
-      name: machineName,
-      hostname: machineName,
-      createdAt: current?.createdAt ?? Date.now(),
-      enckey,
-    };
-    // ponytail: read-modify-write is enough for normal first-time setup; add
-    // versioned retries if concurrent registrations for one account become common.
-    const { error } = await bucket.update(
-      path,
-      JSON.stringify({
-        version: 2,
-        machines: [machine, ...machines.filter((entry) => entry?.machineId !== machineId)],
-      }),
-      { contentType: "application/json" },
+    const now = Date.now();
+    const { error } = await database.from(MACHINE_TABLE).upsert(
+      {
+        machine_id: machineId,
+        name: machineName,
+        hostname: machineName,
+        enckey,
+        connected_at: current?.connected_at ?? null,
+        created_at: current?.created_at ?? now,
+        updated_at: now,
+      },
+      { onConflict: "owner_id,machine_id" },
     );
-    if (error) throw new Error(`保存账号机器列表失败：${error.message}`);
+    if (error) throw new Error(`保存账号机器记录失败：${error.message}`);
     return { credential: `${authToken}.${enckey}`, machineId };
   } finally {
     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 账号登录状态无效。");
+    const database = app.rdb();
+    const { data, error } = await database
+      .from(MACHINE_TABLE)
+      .select("machine_id,name,hostname,enckey,connected_at,created_at")
+      .order("updated_at", { ascending: false });
+    if (error) throw new Error(`读取账号机器记录失败：${error.message}`);
+    return (Array.isArray(data) ? data : []).map(normalizeMachineRow);
+  } finally {
+    await auth.signOut().catch(() => undefined);
+  }
+}

package/bin/agentlink-prompts.js

@@ -0,0 +1,55 @@
+import { createInterface } from "node:readline/promises";
+
+export async function readPassword(label) {
+  if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== "function") {
+    throw new Error(
+      "当前终端无法安全读取密码，请在交互式终端运行，或设置 AGENTLINK_ACCOUNT 和 AGENTLINK_PASSWORD。",
+    );
+  }
+  process.stdout.write(label);
+  return new Promise((resolve, reject) => {
+    let password = "";
+    const wasRaw = process.stdin.isRaw;
+    const finish = () => {
+      process.stdin.off("data", onData);
+      process.stdin.setRawMode(wasRaw);
+      process.stdin.pause();
+      process.stdout.write("\n");
+    };
+    const onData = (chunk) => {
+      for (const char of String(chunk)) {
+        if (char === "\u0003") {
+          finish();
+          reject(new Error("已取消登录。"));
+          return;
+        }
+        if (char === "\r" || char === "\n") {
+          finish();
+          resolve(password);
+          return;
+        }
+        if (char === "\u007f" || char === "\b") password = password.slice(0, -1);
+        else if (char >= " ") password += char;
+      }
+    };
+    process.stdin.setRawMode(true);
+    process.stdin.setEncoding("utf8");
+    process.stdin.resume();
+    process.stdin.on("data", onData);
+  });
+}
+
+export async function accountCredentials() {
+  const fromEnv = process.env.AGENTLINK_ACCOUNT?.trim();
+  const passwordFromEnv = process.env.AGENTLINK_PASSWORD;
+  if (fromEnv && passwordFromEnv) return { identifier: fromEnv, password: passwordFromEnv };
+  if (!process.stdin.isTTY) {
+    throw new Error("首次运行需要登录账号，请在交互式终端运行。");
+  }
+  const readline = createInterface({ input: process.stdin, output: process.stdout });
+  const identifier = (await readline.question("AgentLink 账号：")).trim();
+  readline.close();
+  const password = await readPassword("AgentLink 密码：");
+  if (!identifier || !password) throw new Error("账号和密码不能为空。");
+  return { identifier, password };
+}

package/bin/agentlink.js

@@ -1,22 +1,32 @@
 #!/usr/bin/env node
 import { spawn } from "node:child_process";
 import { randomBytes } from "node:crypto";
+import { existsSync } from "node:fs";
 import { chmodSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { hostname, homedir } from "node:os";
 import { join } from "node:path";
-import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import WebSocket from "ws";
 
 import {
+  listAgentLinkAccountMachines,
   loadAgentLinkAccountConfig,
   registerAgentLinkAccountMachine,
 } from "./agentlink-account.js";
+import { accountCredentials } from "./agentlink-prompts.js";
 
 const OFFICIAL_HUB = process.env.AGENTLINK_DEFAULT_HUB || "wss://link.harmopath.com";
 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";
+const forceTui = process.env.AGENTLINK_TUI === "1";
+const noTui =
+  !forceTui &&
+  (args.includes("--no-tui") ||
+    process.env.AGENTLINK_TUI === "0" ||
+    process.env.CI === "true" ||
+    !process.stdin.isTTY);
 
 function value(name) {
   const index = args.findIndex((arg) => arg === `--${name}` || arg.startsWith(`--${name}=`));
@@ -87,60 +97,6 @@ async function createSingleCredential(hub) {
   return credential;
 }
 
-async function readPassword(label) {
-  if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== "function") {
-    throw new Error(
-      "当前终端无法安全读取密码，请在交互式终端运行，或设置 AGENTLINK_ACCOUNT 和 AGENTLINK_PASSWORD。",
-    );
-  }
-  process.stdout.write(label);
-  return new Promise((resolve, reject) => {
-    let password = "";
-    const wasRaw = process.stdin.isRaw;
-    const finish = () => {
-      process.stdin.off("data", onData);
-      process.stdin.setRawMode(wasRaw);
-      process.stdin.pause();
-      process.stdout.write("\n");
-    };
-    const onData = (chunk) => {
-      for (const char of String(chunk)) {
-        if (char === "\u0003") {
-          finish();
-          reject(new Error("已取消登录。"));
-          return;
-        }
-        if (char === "\r" || char === "\n") {
-          finish();
-          resolve(password);
-          return;
-        }
-        if (char === "\u007f" || char === "\b") password = password.slice(0, -1);
-        else if (char >= " ") password += char;
-      }
-    };
-    process.stdin.setRawMode(true);
-    process.stdin.setEncoding("utf8");
-    process.stdin.resume();
-    process.stdin.on("data", onData);
-  });
-}
-
-async function accountCredentials() {
-  const fromEnv = process.env.AGENTLINK_ACCOUNT?.trim();
-  const passwordFromEnv = process.env.AGENTLINK_PASSWORD;
-  if (fromEnv && passwordFromEnv) return { identifier: fromEnv, password: passwordFromEnv };
-  if (!process.stdin.isTTY) {
-    throw new Error("首次运行需要登录账号，请在交互式终端运行。");
-  }
-  const readline = createInterface({ input: process.stdin, output: process.stdout });
-  const identifier = (await readline.question("AgentLink 账号：")).trim();
-  readline.close();
-  const password = await readPassword("AgentLink 密码：");
-  if (!identifier || !password) throw new Error("账号和密码不能为空。");
-  return { identifier, password };
-}
-
 async function loginAndCreateCredential(hub, config) {
   console.log("[agentlink] 首次使用，请登录 AgentLink 账号。");
   const { identifier, password } = await accountCredentials();
@@ -206,43 +162,65 @@ async function pair(hub) {
   });
 }
 
-if (args.includes("--help") || args.includes("-h")) {
+// ---------------------------------------------------------------------------
+// Command handlers
+// ---------------------------------------------------------------------------
+
+async function showHelp() {
   console.log(
-    `用法: npx alink-cli [--hub <wss://…>] [--dir <目录>]\n      npx alink-cli logout\n\n首次运行输入 AgentLink 账号密码，这台电脑会自动加入账号；以后直接运行即可上线。\nlogout 退出当前账号；--legacy 临时运行旧 daemon。`,
+    `用法:\n  alink-cli                 进入交互式 TUI（默认）\n  alink-cli --no-tui        跳过 TUI，按旧行为启动 daemon\n  alink-cli login           登录账号\n  alink-cli status          查看登录状态\n  alink-cli machines        查看账号下的所有机器\n  alink-cli logout          退出账号\n  alink-cli --legacy        临时运行旧 daemon\n  alink-cli help            查看帮助\n\n选项:\n  --hub <wss://…>           Hub 地址\n  --dir <目录>              默认工作目录\n  --no-tui                  禁用交互式 TUI`,
   );
-  process.exit(0);
 }
 
-if (args[0] === "logout") {
-  rmSync(CREDENTIAL_FILE, { force: true });
-  console.log("[agentlink] 已退出账号；下次启动时需要重新登录。");
-  process.exit(0);
+async function showStatus() {
+  const hub = value("hub") || OFFICIAL_HUB;
+  console.log(`[agentlink] 登录状态：${savedCredential(hub) ? "已登录" : "未登录"}`);
+  console.log(`[agentlink] Hub：${normalizeHub(hub)}`);
+}
+
+async function doLogout() {
+  const loggedIn = savedCredential(value("hub") || OFFICIAL_HUB);
+  if (loggedIn) rmSync(CREDENTIAL_FILE, { force: true });
+  console.log(
+    loggedIn ? "[agentlink] 已退出账号；下次启动时需要重新登录。" : "[agentlink] 当前未登录。",
+  );
 }
 
-if (args[0] === "credential") {
+async function doLogin() {
   const hub = value("hub") || OFFICIAL_HUB;
-  const command = args[1] || "status";
-  if (command === "path") console.log(CREDENTIAL_FILE);
-  else if (command === "status") console.log(savedCredential(hub) ? "已保存凭证" : "未保存凭证");
-  else if (command === "show") console.log(savedCredential(hub) || "");
-  else if (command === "set" && args[2] && !/\s/.test(args[2])) saveCredential(args[2], hub);
-  else if (command === "clear") rmSync(CREDENTIAL_FILE, { force: true });
-  else throw new Error("用法: alink-cli credential status|path|show|set <credential>|clear");
-  process.exit(0);
+  if (savedCredential(hub)) {
+    console.log("[agentlink] 已登录。需要切换或修复机器时，请先运行 alink-cli logout。");
+    return;
+  }
+  const config = await loadAgentLinkAccountConfig(hub);
+  if (config?.mode !== "multi") throw new Error("当前 Hub 不使用账号登录。");
+  await loginAndCreateCredential(hub, config);
 }
 
-if (args[0] === "qr") {
-  const credential =
-    value("token") || process.env.AGENTLINK_TOKEN || savedCredential(value("hub") || OFFICIAL_HUB);
-  if (!credential) throw new Error("这台电脑还没有凭证，请先运行 npx alink-cli 完成配对。");
-  await printQr(credential);
-  process.exit(0);
+async function doMachines() {
+  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})`,
+      );
+    }
+  }
 }
 
-if (args.includes("--legacy")) {
+async function doLegacy() {
   process.argv = process.argv.filter((arg) => arg !== "--legacy");
   await import(new URL("../dist/daemon.js", import.meta.url));
-} else {
+}
+
+async function doNoTuiStart() {
   const hub = value("hub") || OFFICIAL_HUB;
   const explicit = value("token") || process.env.AGENTLINK_TOKEN;
   const config =
@@ -252,13 +230,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();
@@ -274,3 +252,91 @@ if (args.includes("--legacy")) {
   for (const signal of ["SIGINT", "SIGTERM"]) process.on(signal, () => child.kill(signal));
   process.exitCode = await new Promise((resolve) => child.on("exit", (code) => resolve(code ?? 1)));
 }
+
+async function doTui() {
+  const uiPath = fileURLToPath(new URL("../dist/ui.js", import.meta.url));
+  if (!existsSync(uiPath)) {
+    console.error(
+      `[agentlink] 交互式 UI 包不存在: ${uiPath}\n请先运行 pnpm --filter alink-cli run build。`,
+    );
+    process.exit(1);
+  }
+  await import(new URL("../dist/ui.js", import.meta.url));
+}
+
+// ---------------------------------------------------------------------------
+// Router
+// ---------------------------------------------------------------------------
+
+async function main() {
+  // Strip internal-only flags before dispatching so downstream handlers see clean args.
+  const publicArgs = args.filter((a) => a !== "--no-tui");
+
+  if (publicArgs[0] === "help" || publicArgs.includes("--help") || publicArgs.includes("-h")) {
+    await showHelp();
+    return;
+  }
+
+  if (publicArgs[0] === "status") {
+    await showStatus();
+    return;
+  }
+
+  if (publicArgs[0] === "logout") {
+    await doLogout();
+    return;
+  }
+
+  if (publicArgs[0] === "login") {
+    await doLogin();
+    return;
+  }
+
+  if (publicArgs[0] === "machines") {
+    await doMachines();
+    return;
+  }
+
+  if (publicArgs[0] === "credential" && legacyCredentialCommands) {
+    const hub = value("hub") || OFFICIAL_HUB;
+    const command = publicArgs[1] || "status";
+    if (command === "path") console.log(CREDENTIAL_FILE);
+    else if (command === "status") console.log(savedCredential(hub) ? "已保存凭证" : "未保存凭证");
+    else if (command === "show") console.log(savedCredential(hub) || "");
+    else if (command === "set" && publicArgs[2] && !/\s/.test(publicArgs[2])) saveCredential(publicArgs[2], hub);
+    else if (command === "clear") rmSync(CREDENTIAL_FILE, { force: true });
+    else throw new Error("用法: alink-cli credential status|path|show|set <credential>|clear");
+    return;
+  }
+
+  if (publicArgs[0] === "qr" && legacyCredentialCommands) {
+    const credential =
+      value("token") || process.env.AGENTLINK_TOKEN || savedCredential(value("hub") || OFFICIAL_HUB);
+    if (!credential) throw new Error("这台电脑还没有凭证，请先运行 npx alink-cli 完成配对。");
+    await printQr(credential);
+    return;
+  }
+
+  if (publicArgs[0] && !publicArgs[0].startsWith("-")) {
+    console.error(`[agentlink] 未知命令：${publicArgs[0]}。运行 alink-cli help 查看帮助。`);
+    process.exit(1);
+  }
+
+  if (publicArgs.includes("--legacy")) {
+    await doLegacy();
+    return;
+  }
+
+  // Non-TTY, CI, or explicit --no-tui: preserve the original foreground daemon behavior.
+  if (noTui) {
+    await doNoTuiStart();
+    return;
+  }
+
+  await doTui();
+}
+
+main().catch((err) => {
+  console.error(err instanceof Error ? err.message : String(err));
+  process.exit(1);
+});