@levr-one/cli 0.1.0 → 0.2.0

package/dist/{listHandler-BiwIo88i.js → listHandler-DDd6scZ8.js}

@@ -1,16 +1,14 @@
-import "./credentials-CfHLkU7k.js";
-import { authGetSitesV1, configureClient } from "./sdk-client-DunBmYLR.js";
+import { authGetSitesV1, configureClient } from "./sdk-client-BCOB2qNU.js";
 import { loadWorkspace } from "./workspace-store-BcyMJAht.js";
-import "./token-refresh-waF23pyw.js";
-import { resolveToken } from "./resolve-token-BL8vL_ok.js";
+import { resolveToken } from "./resolve-token-DizP2xRY.js";
 
 //#region src/commands/workspace/listHandler.ts
 async function listHandler() {
 	let auth;
 	try {
 		auth = await resolveToken();
-	} catch {
-		this.logger.error("Not authenticated. Run 'levr auth login' first.");
+	} catch (err) {
+		this.logger.error(err instanceof Error ? err.message : "Not authenticated. Run 'levr auth login' first.");
 		this.process.exitCode = 1;
 		return;
 	}
@@ -26,19 +24,26 @@ async function listHandler() {
 		this.process.exitCode = 1;
 		return;
 	}
-	const sites = result.data.sites;
+	const data = result.data;
+	printSites(this, data.sites);
+}
+/**
+* Print the workspace list with the current-workspace indicator. Shared
+* with `levr init` (ENG-2361).
+*/
+function printSites(ctx, sites) {
 	if (sites.length === 0) {
-		this.logger.info("No workspaces available.");
+		ctx.logger.info("No workspaces available.");
 		return;
 	}
 	const currentWs = loadWorkspace();
-	this.process.stdout.write("\nWorkspaces:\n\n");
+	ctx.process.stdout.write("\nWorkspaces:\n\n");
 	for (const site of sites) {
 		const indicator = site.workspace_id === currentWs ? " *" : "";
-		this.process.stdout.write(`  ${site.workspace_name} (${site.workspace_id}) [${site.role}]${indicator}\n`);
+		ctx.process.stdout.write(`  ${site.workspace_name} (${site.workspace_id}) [${site.role}]${indicator}\n`);
 	}
-	this.process.stdout.write("\n");
+	ctx.process.stdout.write("\n");
 }
 
 //#endregion
-export { listHandler };
+export { listHandler, printSites };

package/dist/{loginHandler-C8D6DgjW.js → loginHandler-BSrs0mHq.js}

@@ -1,7 +1,6 @@
-import { CLI_CLIENT_ID, getApiUrl, getAuthUrl, writeCredentials } from "./credentials-CfHLkU7k.js";
-import { configureClient } from "./sdk-client-DunBmYLR.js";
-import "./workspace-store-BcyMJAht.js";
-import { autoSelectWorkspace } from "./resolve-workspace-lHEoGPHe.js";
+import { CLI_CLIENT_ID, getApiUrl, getAuthUrl, setSessionApiUrl, writeCredentials } from "./env-hpzB56ay.js";
+import { configureClient } from "./sdk-client-BCOB2qNU.js";
+import { autoSelectWorkspace } from "./resolve-workspace-EpjKI71z.js";
 import chalk from "chalk";
 import { createHash, randomBytes } from "node:crypto";
 import { createServer } from "node:http";
