alink-cli 0.8.0 → 0.8.1

package/README.md

@@ -9,10 +9,11 @@ npx alink-cli
 直接运行会进入基于 Ink 的交互式 TUI。TUI 采用扁平菜单，最多两级：
 
 - 顶部状态栏实时显示 daemon 是否运行、PID、Hub、凭证状态。
-- 主菜单：启动 / 停止 / 重启 daemon、查看状态详情、登录 / 配对 / 登出、查看机器、设置、帮助、退出。
+- 主菜单：启动 / 停止 / 重启 daemon、查看状态详情、登录 / 登出、查看机器、设置、帮助、退出。
+- 未登录时才显示扫码配对入口。
 - 启动 daemon 后它在后台运行，退出 TUI 不会停止它。
 
-首次运行输入 AgentLink 账号和密码，这台电脑会自动加入账号并上线。之后直接重复 `npx alink-cli` 即可管理或启动后台服务；密码不会保存到本机。
+首次运行输入 AgentLink 账号和密码，这台电脑会自动加入账号并上线。之后直接重复 `npx alink-cli` 即可管理或启动后台服务；账号密码不会保存到本机，登录会话 JWT 缓存于 `~/.agentlink/session`（0600）。
 
 ```bash
 npm install -g alink-cli
@@ -29,7 +30,7 @@ npx alink-cli --dir /path/to/project
 - 全局安装后可直接使用 `alink-cli`（兼容旧命令 `agentlink`）。
 - `login`：登录账号并注册这台电脑，但不启动服务。
 - `status`：查看当前登录状态和 Hub。
-- `machines`：验证账号密码后查看账号下的所有机器，不展示内部凭证。
+- `machines`：查看账号下的所有机器（在线/离线），不展示内部凭证；首次会验证一次账号密码，之后使用缓存的会话 JWT，无需重复输入。
 - `logout`：退出当前账号并清除本机登录记录，下次运行重新输入账号密码。
 - `--hub`：Hub 地址，默认 `wss://link.harmopath.com`。
 - `--dir`：默认工作目录，缺省为当前目录。

package/bin/agentlink-account.js

@@ -134,12 +134,58 @@ export async function registerAgentLinkAccountMachine({
       { onConflict: "owner_id,machine_id" },
     );
     if (error) throw new Error(`保存账号机器记录失败：${error.message}`);
-    return { credential: `${authToken}.${enckey}`, machineId };
+    return { credential: `${authToken}.${enckey}`, machineId, jwt: login.jwt };
   } finally {
     await auth.signOut().catch(() => undefined);
   }
 }
 
