@camox/cli 0.5.2 → 0.6.0

package/dist/index.mjs

@@ -30,23 +30,37 @@ const CAMOX_API_URL = process.env.CAMOX_API_URL || "https://api.camox.ai";
 const AUTH_TIMEOUT_MS = 300 * 1e3;
 const AUTH_DIR = path.join(os.homedir(), ".camox");
 const AUTH_FILE = path.join(AUTH_DIR, "auth.json");
-function readAuthToken() {
+function normalizeUrl(url) {
+	return url.replace(/\/+$/, "");
+}
+function readAllTokens() {
 	try {
-		const data = JSON.parse(fs.readFileSync(AUTH_FILE, "utf-8"));
-		if (data?.token && data?.name) return data;
-		return null;
+		return JSON.parse(fs.readFileSync(AUTH_FILE, "utf-8"));
 	} catch {
-		return null;
+		return {};
 	}
 }
-function writeAuthToken(token) {
+function writeAllTokens(tokens) {
 	fs.mkdirSync(AUTH_DIR, { recursive: true });
-	fs.writeFileSync(AUTH_FILE, JSON.stringify(token, null, 2), { mode: 384 });
+	fs.writeFileSync(AUTH_FILE, JSON.stringify(tokens, null, 2), { mode: 384 });
+}
+function readAuthToken() {
+	const entry = readAllTokens()[normalizeUrl(CAMOX_URL)];
+	if (entry?.token && entry?.name) return entry;
+	return null;
+}
+function writeAuthToken(token) {
+	const tokens = readAllTokens();
+	tokens[normalizeUrl(CAMOX_URL)] = token;
+	writeAllTokens(tokens);
 }
 function removeAuthToken() {
-	try {
+	const tokens = readAllTokens();
+	delete tokens[normalizeUrl(CAMOX_URL)];
+	if (Object.keys(tokens).length === 0) try {
 		fs.unlinkSync(AUTH_FILE);
 	} catch {}
+	else writeAllTokens(tokens);
 }
 function openBrowser(url) {
 	const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
@@ -112,23 +126,25 @@ async function verifyOtt(token) {
 }
 async function authenticateUser() {
 	const { port, ottPromise, close } = await startCallbackServer();
-	const loginUrl = `${CAMOX_URL}/cli-authorize?callback=${encodeURIComponent(`http://localhost:${port}/callback`)}`;
 	const action = await p.select({
-		message: "Log in to Camox",
+		message: "Connect to Camox",
 		options: [{
-			value: "open",
-			label: "Open browser"
+			value: "signup",
+			label: "Sign up in browser"
 		}, {
-			value: "copy",
-			label: "Copy URL"
+			value: "login",
+			label: "Log in in browser"
 		}]
 	});
 	if (p.isCancel(action)) {
 		close();
 		throw new Error("Authentication cancelled");
 	}
-	if (action === "open") openBrowser(loginUrl);
-	else p.log.info(loginUrl);
+	const callbackUrl = `http://localhost:${port}/callback`;
+	const cliAuthUrl = `/cli-authorize?callback=${encodeURIComponent(callbackUrl)}`;
+	const url = `${CAMOX_URL}${action === "signup" ? "/signup" : "/login"}?redirect=${encodeURIComponent(cliAuthUrl)}`;
+	openBrowser(url);
+	p.log.info(`Browser not opening? Visit:\n${url}`);
 	const s = p.spinner();
 	s.start("Waiting for authentication...");
 	try {
@@ -163,7 +179,7 @@ async function getOrAuthenticate() {
 		}
 		removeAuthToken();
 		p.log.warn("Session expired. Please log in again.");
-	} else p.log.info("Please authenticate to create a Camox project.");
+	} else p.log.info("Please connect to Camox so we can create a project on the Camox API.");
 	return authenticateUser();
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camox/cli",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "bin": {
     "camox": "./dist/index.mjs"
   },
@@ -25,7 +25,7 @@
     "@typescript/native-preview": "7.0.0-dev.20260412.1",
     "oxlint": "^0.15.0",
     "tsdown": "^0.21.8",
-    "@camox/api": "0.5.2"
+    "@camox/api": "0.6.0"
   },
   "scripts": {
     "build": "tsdown",