@@ -166,14 +165,19 @@ function sleep(ms) {
 */
 async function requestDeviceCode() {
 	const apiUrl = getApiUrl();
-	const res = await fetch(`${apiUrl}/v1/oauth/device/authorize`, {
-		method: "POST",
-		headers: { "Content-Type": "application/x-www-form-urlencoded" },
-		body: new URLSearchParams({
-			client_id: CLI_CLIENT_ID,
-			scope: "read:own write:own"
-		})
-	});
+	let res;
+	try {
+		res = await fetch(`${apiUrl}/v1/oauth/device/authorize`, {
+			method: "POST",
+			headers: { "Content-Type": "application/x-www-form-urlencoded" },
+			body: new URLSearchParams({
+				client_id: CLI_CLIENT_ID,
+				scope: "read:own write:own"
+			})
+		});
+	} catch {
+		throw new Error(`Could not reach ${apiUrl} — check the URL and your network connection.`);
+	}
 	if (!res.ok) {
 		const body = await res.text();
 		throw new Error(`Failed to request device code (${res.status}): ${body}`);
@@ -223,15 +227,31 @@ function formatCountdown(ms) {
 	return `${Math.floor(totalSec / 60)}:${(totalSec % 60).toString().padStart(2, "0")}`;
 }
 async function loginHandler(flags) {
-	if (flags["device-code"]) {
-		await deviceCodeLogin(this);
-		return;
-	}
-	await pkceLogin(this);
+	await performLogin(this, {
+		deviceCode: flags["device-code"],
+		url: flags.url
+	});
+}
+/**
+* Run the login flow (PKCE or device code). Reusable outside the Stricli
+* handler (levr init composes it). Returns true on success; on failure the
+* error has been printed and `exitCode` set.
+*/
+async function performLogin(ctx, options) {
+	if (options.url) setSessionApiUrl(options.url);
+	if (options.deviceCode) return deviceCodeLogin(ctx);
+	return pkceLogin(ctx);
 }
 async function pkceLogin(ctx) {
 	const apiUrl = getApiUrl();
-	const authUrl = getAuthUrl();
+	let authUrl;
+	try {
+		authUrl = getAuthUrl();
+	} catch (err) {
+		ctx.logger.error(err instanceof Error ? err.message : "Invalid auth server configuration.");
+		ctx.process.exitCode = 1;
+		return false;
+	}
 	const codeVerifier = generateCodeVerifier();
 	const codeChallenge = generateCodeChallenge(codeVerifier);
 	const state = randomBytes(16).toString("hex");
@@ -240,7 +260,7 @@ async function pkceLogin(ctx) {
 		expectedState: state
 	});
 	const redirectUri = `http://127.0.0.1:${await portPromise}/callback`;
-	const authorizeUrl = `${authUrl}/auth/oauth/authorize?${new URLSearchParams({
+	const params = new URLSearchParams({
 		response_type: "code",
 		client_id: CLI_CLIENT_ID,
 		redirect_uri: redirectUri,
@@ -248,7 +268,8 @@ async function pkceLogin(ctx) {
 		code_challenge_method: "S256",
 		scope: "read:own write:own",
 		state
-	}).toString()}`;
+	});
+	const authorizeUrl = `${authUrl}/auth/oauth/authorize?${params.toString()}`;
 	ctx.process.stdout.write("Opening browser to authenticate...\n\n");
 	ctx.process.stdout.write(`  If the browser doesn't open, visit:\n  ${chalk.cyan(authorizeUrl)}\n\n`);
 	try {
@@ -270,7 +291,7 @@ async function pkceLogin(ctx) {
 		ctx.process.stdout.write("\n");
 		ctx.logger.error(err instanceof Error ? err.message : "Authentication failed.");
 		ctx.process.exitCode = 1;
-		return;
+		return false;
 	}
 	clearInterval(countdownTimer);
 	try {
@@ -289,11 +310,12 @@ async function pkceLogin(ctx) {
 			const errBody = await tokenRes.text();
 			throw new Error(`Token exchange failed (${tokenRes.status}): ${errBody}`);
 		}
-		await saveTokensAndFinish(ctx, await tokenRes.json());
+		return await saveTokensAndFinish(ctx, await tokenRes.json());
 	} catch (err) {
 		ctx.process.stdout.write("\n");
 		ctx.logger.error(err instanceof Error ? err.message : "Token exchange failed.");
 		ctx.process.exitCode = 1;
+		return false;
 	}
 }
 async function deviceCodeLogin(ctx) {
@@ -319,11 +341,12 @@ async function deviceCodeLogin(ctx) {
 			throw err;
 		}
 		clearInterval(deviceTimer);
-		await saveTokensAndFinish(ctx, tokenData);
+		return await saveTokensAndFinish(ctx, tokenData);
 	} catch (err) {
 		ctx.process.stdout.write("\n");
 		ctx.logger.error(err instanceof Error ? err.message : "Device flow failed.");
 		ctx.process.exitCode = 1;
+		return false;
 	}
 }
 async function saveTokensAndFinish(ctx, tokenData) {
@@ -337,7 +360,7 @@ async function saveTokensAndFinish(ctx, tokenData) {
 		ctx.process.stdout.write("\n");
 		ctx.logger.error("Token response missing user data.");
 		ctx.process.exitCode = 1;
-		return;
+		return false;
 	}
 	writeCredentials({
 		version: 1,
@@ -357,7 +380,8 @@ async function saveTokensAndFinish(ctx, tokenData) {
 	const wsResult = await autoSelectWorkspace();
 	if (wsResult.kind === "single") ctx.process.stdout.write(`Workspace: ${chalk.bold(wsResult.workspaceName)}\n`);
 	else if (wsResult.kind === "multiple") ctx.process.stdout.write(`\n${wsResult.count} workspaces available. Run ${chalk.cyan("'levr workspace list'")} to see them.\n`);
+	return true;
 }
 
 //#endregion
-export { loginHandler };
+export { loginHandler, performLogin };

package/dist/loginHandler-uZCrwdcR.js

@@ -0,0 +1,7 @@
+import { loginHandler, performLogin } from "./loginHandler-BSrs0mHq.js";
+import "./env-hpzB56ay.js";
+import "./sdk-client-BCOB2qNU.js";
+import "./workspace-store-BcyMJAht.js";
+import "./resolve-workspace-EpjKI71z.js";
+
+export { loginHandler };

package/dist/{logoutHandler-BBtdpxHX.js → logoutHandler-jWPGhzls.js}

@@ -1,4 +1,4 @@
-import { deleteCredentials, getPatToken } from "./credentials-CfHLkU7k.js";
+import { deleteCredentials, getPatToken } from "./env-hpzB56ay.js";
 import { clearWorkspace } from "./workspace-store-BcyMJAht.js";
 
 //#region src/commands/auth/logoutHandler.ts

package/dist/{pushHandler-DkCrbV7y.js → pushHandler-DG96IOVd.js}

@@ -1,9 +1,9 @@
-import { getApiUrl, getAutomationSourceIdOverride, getSourceOverride, getTeamId } from "./credentials-CfHLkU7k.js";
-import { client, configureClient, uploadAutomationIngest, uploadImport } from "./sdk-client-DunBmYLR.js";
+import { getApiUrl, getAutomationSourceIdOverride, getSourceOverride, getTeamId } from "./env-hpzB56ay.js";
+import { client, configureClient, uploadAutomationIngest, uploadImport } from "./sdk-client-BCOB2qNU.js";
 import "./workspace-store-BcyMJAht.js";
-import { resolveWorkspace } from "./resolve-workspace-lHEoGPHe.js";
-import "./token-refresh-waF23pyw.js";
-import { resolveToken } from "./resolve-token-BL8vL_ok.js";
+import { resolveWorkspace } from "./resolve-workspace-EpjKI71z.js";
+import "./token-refresh-BYu4XO3G.js";
+import { resolveToken } from "./resolve-token-DizP2xRY.js";
 import { readFileSync, statSync } from "node:fs";
 import { basename } from "node:path";
 import ora from "ora";

package/dist/resolve-token-DizP2xRY.js

@@ -0,0 +1,48 @@
+import { getApiUrl, getPatToken, readCredentials } from "./env-hpzB56ay.js";
+import { isTokenExpired, refreshToken } from "./token-refresh-BYu4XO3G.js";
+
+//#region src/auth/resolve-token.ts
+/**
+* Stored credentials exist but were issued by a different server than the
+* one this command targets (`--url`/`LEVR_URL`). Callers that can recover
+* (e.g. `levr init` re-logging-in against the new target) match on this
+* class instead of string-sniffing the message.
+*/
+var CredentialsMismatchError = class extends Error {
+	constructor(storedUrl, activeUrl) {
+		super(`Stored credentials are for ${storedUrl}, but this command targets ${activeUrl}. Run 'levr auth login' to authenticate against this server.`);
+		this.name = "CredentialsMismatchError";
+	}
+};
+/**
+* Resolve auth token in priority order:
+* 1. LEVR_TOKEN env var (PAT) — long-lived, no refresh
+* 2. Stored credentials (JWT) — auto-refresh if expired
+* 3. Error — not authenticated
+*/
+async function resolveToken() {
+	const pat = getPatToken();
+	if (pat) return {
+		token: pat,
+		type: "pat"
+	};
+	let creds = readCredentials();
+	if (creds) {
+		const activeUrl = getApiUrl();
+		const storedUrl = creds.api_url.replace(/\/+$/, "");
+		if (storedUrl !== activeUrl) throw new CredentialsMismatchError(storedUrl, activeUrl);
+		if (isTokenExpired(creds)) {
+			const refreshed = await refreshToken(creds);
+			if (!refreshed) throw new Error("Token expired and refresh failed. Run 'levr auth login' to re-authenticate.");
+			creds = refreshed;
+		}
+		return {
+			token: creds.access_token,
+			type: "jwt"
+		};
+	}
+	throw new Error("Not authenticated. Run 'levr auth login' or set LEVR_TOKEN environment variable.");
+}
+
+//#endregion
+export { CredentialsMismatchError, resolveToken };

package/dist/{resolve-workspace-lHEoGPHe.js → resolve-workspace-EpjKI71z.js}

@@ -1,4 +1,4 @@
-import { authGetSitesV1 } from "./sdk-client-DunBmYLR.js";
+import { authGetSitesV1 } from "./sdk-client-BCOB2qNU.js";
 import { clearWorkspace, loadWorkspace, saveWorkspace } from "./workspace-store-BcyMJAht.js";
 
 //#region src/workspace/resolve-workspace.ts

package/dist/{sdk-client-DunBmYLR.js → sdk-client-BCOB2qNU.js}

@@ -1,4 +1,4 @@
-import { getApiUrl } from "./credentials-CfHLkU7k.js";
+import { getApiUrl } from "./env-hpzB56ay.js";
 import { z } from "zod/v3";
 
 //#region ../sdk/dist/gen/_common/zod.js

package/dist/{selectHandler-C2UDAWOl.js → selectHandler-CkIbO2qH.js}

@@ -1,8 +1,8 @@
-import "./credentials-CfHLkU7k.js";
-import { authGetSitesV1, configureClient } from "./sdk-client-DunBmYLR.js";
+import "./env-hpzB56ay.js";
+import { authGetSitesV1, configureClient } from "./sdk-client-BCOB2qNU.js";
 import { saveWorkspace } from "./workspace-store-BcyMJAht.js";
-import "./token-refresh-waF23pyw.js";
-import { resolveToken } from "./resolve-token-BL8vL_ok.js";
+import "./token-refresh-BYu4XO3G.js";
+import { resolveToken } from "./resolve-token-DizP2xRY.js";
 
 //#region src/commands/workspace/selectHandler.ts
 async function selectHandler(_flags, workspaceId) {

package/dist/{statusHandler-DQDmEOGI.js → statusHandler-D6YAxhoN.js}

@@ -1,6 +1,6 @@
-import { getApiUrl, getPatToken, readCredentials } from "./credentials-CfHLkU7k.js";
-import { authGetProfileV1, configureClient } from "./sdk-client-DunBmYLR.js";
-import { isTokenExpired } from "./token-refresh-waF23pyw.js";
+import { getApiUrl, getPatToken, readCredentials } from "./env-hpzB56ay.js";
+import { authGetProfileV1, configureClient } from "./sdk-client-BCOB2qNU.js";
+import { isTokenExpired } from "./token-refresh-BYu4XO3G.js";
 import chalk from "chalk";
 
 //#region src/commands/auth/statusHandler.ts
@@ -23,6 +23,12 @@ async function statusHandler() {
 		this.process.exitCode = 1;
 		return;
 	}
+	const storedUrl = creds.api_url.replace(/\/+$/, "");
+	if (storedUrl !== apiUrl) {
+		this.process.stdout.write(`${chalk.red("error")} Stored credentials are for ${storedUrl}, but the current target is ${apiUrl}. Run 'levr auth login' to authenticate against this server.\n`);
+		this.process.exitCode = 1;
+		return;
+	}
 	if (isTokenExpired(creds)) {
 		this.process.stdout.write(`${chalk.red("error")} Token expired. Run 'levr auth login' to re-authenticate.\n`);
 		this.process.exitCode = 1;

package/dist/{token-refresh-waF23pyw.js → token-refresh-BYu4XO3G.js}

@@ -1,4 +1,4 @@
-import { CLI_CLIENT_ID, deleteCredentials, getApiUrl, writeCredentials } from "./credentials-CfHLkU7k.js";
+import { CLI_CLIENT_ID, deleteCredentials, getApiUrl, writeCredentials } from "./env-hpzB56ay.js";
 
 //#region src/auth/token-refresh.ts
 const REFRESH_BUFFER_MS = 300 * 1e3;

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@levr-one/cli",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "The command-line interface for Levr",
   "type": "module",
   "license": "MIT",
   "main": "dist/cli.js",
   "bin": {
-    "__levr_bash_complete": "dist/bash-complete.js",
     "levr": "dist/cli.js"
   },
   "files": [