+export async function listAgentLinkAccountMachinesFromHub({ hub, jwt, fetchFn = fetch }) {
+  if (!jwt) throw new Error("没有可用的登录会话，请先运行 alink-cli login。");
+  const response = await fetchFn(httpUrl(hub, "/api/machines"), {
+    method: "GET",
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    headers: {
+      Authorization: `Bearer ${jwt}`,
+      "X-Requested-With": "agentlink",
+    },
+  });
+  const body = await json(response);
+  if (!response.ok) {
+    throw new Error(body.error || `读取机器列表失败 (${response.status})。`);
+  }
+  const machines = Array.isArray(body.machines) ? body.machines : [];
+  return machines.map((row) => ({
+    machineId: typeof row.machineId === "string" ? row.machineId : "",
+    online: row.online === true,
+    name: typeof row.name === "string" ? row.name : undefined,
+    hostname: typeof row.hostname === "string" ? row.hostname : undefined,
+    connectedAt: timestamp(row.connectedAt),
+    createdAt: timestamp(row.createdAt),
+    updatedAt: timestamp(row.updatedAt),
+  })).filter((m) => m.machineId);
+}
+
+export async function exchangeCredentialForSessionJwt({ hub, credential, fetchFn = fetch }) {
+  if (!credential) throw new Error("没有可用的机器凭证。");
+  // The hub only accepts the three-segment auth half; strip the E2EE enckey.
+  const authHalf = credential.split(".").slice(0, 3).join(".");
+  const response = await fetchFn(httpUrl(hub, "/auth/credential"), {
+    method: "POST",
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    headers: {
+      "Content-Type": "application/json",
+      "X-Requested-With": "agentlink",
+    },
+    body: JSON.stringify({ credential: authHalf }),
+  });
+  const body = await json(response);
+  if (!response.ok || typeof body.jwt !== "string" || !body.jwt) {
+    throw new Error(body.error || "凭证换取会话失败。");
+  }
+  return body.jwt;
+}
+
 export async function listAgentLinkAccountMachines({ config, identifier, password, cloudbaseSdk }) {
   if (!config?.cloudbaseEnvId) throw new Error("当前 Hub 尚未配置账号机器目录。");
   const sdk = cloudbaseSdk ?? (await import("@cloudbase/js-sdk")).default;

package/bin/agentlink.js

@@ -9,15 +9,56 @@ import { fileURLToPath } from "node:url";
 import WebSocket from "ws";
 
 import {
+  exchangeCredentialForSessionJwt,
   listAgentLinkAccountMachines,
+  listAgentLinkAccountMachinesFromHub,
   loadAgentLinkAccountConfig,
   registerAgentLinkAccountMachine,
 } from "./agentlink-account.js";
 import { accountCredentials } from "./agentlink-prompts.js";
 
+function savedSessionJwt(hub = OFFICIAL_HUB) {
+  try {
+    const raw = readFileSync(SESSION_FILE, "utf8").trim();
+    if (!raw) return undefined;
+    if (!raw.startsWith("{")) {
+      return normalizeHub(hub) === normalizeHub(OFFICIAL_HUB) ? raw : undefined;
+    }
+    const saved = JSON.parse(raw);
+    return saved.hub === normalizeHub(hub) && typeof saved.jwt === "string" ? saved.jwt : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function saveSessionJwt(jwt, hub = OFFICIAL_HUB) {
+  mkdirSync(STATE_DIR, { recursive: true });
+  writeFileSync(SESSION_FILE, JSON.stringify({ hub: normalizeHub(hub), jwt }), { mode: 0o600 });
+  chmodSync(SESSION_FILE, 0o600);
+}
+
+function clearSessionJwt(hub = OFFICIAL_HUB) {
+  try {
+    const raw = readFileSync(SESSION_FILE, "utf8").trim();
+    if (!raw) {
+      rmSync(SESSION_FILE, { force: true });
+      return;
+    }
+    if (!raw.startsWith("{")) {
+      if (normalizeHub(hub) === normalizeHub(OFFICIAL_HUB)) rmSync(SESSION_FILE, { force: true });
+      return;
+    }
+    const saved = JSON.parse(raw);
+    if (saved.hub === normalizeHub(hub)) rmSync(SESSION_FILE, { force: true });
+  } catch {
+    rmSync(SESSION_FILE, { force: true });
+  }
+}
+
 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 SESSION_FILE = join(STATE_DIR, "session");
 const args = process.argv.slice(2);
 const legacyCredentialCommands = process.env.AGENTLINK_ENABLE_LEGACY_CREDENTIALS === "1";
 const forceTui = process.env.AGENTLINK_TUI === "1";
@@ -44,6 +85,13 @@ function normalizeHub(hub) {
   return url.toString();
 }
 
+function httpUrl(hub, pathname) {
+  const url = new URL(pathname, hub);
+  if (url.protocol === "ws:") url.protocol = "http:";
+  if (url.protocol === "wss:") url.protocol = "https:";
+  return url;
+}
+
 function savedCredential(hub = OFFICIAL_HUB) {
   try {
     const raw = readFileSync(CREDENTIAL_FILE, "utf8").trim();
@@ -108,6 +156,7 @@ async function loginAndCreateCredential(hub, config) {
     machineName: hostname(),
   });
   saveCredential(result.credential, hub);
+  if (result.jwt) saveSessionJwt(result.jwt, hub);
   console.log("[agentlink] 登录成功，这台电脑已加入账号。");
   return result.credential;
 }
@@ -172,15 +221,27 @@ async function showHelp() {
   );
 }
 
+async function showVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+    console.log(pkg.version);
+  } catch {
+    console.log("0.0.0");
+  }
+}
+
 async function showStatus() {
   const hub = value("hub") || OFFICIAL_HUB;
   console.log(`[agentlink] 登录状态：${savedCredential(hub) ? "已登录" : "未登录"}`);
+  console.log(`[agentlink] 会话状态：${savedSessionJwt(hub) ? "已缓存" : "未缓存"}`);
   console.log(`[agentlink] Hub：${normalizeHub(hub)}`);
 }
 
 async function doLogout() {
-  const loggedIn = savedCredential(value("hub") || OFFICIAL_HUB);
+  const hub = value("hub") || OFFICIAL_HUB;
+  const loggedIn = savedCredential(hub);
   if (loggedIn) rmSync(CREDENTIAL_FILE, { force: true });
+  clearSessionJwt(hub);
   console.log(
     loggedIn ? "[agentlink] 已退出账号；下次启动时需要重新登录。" : "[agentlink] 当前未登录。",
   );
@@ -197,20 +258,49 @@ async function doLogin() {
   await loginAndCreateCredential(hub, config);
 }
 
+async function ensureSessionJwt(hub, config) {
+  const jwt = savedSessionJwt(hub);
+  if (jwt) return jwt;
+  console.log("[agentlink] 需要验证 AgentLink 账号密码以获取机器列表。");
+  const { identifier, password } = await accountCredentials();
+  const loginResponse = await fetch(httpUrl(hub, "/auth/password/login"), {
+    method: "POST",
+    signal: AbortSignal.timeout(10_000),
+    headers: { "Content-Type": "application/json", "X-Requested-With": "agentlink" },
+    body: JSON.stringify({ identifier, password, client: "cli" }),
+  });
+  const login = await loginResponse.json().catch(() => ({}));
+  if (!loginResponse.ok || typeof login.jwt !== "string" || !login.jwt) {
+    throw new Error(
+      login.error === "invalid_account_credentials" ? "账号或密码错误。" : login.error || "账号登录失败。",
+    );
+  }
+  saveSessionJwt(login.jwt, hub);
+  return login.jwt;
+}
+
 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 });
