alink-cli 0.11.11 → 0.11.13

package/README.md

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

package/bin/agentlink.js

@@ -62,6 +62,7 @@ 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 STATUS_FILE = join(STATE_DIR, "status.json");
+const CLI_VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
 const args = process.argv.slice(2);
 const legacyCredentialCommands = process.env.AGENTLINK_ENABLE_LEGACY_CREDENTIALS === "1";
 const forceTui = process.env.AGENTLINK_TUI === "1";
@@ -446,6 +447,7 @@ async function doNoTuiStart() {
       T3CODE_HUB_URL: hub,
       T3CODE_HUB_MACHINE_TOKEN: machineToken,
       T3CODE_HUB_ENCKEY: enckey,
+      AGENTLINK_CLI_VERSION: CLI_VERSION,
     },
   });
   for (const signal of ["SIGINT", "SIGTERM"]) process.on(signal, () => child.kill(signal));

package/dist/bin.mjs

@@ -52047,6 +52047,9 @@ var PtyAdapter = class extends Service$2()("t3/terminal/PtyAdapter") {};
 //#region src/terminal/Manager.ts
 const DEFAULT_COLS = 120;
 const DEFAULT_ROWS = 30;
+function terminalLocale(environment, platform) {
+	return environment.LC_ALL ?? environment.LC_CTYPE ?? environment.LANG ?? (platform === "darwin" ? "en_US.UTF-8" : "C.UTF-8");
+}
 var TerminalManager = class extends Service$2()("agentlink/terminal/TerminalManager") {};
 function sessionKey(threadId, terminalId) {
 	return `${threadId}\0${terminalId}`;
@@ -52155,7 +52158,11 @@ const layer$7 = effect(TerminalManager, gen(function* () {
 				env: {
 					...process.env,
 					...session.env,
-					TERM: "xterm-256color"
+					TERM: "xterm-256color",
+					LANG: terminalLocale({
+						...process.env,
+						...session.env
+					}, process.platform)
 				}
 			}));
 			if (result$1._tag === "Success") {
@@ -53292,6 +53299,12 @@ function hubHttpUrl(hub) {
 	url.hash = "";
 	return url.toString().replace(/\/$/, "");
 }
+function hubRegistration(cliVersion) {
+	return cliVersion ? {
+		type: "register",
+		daemonVersion: cliVersion
+	} : null;
+}
 function writeHubConnectionStatus(config, connected, stateDir = process.env.AGENTLINK_STATE_DIR || join(homedir(), ".agentlink")) {
 	try {
 		mkdirSync(stateDir, { recursive: true });
@@ -53306,6 +53319,7 @@ function writeHubConnectionStatus(config, connected, stateDir = process.env.AGEN
 			state: connected ? "connected" : "reconnecting",
 			hub: config.hubUrl,
 			hubConnected: connected,
+			...process.env.AGENTLINK_CLI_VERSION ? { daemonVersion: process.env.AGENTLINK_CLI_VERSION } : {},
 			machineId: machineIdFromToken(config.machineToken) ?? void 0,
 			startedAt: typeof current.startedAt === "number" ? current.startedAt : Date.now(),
 			ts: Date.now()
@@ -53714,7 +53728,10 @@ const runHubTunnel = (config) => gen(function* () {
 				else dropTunnel(framed.tunnelId);
 				return;
 			}
-		}, { onOpen: logInfo("hub tunnel: connected to hub").pipe(tap(() => sync(() => writeHubConnectionStatus(config, true))), tap(() => sync(() => void runFork(upload)))) }).pipe(ensuring(sync(() => writeHubConnectionStatus(config, false))), tapDefect((cause) => logWarning$1("hub tunnel: hub socket defect", { cause: String(cause) })));
+		}, { onOpen: logInfo("hub tunnel: connected to hub").pipe(tap(() => sync(() => {
+			const registration = hubRegistration(process.env.AGENTLINK_CLI_VERSION);
+			if (registration) writeHub(JSON.stringify(registration));
+		})), tap(() => sync(() => writeHubConnectionStatus(config, true))), tap(() => sync(() => void runFork(upload)))) }).pipe(ensuring(sync(() => writeHubConnectionStatus(config, false))), 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 }))), {
@@ -88871,6 +88888,9 @@ effect(RuntimeReceiptBus, makeRuntimeReceiptBusTest);
 //#region src/orchestration/Layers/ProviderRuntimeIngestion.ts
 const providerTurnKey = (threadId, turnId) => `${threadId}:${turnId}`;
 const providerTaskKey = (threadId, taskId) => `${threadId}:${taskId}`;
+function providerReconciliationFailureDetail(cause) {
+	return cause instanceof Error && cause.message.toLowerCase().includes("active writer") ? "对话正在另一端运行，请等待另一端结束后再继续。" : cause instanceof Error ? cause.message : "Provider snapshot sync failed.";
+}
 function findTaskTitleInActivities(activities, taskId) {
 	if (!activities) return;
 	for (let index = activities.length - 1; index >= 0; index -= 1) {
@@ -89880,7 +89900,9 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, gen
 	});
 	const reconcileThreadUnlocked = fn("reconcileThreadUnlocked")(function* (threadId, options) {
 		const thread = yield* resolveThreadShell(threadId);
-		if (!thread || thread.session?.providerName !== ProviderDriverKind.make("codex")) return;
+		if (!thread) return;
+		const session = thread.session;
+		if (session?.providerName !== ProviderDriverKind.make("codex")) return;
 		const snapshot = yield* providerService.readThread(threadId);
 		for (const turn of snapshot.turns) {
 			const existing = getOrUndefined(yield* projectionTurnRepository.getByTurnId({
@@ -89892,7 +89914,7 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, gen
 			if (isTerminal) {
 				const pendingTurnStart = yield* projectionTurnRepository.getPendingTurnStartByThreadId({ threadId });
 				if (!(existing?.pendingMessageId !== null && existing?.pendingMessageId !== void 0 ? true : isSome(pendingTurnStart))) {
-					const createdAt = turn.startedAt ?? turn.runtimeEvents?.[0]?.createdAt ?? thread.session.updatedAt;
+					const createdAt = turn.startedAt ?? turn.runtimeEvents?.[0]?.createdAt ?? session.updatedAt;
 					const providerThreadId = snapshot.providerThreadId ?? String(threadId);
 					for (const userMessage of turn.userMessages ?? []) yield* orchestrationEngine.dispatch({
 						type: "thread.message.user.import",
@@ -89912,11 +89934,27 @@ const ProviderRuntimeIngestionLive = effect(ProviderRuntimeIngestionService, gen
 			});
 		}
 		if (options?.requireWritable !== true) return;
-		yield* providerService.ensureSession(threadId);
+		yield* providerService.ensureSession(threadId).pipe(tapError((cause) => gen(function* () {
+			const updatedAt = formatIso(yield* now$1);
+			const detail = providerReconciliationFailureDetail(cause);
+			yield* orchestrationEngine.dispatch({
+				type: "thread.session.set",
+				commandId: CommandId.make(`provider-writer-acquisition:${threadId}:${yield* crypto.randomUUIDv4}`),
+				threadId,
+				session: {
+					...session,
+					status: "error",
+					activeTurnId: null,
+					lastError: detail,
+					updatedAt
+				},
+				createdAt: updatedAt
+			});
+		})));
 	});
 	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.toLowerCase().includes("active writer") ? "对话正在另一端运行，请等待另一端结束后再继续。" : cause instanceof Error ? cause.message : "Provider snapshot sync failed.",
+		detail: providerReconciliationFailureDetail(cause),
 		cause
 	})));
 	const processDomainEvent = (_event) => void_$1;