alink-cli 0.11.2 → 0.11.3

package/bin/agentlink-account.js

@@ -35,7 +35,7 @@ function normalizeMachineRow(row) {
   };
 }
 
-function machineIdFromToken(authToken) {
+export function machineIdFromToken(authToken) {
   try {
     const payload = JSON.parse(
       Buffer.from(authToken.split(".")[1] || "", "base64url").toString("utf8"),
@@ -60,6 +60,7 @@ export async function registerAgentLinkAccountMachine({
   identifier,
   password,
   machineName,
+  preferredMachineId,
   fetchFn = fetch,
   cloudbaseSdk,
   randomBytesFn = randomBytes,
@@ -89,7 +90,7 @@ export async function registerAgentLinkAccountMachine({
       "Content-Type": "application/json",
       "X-Requested-With": "agentlink",
     },
-    body: JSON.stringify({ name: machineName }),
+    body: JSON.stringify({ name: machineName, ...(preferredMachineId ? { machineId: preferredMachineId } : {}) }),
   });
   const minted = await json(mintResponse);
   const authToken = typeof minted.authToken === "string" ? minted.authToken : "";
@@ -144,6 +145,7 @@ export async function registerAgentLinkSessionMachine({
   hub,
   jwt,
   machineName,
+  preferredMachineId,
   fetchFn = fetch,
   randomBytesFn = randomBytes,
 }) {
@@ -156,10 +158,20 @@ export async function registerAgentLinkSessionMachine({
       "Content-Type": "application/json",
       "X-Requested-With": "agentlink",
     },
-    body: JSON.stringify({ name: machineName, enckey }),
+    body: JSON.stringify({
+      name: machineName,
+      enckey,
+      ...(preferredMachineId ? { machineId: preferredMachineId } : {}),
+    }),
   });
   const minted = await json(response);
-  if (!response.ok || typeof minted.authToken !== "string" || !minted.authToken.startsWith("al1.")) {
+  if (
+    !response.ok ||
+    typeof minted.authToken !== "string" ||
+    !minted.authToken.startsWith("al1.") ||
+    typeof minted.machineId !== "string" ||
+    !minted.machineId
+  ) {
     throw new Error(minted.error || "机器注册失败。");
   }
   return { credential: `${minted.authToken}.${enckey}`, machineId: minted.machineId, jwt };

package/bin/agentlink.js

@@ -14,6 +14,7 @@ import {
   listAgentLinkAccountMachines,
   listAgentLinkAccountMachinesFromHub,
   loadAgentLinkAccountConfig,
+  machineIdFromToken,
   registerAgentLinkAccountMachine,
   registerAgentLinkSessionMachine,
 } from "./agentlink-account.js";
@@ -60,6 +61,7 @@ function clearSessionJwt(hub = OFFICIAL_HUB) {
 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 MACHINE_ID_FILE = join(STATE_DIR, "machine-id");
 const SESSION_FILE = join(STATE_DIR, "session");
 const args = process.argv.slice(2);
 const legacyCredentialCommands = process.env.AGENTLINK_ENABLE_LEGACY_CREDENTIALS === "1";
@@ -118,6 +120,26 @@ function saveCredential(credential, hub = OFFICIAL_HUB) {
   chmodSync(CREDENTIAL_FILE, 0o600);
 }
 
+function savedMachineId(hub = OFFICIAL_HUB) {
+  try {
+    const saved = JSON.parse(readFileSync(MACHINE_ID_FILE, "utf8"));
+    return saved.hub === normalizeHub(hub) && typeof saved.machineId === "string"
+      ? saved.machineId
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function saveMachineId(machineId, hub = OFFICIAL_HUB) {
+  if (!machineId) return;
+  mkdirSync(STATE_DIR, { recursive: true });
+  writeFileSync(MACHINE_ID_FILE, JSON.stringify({ hub: normalizeHub(hub), machineId }), {
+    mode: 0o600,
+  });
+  chmodSync(MACHINE_ID_FILE, 0o600);
+}
+
 function parseCredential(credential) {
   const parts = credential.split(".");
   if (parts.length === 3 && parts[0] === "als1" && parts.slice(1).every(Boolean)) {
@@ -149,17 +171,25 @@ async function createSingleCredential(hub) {
 
 async function loginAndCreateCredential(hub, config) {
   const envLogin = process.env.AGENTLINK_ACCOUNT && process.env.AGENTLINK_PASSWORD;
+  const preferredMachineId = savedMachineId(hub);
   const result = envLogin
     ? await registerAgentLinkAccountMachine({
         hub,
         config,
         ...(await accountCredentials()),
         machineName: hostname(),
+        preferredMachineId,
       })
     : await browserLogin(hub).then((jwt) =>
-        registerAgentLinkSessionMachine({ hub, jwt, machineName: hostname() }),
+        registerAgentLinkSessionMachine({
+          hub,
+          jwt,
+          machineName: hostname(),
+          preferredMachineId,
+        }),
       );
   saveCredential(result.credential, hub);
+  saveMachineId(result.machineId, hub);
   if (result.jwt) saveSessionJwt(result.jwt, hub);
   console.log("[agentlink] 登录成功，这台电脑已加入账号。");
   return result.credential;
@@ -296,7 +326,11 @@ async function showStatus() {
 async function doLogout() {
   const hub = value("hub") || OFFICIAL_HUB;
   const loggedIn = savedCredential(hub);
-  if (loggedIn) rmSync(CREDENTIAL_FILE, { force: true });
+  if (loggedIn) {
+    const { machineToken } = parseCredential(loggedIn);
+    saveMachineId(machineIdFromToken(machineToken), hub);
+    rmSync(CREDENTIAL_FILE, { force: true });
+  }
   clearSessionJwt(hub);
   console.log(
     loggedIn ? "[agentlink] 已退出账号；下次启动时需要重新登录。" : "[agentlink] 当前未登录。",

package/dist/ui.js

@@ -48721,11 +48721,16 @@ function App2() {
         setReconnecting(false);
       }
     } else if (confirmAction.type === "logout") {
-      stopDaemon().catch(() => void 0);
-      clearCredential();
-      setRunning(false);
-      setAuthTick((t) => t + 1);
-      setNotice("\u5DF2\u9000\u51FA\u8D26\u53F7\u5E76\u505C\u6B62 daemon");
+      try {
+        await stopDaemon();
+        const code = await runDetachedScript(["logout", "--hub", cfg.hub]);
+        if (code !== 0) throw new Error(`\u9000\u51FA\u547D\u4EE4\u5F02\u5E38\u7ED3\u675F\uFF08\u9000\u51FA\u7801 ${code}\uFF09`);
+        setRunning(false);
+        setAuthTick((t) => t + 1);
+        setNotice("\u5DF2\u9000\u51FA\u8D26\u53F7\u5E76\u505C\u6B62 daemon");
+      } catch (err) {
+        setNotice(`\u9000\u51FA\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      }
     }
     setView("menu");
     setConfirmAction(null);

package/package.json

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