alink-cli 0.11.4 → 0.11.5

package/README.md

@@ -22,6 +22,6 @@ alink-cli
 
 按提示登录，然后在手机或浏览器打开 [AgentLink 控制台](https://link.harmopath.com/login)，即可开始任务或继续已有工作。
 
-`alink-cli login` 会打开浏览器，支持使用 GitHub 或已有 AgentLink 账号登录并添加当前电脑；同一账号重新链接时会复用本机已有机器身份，不会重复添加。本机身份文件已经丢失时，用 `alink-cli relink` 选择账号下已有的离线机器。
+`alink-cli login` 会打开浏览器，支持使用 GitHub 或已有 AgentLink 账号登录并添加当前电脑。
 
 [GitHub](https://github.com/baichen99/agentlink) · [提交问题](https://github.com/baichen99/agentlink/issues)

package/bin/agentlink-account.js

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

package/bin/agentlink-prompts.js

@@ -58,30 +58,3 @@ export async function accountCredentials() {
   if (!identifier || !password) throw new Error("账号和密码不能为空。");
   return { identifier, password };
 }
-
-export async function chooseExistingMachine(machines, questionFn) {
-  const available = machines.filter((machine) => !machine.online);
-  if (available.length === 0) return undefined;
-
-  process.stdout.write("\n发现账号下已有的离线机器：\n");
-  for (const [index, machine] of available.entries()) {
-    const label = machine.name || machine.hostname || machine.machineId;
-    process.stdout.write(`  ${index + 1}. ${label} (${machine.machineId})\n`);
-  }
-  process.stdout.write("  0. 这是新机器\n");
-
-  let readline;
-  const ask = questionFn ?? (async (label) => {
-    readline = createInterface({ input: process.stdin, output: process.stdout });
-    return readline.question(label);
-  });
-  try {
-    const answer = (await ask("选择要重新链接的机器 [0]：")).trim();
-    if (!answer || answer === "0") return undefined;
-    const selected = available[Number(answer) - 1];
-    if (!selected || !/^\d+$/.test(answer)) throw new Error("机器选择无效，请重新登录。");
-    return selected.machineId;
-  } finally {
-    readline?.close();
-  }
-}

package/bin/agentlink.js

@@ -14,11 +14,10 @@ import {
   listAgentLinkAccountMachines,
   listAgentLinkAccountMachinesFromHub,
   loadAgentLinkAccountConfig,
-  machineIdFromToken,
   registerAgentLinkAccountMachine,
   registerAgentLinkSessionMachine,
 } from "./agentlink-account.js";
-import { accountCredentials, chooseExistingMachine } from "./agentlink-prompts.js";
+import { accountCredentials } from "./agentlink-prompts.js";
 
 function savedSessionJwt(hub = OFFICIAL_HUB) {
   try {
@@ -61,7 +60,6 @@ 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";
@@ -120,26 +118,6 @@ 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)) {
@@ -171,31 +149,17 @@ async function createSingleCredential(hub) {
 
 async function loginAndCreateCredential(hub, config) {
   const envLogin = process.env.AGENTLINK_ACCOUNT && process.env.AGENTLINK_PASSWORD;
-  let preferredMachineId = savedMachineId(hub);
-  let result;
-  if (envLogin) {
-    result = await registerAgentLinkAccountMachine({
+  const result = envLogin
+    ? await registerAgentLinkAccountMachine({
         hub,
         config,
         ...(await accountCredentials()),
         machineName: hostname(),
-        preferredMachineId,
-      });
-  } else {
-    const jwt = await browserLogin(hub);
-    if (!preferredMachineId && process.stdin.isTTY) {
-      const machines = await listAgentLinkAccountMachinesFromHub({ hub, jwt });
-      preferredMachineId = await chooseExistingMachine(machines);
-    }
-    result = await registerAgentLinkSessionMachine({
-      hub,
-      jwt,
-      machineName: hostname(),
-      preferredMachineId,
-    });
-  }
+      })
+    : await browserLogin(hub).then((jwt) =>
+        registerAgentLinkSessionMachine({ hub, jwt, machineName: hostname() }),
+      );
   saveCredential(result.credential, hub);
-  saveMachineId(result.machineId, hub);
   if (result.jwt) saveSessionJwt(result.jwt, hub);
   console.log("[agentlink] 登录成功，这台电脑已加入账号。");
   return result.credential;
@@ -243,7 +207,7 @@ async function browserLogin(hub) {
       const url = httpUrl(hub, "/login");
       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`);
+      console.log(`\n请在浏览器完成 GitHub 登录：\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 opener = spawn(command, commandArgs, { detached: true, stdio: "ignore" });
@@ -309,7 +273,7 @@ async function pair(hub) {
 
 async function showHelp() {
   console.log(
-    `用法:\n  alink-cli                 进入交互式 TUI（默认）\n  alink-cli --no-tui        跳过 TUI，按旧行为启动 daemon\n  alink-cli login           登录账号\n  alink-cli relink          选择账号下已有的离线机器身份\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  --machine <machineId>     指定要重新链接的已有机器\n  --no-tui                  禁用交互式 TUI`,
+    `用法:\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`,
   );
 }
 
@@ -332,11 +296,7 @@ async function showStatus() {
 async function doLogout() {
   const hub = value("hub") || OFFICIAL_HUB;
   const loggedIn = savedCredential(hub);
-  if (loggedIn) {
-    const { machineToken } = parseCredential(loggedIn);
-    saveMachineId(machineIdFromToken(machineToken), hub);
-    rmSync(CREDENTIAL_FILE, { force: true });
-  }
+  if (loggedIn) rmSync(CREDENTIAL_FILE, { force: true });
   clearSessionJwt(hub);
   console.log(
     loggedIn ? "[agentlink] 已退出账号；下次启动时需要重新登录。" : "[agentlink] 当前未登录。",
@@ -401,49 +361,6 @@ async function doMachines() {
   }
 }
 
-async function doRelink() {
-  const hub = value("hub") || OFFICIAL_HUB;
-  const config = await loadAgentLinkAccountConfig(hub);
-  if (config?.mode !== "multi") throw new Error("当前 Hub 不使用账号机器目录。");
-  const credential = savedCredential(hub);
-  if (!credential) throw new Error("请先运行 alink-cli login 登录账号。");
-  const jwt = savedSessionJwt(hub) || await exchangeCredentialForSessionJwt({ hub, credential });
-  saveSessionJwt(jwt, hub);
-  const currentMachineId = machineIdFromToken(parseCredential(credential).machineToken);
-  const machines = await listAgentLinkAccountMachinesFromHub({ hub, jwt });
-  const candidates = machines.filter((machine) => machine.machineId !== currentMachineId);
-  const requested = value("machine");
-  let target;
-  if (requested) {
-    const matches = candidates.filter((machine) =>
-      machine.machineId === requested || machine.name === requested || machine.hostname === requested
-    );
-    if (matches.length !== 1) throw new Error("未找到唯一匹配的已有机器，请运行 alink-cli machines 查看 machineId。");
-    [target] = matches;
-  } else {
-    const selected = await chooseExistingMachine(candidates);
-    target = candidates.find((machine) => machine.machineId === selected);
-  }
-  if (!target) {
-    console.log("[agentlink] 未更改机器身份。");
-    return;
-  }
-  if (target.online) throw new Error("目标机器当前在线；为避免替换另一台 daemon，本次未重新链接。");
-
-  const result = await registerAgentLinkSessionMachine({
-    hub,
-    jwt,
-    machineName: hostname(),
-    preferredMachineId: target.machineId,
-  });
-  if (result.machineId !== target.machineId) throw new Error("Hub 未复用所选机器身份，本次未保存凭证。");
-  saveCredential(result.credential, hub);
-  saveMachineId(result.machineId, hub);
-  console.log(
-    `[agentlink] 已选择已有机器 ${target.name || target.hostname || target.machineId}。重新启动 daemon 后生效；旧对话仍保存在本机。`,
-  );
-}
-
 async function doLegacy() {
   process.argv = process.argv.filter((arg) => arg !== "--legacy");
   await import(new URL("../dist/daemon.js", import.meta.url));
@@ -527,11 +444,6 @@ async function main() {
     return;
   }
 
-  if (publicArgs[0] === "relink") {
-    await doRelink();
-    return;
-  }
-
   if (publicArgs[0] === "machines") {
     await doMachines();
     return;

package/dist/bin.mjs

@@ -84880,8 +84880,18 @@ const makeAcpPatchedProtocol = fn("makeAcpPatchedProtocol")(function* (options)
 function isProtocolError(value) {
 	return typeof value === "object" && value !== null && "code" in value && typeof value.code === "number" && "message" in value && typeof value.message === "string";
 }
-//#endregion
-//#region ../effect-acp/src/rpc.ts
+const PromptResponseCompat = Union([PromptResponse, Struct({
+	_meta: optionalKey(NullOr(Record(String$1, Unknown))),
+	stopReason: Literal(""),
+	usage: optionalKey(NullOr(Usage)),
+	userMessageId: optionalKey(NullOr(String$1))
+})]).pipe(decodeTo(toType(PromptResponse), transform$1({
+	decode: (response) => response.stopReason === "" ? {
+		...response,
+		stopReason: "end_turn"
+	} : response,
+	encode: (response) => response
+})));
 const InitializeRpc = make$52(AGENT_METHODS.initialize, {
 	payload: InitializeRequest,
 	success: InitializeResponse,
@@ -84929,7 +84939,7 @@ const CloseSessionRpc = make$52(AGENT_METHODS.session_close, {
 });
 const PromptRpc = make$52(AGENT_METHODS.session_prompt, {
 	payload: PromptRequest,
-	success: PromptResponse,
+	success: PromptResponseCompat,
 	error: Error$1
 });
 const SetSessionModelRpc = make$52(AGENT_METHODS.session_set_model, {