@primitivedotdev/cli 0.32.1 → 0.34.0

package/dist/oclif/root-signup-hint.js

@@ -1,12 +1,106 @@
-import { existsSync } from "node:fs";
+import { b as normalizeApiBaseUrl1, c as resolveConfigEnvironment, i as loadCliConfig } from "../cli-config-D9nB6fOW.js";
+import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 //#region src/oclif/root-signup-hint.ts
 const CREDENTIALS_FILE = "credentials.json";
+const ROOT_AUTH_TIMEOUT_MS = 1e3;
 function activeConfigDir(env, home) {
 	if (env.PRIMITIVE_CONFIG_DIR) return env.PRIMITIVE_CONFIG_DIR;
 	return join(env.XDG_CONFIG_HOME || join(home, ".config"), "primitive");
 }
+function readRootCredentials(configDir) {
+	let raw;
+	try {
+		raw = readFileSync(join(configDir, CREDENTIALS_FILE), "utf8");
+	} catch {
+		return null;
+	}
+	try {
+		const parsed = JSON.parse(raw);
+		if (parsed.auth_method !== "oauth") return null;
+		if (typeof parsed.access_token !== "string" || !parsed.access_token.trim()) return null;
+		if (typeof parsed.api_base_url_1 !== "string" || !parsed.api_base_url_1.trim()) return null;
+		return {
+			accessToken: parsed.access_token,
+			apiBaseUrl1: parsed.api_base_url_1.replace(/\/+$/, "")
+		};
+	} catch {
+		return null;
+	}
+}
+function accountEndpoint(apiBaseUrl1) {
+	return `${apiBaseUrl1.replace(/\/+$/, "")}/account`;
+}
+function parseRootAccount(payload) {
+	if (payload === null || typeof payload !== "object" || Array.isArray(payload)) return null;
+	const data = payload.data;
+	if (data === null || typeof data !== "object" || Array.isArray(data)) return null;
+	const account = data;
+	if (typeof account.email !== "string" || !account.email.trim()) return null;
+	if (typeof account.id !== "string" || !account.id.trim()) return null;
+	return {
+		email: account.email,
+		id: account.id
+	};
+}
+function rootAuthLine(account) {
+	return `Signed in as ${account.email} (org ${account.id})\n\n`;
+}
+function rootRequestConfig(configDir, env) {
+	const currentEnvironment = resolveConfigEnvironment(loadCliConfig(configDir));
+	const configuredApiBaseUrl1 = currentEnvironment?.config.api_base_url_1;
+	const envApiBaseUrl1 = env.PRIMITIVE_API_BASE_URL_1?.trim();
+	if (currentEnvironment !== null && currentEnvironment.name !== "default" && !envApiBaseUrl1 && !configuredApiBaseUrl1) return null;
+	return {
+		apiBaseUrl1: normalizeApiBaseUrl1(envApiBaseUrl1 || configuredApiBaseUrl1),
+		headers: currentEnvironment?.config.headers
+	};
+}
+async function fetchRootAccount(params) {
+	const controller = new AbortController();
+	const timer = setTimeout(() => controller.abort(), params.timeoutMs);
+	try {
+		const response = await params.fetch(accountEndpoint(params.apiBaseUrl1), {
+			headers: {
+				...params.headers ?? {},
+				accept: "application/json",
+				authorization: `Bearer ${params.apiKey}`
+			},
+			signal: controller.signal
+		});
+		if (!response.ok) return null;
+		return parseRootAccount(await response.json().catch(() => null));
+	} catch {
+		return null;
+	} finally {
+		clearTimeout(timer);
+	}
+}
+async function rootSignedInSummary(options = {}) {
+	if ((options.argv ?? process.argv.slice(2)).length > 0) return null;
+	const env = options.env ?? process.env;
+	const configDir = activeConfigDir(env, options.home ?? homedir());
+	let requestConfig;
+	try {
+		requestConfig = rootRequestConfig(configDir, env);
+	} catch {
+		return null;
+	}
+	if (!requestConfig) return null;
+	const explicitApiKey = env.PRIMITIVE_API_KEY?.trim();
+	const stored = explicitApiKey ? null : readRootCredentials(configDir);
+	const apiKey = explicitApiKey || stored?.accessToken;
+	if (!apiKey) return null;
+	const account = await fetchRootAccount({
+		apiBaseUrl1: stored?.apiBaseUrl1 ?? requestConfig.apiBaseUrl1,
+		apiKey,
+		fetch: options.fetch ?? fetch,
+		headers: requestConfig.headers,
+		timeoutMs: options.timeoutMs ?? ROOT_AUTH_TIMEOUT_MS
+	});
+	return account ? rootAuthLine(account) : null;
+}
 function shouldShowLoggedOutSignupHint(options = {}) {
 	if ((options.argv ?? process.argv.slice(2)).length > 0) return false;
 	const env = options.env ?? process.env;
@@ -27,5 +121,14 @@ function writeLoggedOutSignupHintIfNeeded(options = {}) {
 	if (!shouldShowLoggedOutSignupHint(options)) return;
 	(options.write ?? ((message) => process.stdout.write(message)))(loggedOutSignupHint());
 }
+async function writeRootAuthContextIfNeeded(options = {}) {
+	const write = options.write ?? ((message) => process.stdout.write(message));
+	const signedIn = await rootSignedInSummary(options);
+	if (signedIn) {
+		write(signedIn);
+		return;
+	}
+	writeLoggedOutSignupHintIfNeeded(options);
+}
 //#endregion
-export { loggedOutSignupHint, shouldShowLoggedOutSignupHint, writeLoggedOutSignupHintIfNeeded };
+export { loggedOutSignupHint, rootSignedInSummary, shouldShowLoggedOutSignupHint, writeLoggedOutSignupHintIfNeeded, writeRootAuthContextIfNeeded };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitivedotdev/cli",
-  "version": "0.32.1",
+  "version": "0.34.0",
   "description": "Official Primitive CLI: deploy Primitive Functions, send and inspect mail, manage endpoints, all from the terminal. Wraps the @primitivedotdev/sdk runtime client with one-shot commands.",
   "type": "module",
   "sideEffects": false,
@@ -35,6 +35,9 @@
       "message": "Primitive CLI update available from <%= chalk.greenBright(config.version) %> to <%= chalk.greenBright(latest) %>. Run `npm install -g @primitivedotdev/cli@latest` to update."
     },
     "topics": {
+      "chat": {
+        "description": "Chat with agents over email. Use `primitive chat <email> <message>` to start, `primitive chat reply <message>` to continue the active chat, or `primitive chat reply <id> <message>` to reply in a specific local chat."
+      },
       "cli": {
         "description": "CLI authentication"
       },