alink-cli 0.11.8 → 0.11.10

package/README.md

@@ -24,4 +24,6 @@ alink
 
 `alink login` 会打开浏览器，支持使用 GitHub 或已有 AgentLink 账号登录并添加当前电脑。原命令 `alink-cli` 继续可用。
 
+脚本或排障时可用 `alink status --json` 和 `alink machines --json` 获取结构化的本机连接状态与账号机器数据。daemon 在网络中断、电脑唤醒或 Hub 更新后会自动退避重连，无需手动重启。
+
 [GitHub](https://github.com/baichen99/agentlink) · [提交问题](https://github.com/baichen99/agentlink/issues)

package/bin/agentlink-account.js

@@ -185,9 +185,13 @@ export async function listAgentLinkAccountMachinesFromHub({ hub, jwt, fetchFn =
     online: row.online === true,
     name: typeof row.name === "string" ? row.name : undefined,
     hostname: typeof row.hostname === "string" ? row.hostname : undefined,
+    daemonVersion: typeof row.daemonVersion === "string" ? row.daemonVersion : undefined,
     connectedAt: timestamp(row.connectedAt),
     createdAt: timestamp(row.createdAt),
     updatedAt: timestamp(row.updatedAt),
+    dirs: Array.isArray(row.dirs) ? row.dirs.filter((dir) => typeof dir === "string") : undefined,
+    agents: Array.isArray(row.agents) ? row.agents.filter((agent) => typeof agent === "string") : undefined,
+    e2e: typeof row.e2e === "boolean" ? row.e2e : undefined,
   })).filter((m) => m.machineId);
 }
 

package/bin/agentlink.js

