@lobehub/cli 0.0.23 → 0.0.24

package/dist/index.js

@@ -17187,6 +17187,118 @@ var GatewayClient = class extends EventEmitter {
 	}
 };
 
+//#endregion
+//#region src/auth/apiKey.ts
+async function getUserIdFromApiKey(apiKey, serverUrl) {
+	const normalizedServerUrl = normalizeUrl(serverUrl) || resolveServerUrl();
+	const response = await fetch(`${normalizedServerUrl}/api/v1/users/me?includeCount=0`, { headers: { Authorization: `Bearer ${apiKey}` } });
+	let body;
+	try {
+		body = await response.json();
+	} catch {
+		throw new Error(`Failed to parse response from ${normalizedServerUrl}/api/v1/users/me?includeCount=0.`);
+	}
+	if (!response.ok || body?.success === false) throw new Error(body?.error || body?.message || `Request failed with status ${response.status}.`);
+	const userId = body?.data?.id || body?.data?.userId;
+	if (!userId) throw new Error("Current user response did not include a user id.");
+	return userId;
+}
+
+//#endregion
+//#region src/auth/resolveToken.ts
+/**
+* Parse the `sub` claim from a JWT without verifying the signature.
+*/
+function parseJwtSub(token) {
+	try {
+		return JSON.parse(Buffer.from(token.split(".")[1], "base64url").toString()).sub;
+	} catch {
+		return;
+	}
+}
+/**
+* Resolve an access token from explicit options, environment variables, or stored credentials.
+* Exits the process if no token can be resolved.
+*/
+async function resolveToken(options) {
+	const envJwt = process.env.LOBEHUB_JWT;
+	if (envJwt) {
+		const serverUrl = resolveServerUrl();
+		const userId = parseJwtSub(envJwt);
+		if (!userId) {
+			log$7.error("Could not extract userId from LOBEHUB_JWT.");
+			process.exit(1);
+		}
+		log$7.debug("Using LOBEHUB_JWT from environment");
+		return {
+			serverUrl,
+			token: envJwt,
+			tokenType: "jwt",
+			userId
+		};
+	}
+	if (options.token) {
+		const userId = parseJwtSub(options.token);
+		if (!userId) {
+			log$7.error("Could not extract userId from token. Provide --user-id explicitly.");
+			process.exit(1);
+		}
+		return {
+			serverUrl: resolveServerUrl(),
+			token: options.token,
+			tokenType: "jwt",
+			userId
+		};
+	}
+	if (options.serviceToken) {
+		if (!options.userId) {
+			log$7.error("--user-id is required when using --service-token");
+			process.exit(1);
+		}
+		return {
+			serverUrl: resolveServerUrl(),
+			token: options.serviceToken,
+			tokenType: "serviceToken",
+			userId: options.userId
+		};
+	}
+	const envApiKey = process.env[CLI_API_KEY_ENV];
+	if (envApiKey) try {
+		const serverUrl = resolveServerUrl();
+		const userId = await getUserIdFromApiKey(envApiKey, serverUrl);
+		log$7.debug(`Using ${CLI_API_KEY_ENV} from environment`);
+		return {
+			serverUrl,
+			token: envApiKey,
+			tokenType: "apiKey",
+			userId
+		};
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		log$7.error(`Failed to validate ${CLI_API_KEY_ENV}: ${message}`);
+		process.exit(1);
+	}
+	const result = await getValidToken();
+	if (result) {
+		log$7.debug("Using stored credentials");
+		const { credentials } = result;
+		const serverUrl = resolveServerUrl();
+		const userId = parseJwtSub(credentials.accessToken);
+		if (!userId) {
+			log$7.error("Stored token is invalid. Run 'lh login' again.");
+			process.exit(1);
+		}
+		return {
+			serverUrl,
+			token: credentials.accessToken,
+			tokenType: "jwt",
+			userId
+		};
+	}
+	log$7.error(`No authentication found. Run 'lh login' first, or set ${CLI_API_KEY_ENV}, or provide --token.`);
+	process.exit(1);
+}
+
 //#endregion
 //#region node_modules/.pnpm/node-machine-id@1.1.12/node_modules/node-machine-id/dist/index.js
 var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -18066,115 +18178,33 @@ const deriveDeviceId = (userId, options = {}) => {
 };
 
 //#endregion
