alink-cli 0.10.2 → 0.11.1

package/README.md

@@ -1,55 +1,27 @@
-# alink-cli
+# AgentLink
 
-在手机或浏览器上，继续使用运行在你自己电脑上的 Claude Code、Codex、Gemini、Qwen、Kimi 等编码 agent。
+AgentLink 让你随时从手机或浏览器继续使用运行在自己电脑上的 Claude Code、Codex、Gemini、Qwen、Kimi 等编码 agent。
 
-> **Local-first：** agent 在你的电脑上运行，项目文件和任务记录保存在本机。AgentLink 只负责加密连接设备，Hub 不保存你的对话。
+**官网：[https://link.harmopath.com/marketing](https://link.harmopath.com/marketing)**
 
-## 三步开始
+## 本地运行，随时继续
 
-需要 Node.js 22.16 或更高版本。
-
-1. 安装 CLI
-
-   ```bash
-   npm install -g alink-cli
-   ```
-
-2. 启动 AgentLink，并按提示登录
-
-   ```bash
-   alink-cli
-   ```
-
-3. 在手机或浏览器打开 [AgentLink 控制台](https://link.harmopath.com/login)
-
-   登录同一个账号，你的电脑会自动出现。选择 agent 和工作目录，就可以开始任务或继续已有工作。
+- **Local-first：** agent、项目文件和任务记录都保存在你的电脑上。
+- **安全连接：** 设备之间端到端加密，Hub 不保存你的对话。
+- **跨设备继续：** 离开电脑后，仍可查看进度、回复消息和处理授权。
+- **一个账号：** 登录后自动发现自己的电脑，无需手动配置连接。
 
-关闭浏览器或锁屏后，任务仍会在你的电脑上继续运行。
+## 开始使用
 
-## Codex 会话衔接
-
-对于已经由 AgentLink 绑定的 Codex 原生会话，AgentLink 会先只读同步 Codex 中的终态消息。Codex 释放写入权后，从 AgentLink 发送的新消息会恢复同一个原生 thread，不会另建分叉会话。
-
-当前不会扫描或自动导入只在 Codex App 中新建、尚未绑定到 AgentLink 的会话；这类会话请先从 AgentLink 新建或绑定后再继续。
-
-## 为什么是 local-first
-
-- **本地运行：** agent 和命令都在你的电脑上执行。
-- **本地保存：** AgentLink 不会把你的项目复制到云端，任务记录保存在本机。
-- **安全连接：** 设备之间端到端加密；Hub 只转发连接，不保存对话内容。
-- **账号隔离：** 只有登录你账号的设备才能看到你的电脑。
-
-## 常用命令
+需要 Node.js 22.16 或更高版本。
 
 ```bash
-alink-cli           # 启动或管理连接
-alink-cli login     # 登录并添加这台电脑
-alink-cli status    # 查看连接状态
-alink-cli machines  # 查看账号下的电脑
-alink-cli logout    # 退出登录
+npm install -g alink-cli
+alink-cli
 ```
 
-## 了解更多
+按提示登录，然后在手机或浏览器打开 [AgentLink 控制台](https://link.harmopath.com/login)，即可开始任务或继续已有工作。
+
+`alink-cli login` 会打开浏览器，支持使用 GitHub 或已有 AgentLink 账号登录并添加当前电脑。
 
-- [完整文档](https://github.com/baichen99/agentlink)
-- [提交问题](https://github.com/baichen99/agentlink/issues)
+[GitHub](https://github.com/baichen99/agentlink) · [提交问题](https://github.com/baichen99/agentlink/issues)

package/bin/agentlink-account.js

@@ -140,6 +140,31 @@ export async function registerAgentLinkAccountMachine({
   }
 }
 
+export async function registerAgentLinkSessionMachine({
+  hub,
+  jwt,
+  machineName,
+  fetchFn = fetch,
+  randomBytesFn = randomBytes,
+}) {
+  const enckey = randomBytesFn(32).toString("base64url");
+  const response = await fetchFn(httpUrl(hub, "/api/machines/mint"), {
+    method: "POST",
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+    headers: {
+      Authorization: `Bearer ${jwt}`,
+      "Content-Type": "application/json",
+      "X-Requested-With": "agentlink",
+    },
+    body: JSON.stringify({ name: machineName, enckey }),
+  });
+  const minted = await json(response);
+  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 };
+}
+
 export async function listAgentLinkAccountMachinesFromHub({ hub, jwt, fetchFn = fetch }) {
   if (!jwt) throw new Error("没有可用的登录会话，请先运行 alink-cli login。");
   const response = await fetchFn(httpUrl(hub, "/api/machines"), {

package/bin/agentlink.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { spawn } from "node:child_process";
 import { randomBytes } from "node:crypto";
+import { createServer } from "node:http";
 import { existsSync } from "node:fs";
 import { chmodSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { hostname, homedir } from "node:os";
@@ -14,6 +15,7 @@ import {
   listAgentLinkAccountMachinesFromHub,
   loadAgentLinkAccountConfig,
   registerAgentLinkAccountMachine,
+  registerAgentLinkSessionMachine,
 } from "./agentlink-account.js";
 import { accountCredentials } from "./agentlink-prompts.js";
 
@@ -146,21 +148,75 @@ async function createSingleCredential(hub) {
 }
 
 async function loginAndCreateCredential(hub, config) {
-  console.log("[agentlink] 首次使用，请登录 AgentLink 账号。");
-  const { identifier, password } = await accountCredentials();
-  const result = await registerAgentLinkAccountMachine({
-    hub,
-    config,
-    identifier,
-    password,
-    machineName: hostname(),
-  });
+  const envLogin = process.env.AGENTLINK_ACCOUNT && process.env.AGENTLINK_PASSWORD;
+  const result = envLogin
+    ? await registerAgentLinkAccountMachine({
+        hub,
+        config,
+        ...(await accountCredentials()),
+        machineName: hostname(),
+      })
+    : await browserLogin(hub).then((jwt) =>
+        registerAgentLinkSessionMachine({ hub, jwt, machineName: hostname() }),
+      );
   saveCredential(result.credential, hub);
   if (result.jwt) saveSessionJwt(result.jwt, hub);
   console.log("[agentlink] 登录成功，这台电脑已加入账号。");
   return result.credential;
 }
 
+async function browserLogin(hub) {
+  const state = randomBytes(24).toString("base64url");
+  return new Promise((resolve, reject) => {
+    const server = createServer((req, res) => {
+      if (req.method !== "POST") {
+        res.writeHead(405).end();
+        return;
+      }
+      let body = "";
+      req.setEncoding("utf8");
+      req.on("data", (chunk) => {
+        body += chunk;
+        if (body.length > 16_384) req.destroy();
+      });
+      req.on("end", () => {
+        const value = new URLSearchParams(body);
+        const jwt = value.get("jwt");
+        if (value.get("state") !== state || !jwt) {
+          res.writeHead(400, { "Content-Type": "text/plain; charset=utf-8" }).end("登录请求无效。");
+          return;
+        }
+        res.writeHead(200, { "Content-Type": "text/plain; charset=utf-8" }).end("登录成功，可以关闭此页面。");
+        clearTimeout(timer);
+        server.close();
+        resolve(jwt);
+      });
+    });
+    const timer = setTimeout(() => {
+      server.close();
+      reject(new Error("浏览器登录超时，请重试。"));
+    }, 10 * 60_000);
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+      if (!address || typeof address === "string") {
+        clearTimeout(timer);
+        server.close();
+        reject(new Error("无法启动本地登录回调。"));
+        return;
+      }
+      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请在浏览器完成 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" });
+      opener.on("error", () => undefined);
+      opener.unref();
+    });
+  });
+}
+
 async function printQr(text) {
   const { renderQr } = await import(new URL("../dist/qr.js", import.meta.url));
   renderQr(text);

package/dist/bin.mjs

@@ -13702,6 +13702,7 @@ const CLAUDE_DRIVER_KIND = ProviderDriverKind.make("claudeAgent");
 const GEMINI_DRIVER_KIND = ProviderDriverKind.make("gemini");
 const QWEN_DRIVER_KIND = ProviderDriverKind.make("qwen");
 const KIMI_DRIVER_KIND = ProviderDriverKind.make("kimi");
+const JOYCODE_DRIVER_KIND = ProviderDriverKind.make("joycode");
 const DEFAULT_MODEL = "gpt-5.6-sol";
 /**
 * Codex default-model preference, most preferred first. The provider snapshot
@@ -13715,7 +13716,8 @@ const DEFAULT_MODEL_BY_PROVIDER = {
 	[CLAUDE_DRIVER_KIND]: "claude-sonnet-5",
 	[GEMINI_DRIVER_KIND]: "gemini-2.5-pro",
 	[QWEN_DRIVER_KIND]: "qwen3-coder-plus",
-	[KIMI_DRIVER_KIND]: "kimi-k2"
+	[KIMI_DRIVER_KIND]: "kimi-k2",
+	[JOYCODE_DRIVER_KIND]: "default"
 };
 /** Per-provider text generation model defaults. */
 const DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER = {
@@ -13723,7 +13725,8 @@ const DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER = {
 	[CLAUDE_DRIVER_KIND]: "claude-haiku-4-5",
 	[GEMINI_DRIVER_KIND]: "gemini-2.5-flash",
 	[QWEN_DRIVER_KIND]: "qwen3-coder-flash",
-	[KIMI_DRIVER_KIND]: "kimi-k2"
+	[KIMI_DRIVER_KIND]: "kimi-k2",
+	[JOYCODE_DRIVER_KIND]: "default"
 };
 const MODEL_SLUG_ALIASES_BY_PROVIDER = {
 	[CODEX_DRIVER_KIND]: {
@@ -13760,7 +13763,8 @@ const MODEL_SLUG_ALIASES_BY_PROVIDER = {
 	},
 	[GEMINI_DRIVER_KIND]: {},
 	[QWEN_DRIVER_KIND]: {},
-	[KIMI_DRIVER_KIND]: {}
+	[KIMI_DRIVER_KIND]: {},
+	[JOYCODE_DRIVER_KIND]: {}
 };
 //#endregion
 //#region ../t3-contracts/src/orchestration.ts
@@ -20758,7 +20762,7 @@ const ClaudeSettings = makeProviderSettingsSchema({
 ] });
 /**
 * Shared shape for ACP-based agents (agentlink fork additions): Gemini CLI,
-* Qwen Code, Kimi CLI. Each only needs an enable switch, a binary path, and
+* Qwen Code, Kimi CLI, JoyCode. Each only needs an enable switch, a binary path, and
 * a custom-model list — everything else is negotiated over ACP at runtime.
 */
 const makeAcpAgentSettingsSchema = (input) => makeProviderSettingsSchema({
@@ -20788,6 +20792,11 @@ const KimiSettings = makeAcpAgentSettingsSchema({
 	binaryTitle: "Binary path",
 	binaryDescription: "Path to the Kimi CLI binary (started with `kimi acp`)."
 });
+const JoyCodeSettings = makeAcpAgentSettingsSchema({
+	binaryFallback: "joycode",
+	binaryTitle: "Binary path",
+	binaryDescription: "Path to the JoyCode CLI binary (started with `joycode app-server`)."
+});
 const ObservabilitySettings = Struct({
 	otlpTracesUrl: TrimmedString.pipe(withDecodingDefault(succeed$1(""))),
 	otlpMetricsUrl: TrimmedString.pipe(withDecodingDefault(succeed$1("")))
@@ -20858,7 +20867,8 @@ const ServerSettings = Struct({
 		claudeAgent: ClaudeSettings.pipe(withDecodingDefault(succeed$1({}))),
 		gemini: GeminiSettings.pipe(withDecodingDefault(succeed$1({}))),
 		qwen: QwenSettings.pipe(withDecodingDefault(succeed$1({}))),
-		kimi: KimiSettings.pipe(withDecodingDefault(succeed$1({})))
+		kimi: KimiSettings.pipe(withDecodingDefault(succeed$1({}))),
+		joycode: JoyCodeSettings.pipe(withDecodingDefault(succeed$1({})))
 	}).pipe(withDecodingDefault(succeed$1({}))),
 	providerInstances: Record(ProviderInstanceId, ProviderInstanceConfig).pipe(withDecodingDefault(succeed$1({}))),
 	observability: ObservabilitySettings.pipe(withDecodingDefault(succeed$1({})))
@@ -20948,7 +20958,8 @@ const ServerSettingsPatch = Struct({
 		claudeAgent: optionalKey(ClaudeSettingsPatch),
 		gemini: optionalKey(AcpAgentSettingsPatch),
 		qwen: optionalKey(AcpAgentSettingsPatch),
-		kimi: optionalKey(AcpAgentSettingsPatch)
+		kimi: optionalKey(AcpAgentSettingsPatch),
+		joycode: optionalKey(AcpAgentSettingsPatch)
 	})),
 	providerInstances: optionalKey(Record(ProviderInstanceId, ProviderInstanceConfig))
 });
@@ -53573,8 +53584,9 @@ const runHubTunnel = (config) => gen(function* () {
 			}
 		}, { onOpen: logInfo("hub tunnel: connected to hub").pipe(tap(() => sync(() => void runFork(upload)))) }).pipe(tapDefect((cause) => logWarning$1("hub tunnel: hub socket defect", { cause: String(cause) })));
 		yield* logWarning$1("hub tunnel: hub connection closed");
+		return yield* fail(/* @__PURE__ */ new Error("hub tunnel closed"));
 	}).pipe(scoped, tapError((error) => logWarning$1("hub tunnel: connection error", { error }))), {
-		schedule: spaced("2 seconds"),
+		schedule: spaced("500 millis"),
 		while: (error) => !(SocketError.is(error) && error.reason._tag === "SocketCloseError" && (error.reason.code === 4401 || error.reason.code === 4403))
 	});
 }).pipe(tapDefect((cause) => logError("hub tunnel: worker defect", { cause: String(cause) })), catchCause((cause) => logError("hub tunnel: worker failed", { cause: String(cause) })));
@@ -86686,7 +86698,7 @@ const makeAcpNativeLoggerFactory = fn("makeAcpNativeLoggerFactory")(function* ()
 //#region src/provider/Layers/AcpAgentAdapter.ts
 /**
 * AcpAgentAdapter — generic `ProviderAdapter` over `AcpSessionRuntime` for
-* the fork's ACP CLIs (Gemini / Qwen / Kimi).
+* the fork's ACP CLIs (Gemini / Qwen / Kimi / JoyCode).
 *
 * Ported from the upstream `GrokAdapter`, minus the Grok-specific pieces the
 * fork doesn't need: the MCP provider-session bridge (the `mcp/` subsystem
@@ -86697,7 +86709,7 @@ const makeAcpNativeLoggerFactory = fn("makeAcpNativeLoggerFactory")(function* ()
 * cursors.
 *
 * One instance of this adapter is created per provider instance by the
-* driver (`Drivers/<X>Driver.ts`); behavior differences between the three
+* driver (`Drivers/<X>Driver.ts`); behavior differences between the
 * CLIs live entirely in their `AcpAgentDescriptor`.
 *
 * @module provider/Layers/AcpAgentAdapter
@@ -87543,8 +87555,27 @@ function buildDiscoveredModelsFromSessionModelState(descriptor, modelState) {
 		};
 	}).filter((model) => model !== void 0);
 }
+function buildDiscoveredAcpAgentModels(descriptor, sessionSetupResult) {
+	const models = buildDiscoveredModelsFromSessionModelState(descriptor, sessionSetupResult.models);
+	if (models.length > 0) return models;
+	const modelConfig = sessionSetupResult.configOptions?.find((option) => option.category === "model" && option.type === "select");
+	if (!modelConfig || modelConfig.type !== "select") return [];
+	const options = modelConfig.options.flatMap((entry) => "value" in entry ? [entry] : entry.options);
+	const seen = /* @__PURE__ */ new Set();
+	return options.map((option) => {
+		const slug = resolveAcpAgentModelId(descriptor, option.value);
+		if (!slug || seen.has(slug)) return;
+		seen.add(slug);
+		return {
+			slug,
+			name: option.name.trim() || slug,
+			isCustom: false,
+			capabilities: EMPTY_CAPABILITIES
+		};
+	}).filter((model) => model !== void 0);
+}
 const discoverModelsViaAcp = (descriptor, settings, environment = process.env) => gen(function* () {
-	return buildDiscoveredModelsFromSessionModelState(descriptor, (yield* (yield* makeAcpAgentRuntime(descriptor, {
+	return buildDiscoveredAcpAgentModels(descriptor, (yield* (yield* makeAcpAgentRuntime(descriptor, {
 		settings,
 		environment,
 		childProcessSpawner: yield* ChildProcessSpawner,
@@ -87553,7 +87584,7 @@ const discoverModelsViaAcp = (descriptor, settings, environment = process.env) =
 			name: "agentlink-provider-probe",
 			version: "0.0.0"
 		}
-	})).start()).sessionSetupResult.models);
+	})).start()).sessionSetupResult);
 }).pipe(scoped);
 const runVersionCommand = (descriptor, settings, environment = process.env) => gen(function* () {
 	const command = settings.binaryPath.trim() || descriptor.defaultBinary;
@@ -87594,7 +87625,7 @@ const checkAcpAgentProviderStatus = (descriptor, settings, environment = process
 				version: null,
 				status: "error",
 				auth: { status: "unknown" },
-				message: isCommandMissingCause(error) ? `${descriptor.displayName} (\`${descriptor.defaultBinary}\`) is not installed or not on PATH.` : `Failed to execute ${descriptor.displayName} health check.`
+				message: isCommandMissingCause(error) ? descriptor.missingBinaryMessage ?? `${descriptor.displayName} (\`${descriptor.defaultBinary}\`) is not installed or not on PATH.` : `Failed to execute ${descriptor.displayName} health check.`
 			}
 		});
 	}
@@ -87796,6 +87827,41 @@ const GeminiDriver = makeAcpAgentDriver({
 	defaultConfig: () => decodeGeminiSettings({})
 });
 //#endregion
+//#region src/provider/acp/JoyCodeAcpAgent.ts
+/**
+* JoyCodeAcpAgent — descriptor for JoyCode CLI. `joycode app-server` starts
+* its ACP server over stdio.
+*
+* JoyCode 1.0.1 advertises both `loadSession` and `session/resume`, but its
+* `session/load` response is currently JSON-RPC `null`. daemon-t3 decodes
+* that response as an ACP LoadSessionResponse object, so the probe driver
+* deliberately starts fresh until that compatibility boundary is resolved.
+*
+* @module provider/acp/JoyCodeAcpAgent
+*/
+const JoyCodeAcpAgent = {
+	provider: ProviderDriverKind.make("joycode"),
+	displayName: "JoyCode",
+	defaultBinary: "joycode",
+	acpArgs: ["app-server"],
+	defaultModel: "default",
+	builtInModels: ["default"],
+	missingBinaryMessage: "请安装 joycode-cli，参考内部文档。",
+	supportsSessionLoad: false
+};
+//#endregion
+//#region src/provider/Drivers/JoyCodeDriver.ts
+/** JoyCodeDriver — JoyCode CLI (`joycode app-server`) via generic ACP. */
+const decodeJoyCodeSettings = decodeSync(JoyCodeSettings);
+const JoyCodeDriver = makeAcpAgentDriver({
+	driver: {
+		descriptor: JoyCodeAcpAgent,
+		npmPackageName: "@joycode/joycode-cli"
+	},
+	configSchema: JoyCodeSettings,
+	defaultConfig: () => decodeJoyCodeSettings({})
+});
+//#endregion
 //#region src/provider/acp/KimiAcpAgent.ts
 /**
 * KimiAcpAgent — descriptor for the Kimi CLI (Kimi Code CLI, Moonshot),
@@ -87885,7 +87951,7 @@ const decodeQwenSettings = decodeSync(QwenSettings);
 * satisfy it.
 *
 * agentlink fork: Cursor/Grok/OpenCode drivers were removed; ACP-based
-* drivers (Gemini/Qwen/Kimi) land here on top of `acp/AcpSessionRuntime.ts`.
+* drivers (Gemini/Qwen/Kimi/JoyCode) land here on top of `acp/AcpSessionRuntime.ts`.
 *
 * @module provider/builtInDrivers
 */
@@ -87906,7 +87972,8 @@ const BUILT_IN_DRIVERS = [
 		configSchema: QwenSettings,
 		defaultConfig: () => decodeQwenSettings({})
 	}),
-	KimiDriver
+	KimiDriver,
+	JoyCodeDriver
 ];
 //#endregion
 //#region src/provider/Services/ProviderInstanceRegistryMutator.ts
@@ -89460,7 +89527,7 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, gen
 	});
 	const reconcileThread = (threadId, options) => withThreadLock(threadId, reconcileThreadUnlocked(threadId, options)).pipe(mapError((cause) => cause instanceof ProviderRuntimeReconciliationError ? cause : new ProviderRuntimeReconciliationError({
 		threadId,
-		detail: cause instanceof Error ? cause.message : "Provider snapshot sync failed.",
+		detail: cause instanceof Error && cause.message.toLowerCase().includes("active writer") ? "对话正在另一端运行，请等待另一端结束后再继续。" : cause instanceof Error ? cause.message : "Provider snapshot sync failed.",
 		cause
 	})));
 	const processDomainEvent = (_event) => void_$1;