+  let jwt = savedSessionJwt(hub);
+  if (!jwt) {
+    const credential = savedCredential(hub);
+    if (credential) {
+      jwt = await exchangeCredentialForSessionJwt({ hub, credential });
+    } else {
+      jwt = await ensureSessionJwt(hub, config);
+    }
+    saveSessionJwt(jwt, hub);
+  }
+  const machines = await listAgentLinkAccountMachinesFromHub({ hub, jwt });
   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})`,
-      );
+      const onlineMarker = machine.online ? "●" : "○";
+      const label = machine.name || machine.hostname || machine.machineId;
+      console.log(`  ${onlineMarker} ${label} (${machine.machineId})`);
     }
   }
 }
@@ -272,6 +362,11 @@ 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.includes("--version") || publicArgs.includes("-v")) {
+    await showVersion();
+    return;
+  }
+
   if (publicArgs[0] === "help" || publicArgs.includes("--help") || publicArgs.includes("-h")) {
     await showHelp();
     return;

package/dist/ui.js

@@ -48519,7 +48519,7 @@ function App2() {
     }
     items.push({ label: "\u67E5\u770B\u72B6\u6001\u8BE6\u60C5", value: "status" });
     items.push({ label: loggedIn ? "\u9000\u51FA\u8D26\u53F7" : "\u767B\u5F55\u8D26\u53F7", value: loggedIn ? "logout" : "login" });
-    items.push({ label: "\u626B\u7801\u914D\u5BF9", value: "pair", disabled: loggedIn });
+    if (!loggedIn) items.push({ label: "\u626B\u7801\u914D\u5BF9", value: "pair" });
     items.push({ label: "\u67E5\u770B\u673A\u5668", value: "machines", disabled: !loggedIn });
     items.push({ label: "\u8BBE\u7F6E", value: "settings" });
     items.push({ label: "\u5E2E\u52A9", value: "help" });
@@ -48892,7 +48892,7 @@ function MachinesView({ onDone }) {
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "Enter \u7EE7\u7EED \xB7 Esc \u53D6\u6D88" })
   ] });
 }
-var invokedByCli = typeof process.argv[1] === "string" && (process.argv[1].endsWith("/bin/agentlink.js") || process.argv[1].endsWith("\\bin\\agentlink.js"));
+var invokedByCli = typeof process.argv[1] === "string" && (/[\/\\](?:bin[\/\\])?agentlink\.js$/.test(process.argv[1]) || /[\/\\]alink-cli$/.test(process.argv[1]) || /[\/\\]agentlink$/.test(process.argv[1]));
 if (invokedByCli) {
   render_default(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {}));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alink-cli",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "一条命令把工作机接入 AgentLink，随时随地遥控本机的编码 agent。One command to link your machine to AgentLink and control your coding agents from anywhere.",
   "keywords": [
     "acp",