@@ -137,15 +137,20 @@ async function createSingleCredential(hub) {
   const enckey = randomBytes(32).toString("base64url");
   const credential = `als1.${token}.${enckey}`;
   saveCredential(credential, hub);
+  await printSingleCredential(credential, hub, true);
+  return credential;
+}
+
+async function printSingleCredential(credential, hub, qr = false) {
+  const { machineToken: token, enckey } = parseCredential(credential);
   const url = new URL("/pair", hub);
   if (url.protocol === "ws:") url.protocol = "http:";
   if (url.protocol === "wss:") url.protocol = "https:";
   url.searchParams.set("token", token);
   url.hash = new URLSearchParams({ enckey }).toString();
-  console.log("\n在 AgentLink 网页扫码，或打开下面的链接：\n");
-  await printQr(credential);
+  console.log("\n在 AgentLink 网页打开下面的本机配对链接：\n");
+  if (qr) await printQr(credential);
   console.log(`\n${url}\n`);
-  return credential;
 }
 
 async function loginAndCreateCredential(hub, config) {
@@ -187,7 +192,9 @@ async function browserLogin(hub) {
           res.writeHead(400, { "Content-Type": "text/plain; charset=utf-8" }).end("登录请求无效。");
           return;
         }
-        res.writeHead(200, { "Content-Type": "text/plain; charset=utf-8" }).end("登录成功，可以关闭此页面。");
+        res
+          .writeHead(200, { "Content-Type": "text/plain; charset=utf-8" })
+          .end("登录成功，可以关闭此页面。");
         clearTimeout(timer);
         server.close();
         resolve(jwt);
@@ -209,8 +216,10 @@ async function browserLogin(hub) {
       url.searchParams.set("cli_callback", `http://127.0.0.1:${address.port}/callback`);
       url.searchParams.set("cli_state", state);
       console.log(`\n请在浏览器完成 AgentLink 账号验证：\n${url}\n`);
-      const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
-      const commandArgs = process.platform === "win32" ? ["/c", "start", "", url.toString()] : [url.toString()];
+      const command =
+        process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
+      const commandArgs =
+        process.platform === "win32" ? ["/c", "start", "", url.toString()] : [url.toString()];
       const opener = spawn(command, commandArgs, { detached: true, stdio: "ignore" });
       opener.on("error", () => undefined);
       opener.unref();
@@ -274,7 +283,7 @@ async function pair(hub) {
 
 async function showHelp() {
   console.log(
-    `用法:\n  alink-cli                 打开 AgentLink\n  alink-cli login           登录账号\n  alink-cli status          查看连接状态\n  alink-cli machines        查看账号下的机器\n  alink-cli logout          退出账号\n  alink-cli help            查看帮助`,
+    `用法:\n  alink-cli                 打开 AgentLink\n  alink-cli login           登录账号\n  alink-cli status [--json] 查看连接状态\n  alink-cli machines [--json] 查看账号下的机器\n  alink-cli logout          退出账号\n  alink-cli help            查看帮助`,
   );
 }
 
@@ -306,11 +315,22 @@ async function showStatus() {
   }
   const statusMatchesHub =
     typeof status.hub !== "string" || normalizeHub(status.hub) === normalizeHub(hub);
-  const hubStatus = !running || !statusMatchesHub
-    ? "未连接"
-    : status.hubConnected
-      ? "已连接"
-      : "连接中";
+  const hubStatus =
+    !running || !statusMatchesHub ? "未连接" : status.hubConnected ? "已连接" : "连接中";
+  if (args.includes("--json")) {
+    console.log(JSON.stringify({
+      loggedIn: Boolean(savedCredential(hub)),
+      running,
+      hubConnected: hubStatus === "已连接",
+      hubStatus,
+      hub: normalizeHub(hub),
+      ...(typeof status.machineId === "string" ? { machineId: status.machineId } : {}),
+      ...(typeof status.daemonVersion === "string" ? { daemonVersion: status.daemonVersion } : {}),
+      ...(typeof status.startedAt === "number" ? { startedAt: status.startedAt } : {}),
+      ...(typeof status.ts === "number" ? { updatedAt: status.ts } : {}),
+    }, null, 2));
+    return;
+  }
   console.log(`[agentlink] 登录状态：${savedCredential(hub) ? "已登录" : "未登录"}`);
   console.log(`[agentlink] 本机服务：${running ? "运行中" : "已停止"}`);
   console.log(`[agentlink] Hub 连接：${hubStatus}`);
@@ -351,7 +371,9 @@ async function ensureSessionJwt(hub, config) {
   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 || "账号登录失败。",
+      login.error === "invalid_account_credentials"
+        ? "账号或密码错误。"
+        : login.error || "账号登录失败。",
     );
   }
   saveSessionJwt(login.jwt, hub);
@@ -373,13 +395,21 @@ async function doMachines() {
     saveSessionJwt(jwt, hub);
   }
   const machines = await listAgentLinkAccountMachinesFromHub({ hub, jwt });
+  if (args.includes("--json")) {
+    console.log(JSON.stringify(machines, null, 2));
+    return;
+  }
   if (machines.length === 0) console.log("[agentlink] 账号下还没有机器。");
   else {
     console.log(`[agentlink] 账号下共 ${machines.length} 台机器：`);
     for (const machine of machines) {
       const onlineMarker = machine.online ? "●" : "○";
       const label = machine.name || machine.hostname || machine.machineId;
-      console.log(`  ${onlineMarker} ${label} (${machine.machineId})`);
+      const details = [
+        machine.daemonVersion ? `v${machine.daemonVersion}` : undefined,
+        machine.connectedAt ? `连接于 ${new Date(machine.connectedAt).toLocaleString()}` : undefined,
+      ].filter(Boolean).join(" · ");
+      console.log(`  ${onlineMarker} ${label} (${machine.machineId})${details ? ` · ${details}` : ""}`);
     }
   }
 }
@@ -392,18 +422,18 @@ async function doLegacy() {
 async function doNoTuiStart() {
   const hub = value("hub") || OFFICIAL_HUB;
   const explicit = value("token") || process.env.AGENTLINK_TOKEN;
+  const stored = !args.includes("--pair") ? savedCredential(hub) : undefined;
   const config =
-    explicit || savedCredential(hub) || args.includes("--pair")
-      ? null
-      : await loadAgentLinkAccountConfig(hub);
+    explicit || stored || args.includes("--pair") ? null : await loadAgentLinkAccountConfig(hub);
   const credential =
     explicit ||
-    (!args.includes("--pair") && savedCredential(hub)) ||
+    stored ||
     (args.includes("--pair")
       ? await pair(hub)
       : config?.mode === "multi"
         ? await loginAndCreateCredential(hub, config)
         : await createSingleCredential(hub));
+  if (!explicit && stored?.startsWith("als1.")) await printSingleCredential(stored, hub);
   if (explicit && explicit !== savedCredential(hub)) saveCredential(explicit, hub);
   if (!explicit && !args.includes("--pair")) console.log("[agentlink] 正在让这台电脑上线。");
   const { machineToken, enckey } = parseCredential(credential);
@@ -478,7 +508,8 @@ async function main() {
     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 === "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;
@@ -486,7 +517,9 @@ async function main() {
 
   if (publicArgs[0] === "qr" && legacyCredentialCommands) {
     const credential =
-      value("token") || process.env.AGENTLINK_TOKEN || savedCredential(value("hub") || OFFICIAL_HUB);
+      value("token") ||
+      process.env.AGENTLINK_TOKEN ||
+      savedCredential(value("hub") || OFFICIAL_HUB);
     if (!credential) throw new Error("这台电脑还没有凭证，请先运行 npx alink-cli 完成配对。");
     await printQr(credential);
     return;