-//#region src/auth/apiKey.ts
-async function getUserIdFromApiKey(apiKey, serverUrl) {
-	const normalizedServerUrl = normalizeUrl(serverUrl) || resolveServerUrl();
-	const response = await fetch(`${normalizedServerUrl}/api/v1/users/me`, { headers: { Authorization: `Bearer ${apiKey}` } });
-	let body;
-	try {
-		body = await response.json();
-	} catch {
-		throw new Error(`Failed to parse response from ${normalizedServerUrl}/api/v1/users/me.`);
-	}
-	if (!response.ok || body?.success === false) throw new Error(body?.error || body?.message || `Request failed with status ${response.status}.`);
-	const userId = body?.data?.id || body?.data?.userId;
-	if (!userId) throw new Error("Current user response did not include a user id.");
-	return userId;
-}
-
-//#endregion
-//#region src/auth/resolveToken.ts
+//#region src/device/register.ts
 /**
-* Parse the `sub` claim from a JWT without verifying the signature.
+* Resolve a stable device identity. An explicit `--device-id` wins (lets a user
+* pin a VM to a fixed identity); otherwise derive from the machine id so the
+* same machine + user maps to one device across reconnects. Returns undefined
+* when neither an explicit id nor a userId is available.
 */
-function parseJwtSub(token) {
-	try {
-		return JSON.parse(Buffer.from(token.split(".")[1], "base64url").toString()).sub;
-	} catch {
-		return;
-	}
+function resolveDeviceIdentity(userId, explicitDeviceId) {
+	if (explicitDeviceId) return {
+		deviceId: explicitDeviceId,
+		identitySource: "fallback"
+	};
+	if (userId) return deriveDeviceId(userId);
 }
 /**
-* Resolve an access token from explicit options, environment variables, or stored credentials.
-* Exits the process if no token can be resolved.
+* Register this device in the server registry. Shared by `lh login` (so the
+* device row exists right after auth) and `lh connect` (so the row exists
+* before the WS opens). Best-effort by contract: callers should wrap this in a
+* try/catch and treat any failure as non-fatal.
 */
-async function resolveToken(options) {
-	const envJwt = process.env.LOBEHUB_JWT;
-	if (envJwt) {
-		const serverUrl = resolveServerUrl();
-		const userId = parseJwtSub(envJwt);
-		if (!userId) {
-			log$7.error("Could not extract userId from LOBEHUB_JWT.");
-			process.exit(1);
-		}
-		log$7.debug("Using LOBEHUB_JWT from environment");
-		return {
-			serverUrl,
-			token: envJwt,
-			tokenType: "jwt",
-			userId
-		};
-	}
-	if (options.token) {
-		const userId = parseJwtSub(options.token);
-		if (!userId) {
-			log$7.error("Could not extract userId from token. Provide --user-id explicitly.");
-			process.exit(1);
-		}
-		return {
-			serverUrl: resolveServerUrl(),
-			token: options.token,
-			tokenType: "jwt",
-			userId
-		};
-	}
-	if (options.serviceToken) {
-		if (!options.userId) {
-			log$7.error("--user-id is required when using --service-token");
-			process.exit(1);
-		}
-		return {
-			serverUrl: resolveServerUrl(),
-			token: options.serviceToken,
-			tokenType: "serviceToken",
-			userId: options.userId
-		};
-	}
-	const envApiKey = process.env[CLI_API_KEY_ENV];
-	if (envApiKey) try {
-		const serverUrl = resolveServerUrl();
-		const userId = await getUserIdFromApiKey(envApiKey, serverUrl);
-		log$7.debug(`Using ${CLI_API_KEY_ENV} from environment`);
-		return {
-			serverUrl,
-			token: envApiKey,
-			tokenType: "apiKey",
-			userId
-		};
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		log$7.error(`Failed to validate ${CLI_API_KEY_ENV}: ${message}`);
-		process.exit(1);
-	}
-	const result = await getValidToken();
-	if (result) {
-		log$7.debug("Using stored credentials");
-		const { credentials } = result;
-		const serverUrl = resolveServerUrl();
-		const userId = parseJwtSub(credentials.accessToken);
-		if (!userId) {
-			log$7.error("Stored token is invalid. Run 'lh login' again.");
-			process.exit(1);
-		}
-		return {
-			serverUrl,
-			token: credentials.accessToken,
-			tokenType: "jwt",
-			userId
-		};
-	}
-	log$7.error(`No authentication found. Run 'lh login' first, or set ${CLI_API_KEY_ENV}, or provide --token.`);
-	process.exit(1);
+async function registerDevice(auth, identity) {
+	await createLambdaClient(auth).device.register.mutate({
+		deviceId: identity.deviceId,
+		hostname: os.hostname(),
+		identitySource: identity.identitySource,
+		platform: process.platform
+	});
 }
 
 //#endregion
@@ -206936,10 +206966,7 @@ async function runConnect(options, isDaemonChild) {
 		gatewayUrl
 	});
 	const resolvedGatewayUrl = gatewayUrl || "https://device-gateway.lobehub.com";
-	const identity = options.deviceId ? {
-		deviceId: options.deviceId,
-		identitySource: "fallback"
-	} : auth.userId ? deriveDeviceId(auth.userId) : void 0;
+	const identity = resolveDeviceIdentity(auth.userId, options.deviceId);
 	const client = new GatewayClient({
 		channel: process.env.LOBEHUB_CLI_CHANNEL || "cli",
 		connectionId: loadOrCreateConnectionId(),
@@ -207081,12 +207108,7 @@ async function runConnect(options, isDaemonChild) {
 		process.exit(0);
 	});
 	if (identity) try {
-		await createLambdaClient(auth).device.register.mutate({
-			deviceId: identity.deviceId,
-			hostname: os.hostname(),
-			identitySource: identity.identitySource,
-			platform: process.platform
-		});
+		await registerDevice(auth, identity);
 	} catch (err) {
 		error(`Device registration failed (non-fatal): ${err.message}`);
 	}
@@ -211162,6 +211184,16 @@ function registerLoginCommand(program) {
 						gatewayUrl: existingSettings.gatewayUrl,
 						serverUrl
 					} : { serverUrl });
+					const identity = resolveDeviceIdentity(parseJwtSub(body.access_token));
+					if (identity && identity.identitySource !== "fallback") try {
+						await registerDevice({
+							serverUrl,
+							token: body.access_token,
+							tokenType: "jwt"
+						}, identity);
+					} catch (err) {
+						log$7.warn(`Device registration failed (non-fatal): ${err.message}`);
+					}
 					log$7.info("Login successful! Credentials saved.");
 					return;
 				}

package/man/man1/lh.1

@@ -1,6 +1,6 @@
 .\" Code generated by `npm run man:generate`; DO NOT EDIT.
 .\" Manual command details come from the Commander command tree.
-.TH LH 1 "" "@lobehub/cli 0.0.23" "User Commands"
+.TH LH 1 "" "@lobehub/cli 0.0.24" "User Commands"
 .SH NAME
 lh \- LobeHub CLI \- manage and connect to LobeHub services
 .SH SYNOPSIS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/cli",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "type": "module",
   "bin": {
     "lh": "./dist/index.js",
@@ -31,11 +31,11 @@
     "tsdown": "^0.21.4",
     "typescript": "^6.0.3",
     "ws": "^8.18.1",
+    "@lobechat/device-gateway-client": "1.0.0",
     "@lobechat/agent-gateway-client": "1.0.0",
-    "@lobechat/device-identity": "1.0.0",
     "@lobechat/local-file-shell": "1.0.0",
-    "@lobechat/heterogeneous-agents": "1.0.0",
-    "@lobechat/device-gateway-client": "1.0.0"
+    "@lobechat/device-identity": "1.0.0",
+    "@lobechat/heterogeneous-agents": "1.0.0"
   },
   "publishConfig": {
     "access": "public",