@keystrokehq/cli 0.0.120 → 0.0.122

package/dist/index.mjs

@@ -3077,7 +3077,7 @@ function clearAccessToken(webUrl) {
 	new Entry(SERVICE, accountForWebUrl(webUrl)).deletePassword();
 }
 //#endregion
-//#region ../../packages/auth/dist/jwt-jroYvvqz.mjs
+//#region ../../packages/auth/dist/jwt-BVJ7dVm9.mjs
 /** OAuth device-flow client id for `keystroke auth login`. */
 const CLI_CLIENT_ID = "keystroke-cli";
 async function fetchJwtWithSession(authBaseUrl, sessionCredential) {
@@ -4725,18 +4725,18 @@ async function getJwtWithBearer(baseURL, sessionToken) {
 //#endregion
 //#region src/auth/jwt-cache.ts
 const caches = /* @__PURE__ */ new Map();
-async function getCliJwt(webUrl, force = false) {
-	if (!getAccessToken(webUrl)) {
-		caches.delete(webUrl);
+async function getCliJwt(platformUrl, force = false) {
+	if (!getAccessToken(platformUrl)) {
+		caches.delete(platformUrl);
 		return;
 	}
-	let cache = caches.get(webUrl);
+	let cache = caches.get(platformUrl);
 	if (!cache) {
 		cache = createJwtTokenCache(async () => {
-			const sessionToken = getAccessToken(webUrl);
-			return sessionToken ? getJwtWithBearer(webUrl, sessionToken) : null;
+			const sessionToken = getAccessToken(platformUrl);
+			return sessionToken ? getJwtWithBearer(platformUrl, sessionToken) : null;
 		});
-		caches.set(webUrl, cache);
+		caches.set(platformUrl, cache);
 	}
 	return cache.get(force);
 }
@@ -4820,11 +4820,11 @@ function getPlatformUrl(config) {
 //#region src/auth/resolve-cli-auth.ts
 /** Returns JWT bearer auth when a session refresh token is stored; otherwise none. */
 function resolveCliAuth(config) {
-	const webUrl = getWebUrl(config);
-	if (!getAccessToken(webUrl)) return { type: "none" };
+	const platformUrl = getPlatformUrl(config);
+	if (!getAccessToken(platformUrl)) return { type: "none" };
 	return {
 		type: "bearer",
-		getToken: () => getCliJwt(webUrl)
+		getToken: () => getCliJwt(platformUrl)
 	};
 }
 //#endregion
@@ -8660,11 +8660,11 @@ function toPlatformAuth(auth) {
 	return { type: "none" };
 }
 function createCliPlatformClient(config) {
-	const webUrl = getWebUrl(config);
+	const platformUrl = getPlatformUrl(config);
 	return createPlatformClient({
-		baseUrl: getPlatformUrl(config),
+		baseUrl: platformUrl,
 		auth: toPlatformAuth(resolveCliAuth(config)),
-		refreshBearerToken: () => getCliJwt(webUrl, true),
+		refreshBearerToken: () => getCliJwt(platformUrl, true),
 		getActiveOrganizationId: () => config.get("activeOrganizationId") ?? null,
 		onActiveOrganizationChange: (organizationId) => {
 			if (organizationId) config.set("activeOrganizationId", organizationId);
@@ -8903,9 +8903,14 @@ function unreachableTarget(context) {
 function unreachableServerMessage(targetUrl) {
 	return `Could not reach ${targetUrl ?? "the keystroke server"}. Is the server running? (keystroke dev or keystroke start)`;
 }
+function authApiOrigin(context) {
+	if (context?.platformUrl) return context.platformUrl;
+	if (context?.webUrl) return resolvePlatformUrlForWebUrl(context.webUrl, {});
+}
 function formatHttpClientError(error, context) {
 	if (error.status === 401) {
-		if (context?.webUrl && !getAccessToken(context.webUrl)) return "Not logged in. Run `keystroke auth login` first.";
+		const origin = authApiOrigin(context);
+		if (origin && !getAccessToken(origin)) return "Not logged in. Run `keystroke auth login` first.";
 		return "Authentication failed. Run `keystroke auth login` again.";
 	}
 	if (error.status === 0) return unreachableServerMessage(unreachableTarget(context));
@@ -9317,17 +9322,20 @@ function registerAuthLoginCommand(auth) {
 		config.set("platformUrl", platformUrl);
 		try {
 			const result = await runDeviceLogin({
-				baseURL: webUrl,
+				baseURL: platformUrl,
 				clientId: CLI_CLIENT_ID,
 				openUrl
 			});
-			setAccessToken(webUrl, result.accessToken);
-			const user = await getSessionWithBearer(webUrl, result.accessToken);
+			setAccessToken(platformUrl, result.accessToken);
+			const user = await getSessionWithBearer(platformUrl, result.accessToken);
 			if (user) process.stdout.write(`Logged in as ${user.name} (${user.email})\n`);
 			else process.stdout.write(`Logged in to ${webUrl}\n`);
 			await syncActiveOrganizationAfterLogin(config, { organizationId: options.org });
 		} catch (error) {
-			process.stderr.write(`${formatCliError(error, "Login failed", { webUrl })}\n`);
+			process.stderr.write(`${formatCliError(error, "Login failed", {
+				webUrl,
+				platformUrl
+			})}\n`);
 			process.exitCode = 1;
 		}
 	});
@@ -9338,10 +9346,12 @@ function registerAuthLogoutCommand(auth) {
 	auth.command("logout").description("Clear stored credentials").option("--web-url <url>", "Web dashboard origin (default from config)").action((options) => {
 		const config = createCliConfig();
 		const webUrl = options.webUrl ?? getWebUrl(config);
-		clearAccessToken(webUrl);
+		const platformUrl = getPlatformUrl(config);
+		clearAccessToken(platformUrl);
 		process.stdout.write(`${JSON.stringify({
 			authenticated: false,
-			webUrl
+			webUrl,
+			platformUrl
 		})}\n`);
 	});
 }
@@ -9351,16 +9361,18 @@ function registerAuthStatusCommand(auth) {
 	auth.command("status").description("Show authentication status").option("--web-url <url>", "Web dashboard origin (default from config)").action(async (options) => {
 		const config = createCliConfig();
 		const webUrl = options.webUrl ?? getWebUrl(config);
-		const token = getAccessToken(webUrl);
+		const platformUrl = getPlatformUrl(config);
+		const token = getAccessToken(platformUrl);
 		if (!token) {
 			process.stdout.write(`${JSON.stringify({
 				authenticated: false,
-				webUrl
+				webUrl,
+				platformUrl
 			})}\n`);
 			return;
 		}
 		try {
-			const user = await getSessionWithBearer(webUrl, token);
+			const user = await getSessionWithBearer(platformUrl, token);
 			const organizations = user ? await listOrganizations(config).catch(() => []) : [];
 			const activeOrganizationId = config.get("activeOrganizationId");
 			const activeOrganization = activeOrganizationId ? organizations.find((entry) => entry.organization.id === activeOrganizationId) : void 0;
@@ -9373,7 +9385,10 @@ function registerAuthStatusCommand(auth) {
 			})}\n`);
 			if (!user) process.exitCode = 1;
 		} catch (error) {
-			process.stderr.write(`${formatCliError(error, "Status check failed", { webUrl })}\n`);
+			process.stderr.write(`${formatCliError(error, "Status check failed", {
+				webUrl,
+				platformUrl
+			})}\n`);
 			process.exitCode = 1;
 		}
 	});