@primitivedotdev/cli 0.35.0 → 0.35.1

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

@@ -1,4 +1,4 @@
-import { b as normalizeApiBaseUrl1, c as resolveConfigEnvironment, i as loadCliConfig } from "../cli-config-SktG2dzR.js";
+import { b as normalizeApiBaseUrl, c as resolveConfigEnvironment, i as loadCliConfig } from "../cli-config-DREZ2BxT.js";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
@@ -20,17 +20,18 @@ function readRootCredentials(configDir) {
 		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;
+		const apiBaseUrl = parsed.api_base_url ?? parsed.api_base_url_1;
+		if (typeof apiBaseUrl !== "string" || !apiBaseUrl.trim()) return null;
 		return {
 			accessToken: parsed.access_token,
-			apiBaseUrl1: parsed.api_base_url_1.replace(/\/+$/, "")
+			apiBaseUrl: apiBaseUrl.replace(/\/+$/, "")
 		};
 	} catch {
 		return null;
 	}
 }
-function accountEndpoint(apiBaseUrl1) {
-	return `${apiBaseUrl1.replace(/\/+$/, "")}/account`;
+function accountEndpoint(apiBaseUrl) {
+	return `${apiBaseUrl.replace(/\/+$/, "")}/account`;
 }
 function parseRootAccount(payload) {
 	if (payload === null || typeof payload !== "object" || Array.isArray(payload)) return null;
@@ -49,11 +50,11 @@ function rootAuthLine(account) {
 }
 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;
+	const configuredApiBaseUrl = currentEnvironment?.config.api_base_url;
+	const envApiBaseUrl = env.PRIMITIVE_API_BASE_URL?.trim();
+	if (currentEnvironment !== null && currentEnvironment.name !== "default" && !envApiBaseUrl && !configuredApiBaseUrl) return null;
 	return {
-		apiBaseUrl1: normalizeApiBaseUrl1(envApiBaseUrl1 || configuredApiBaseUrl1),
+		apiBaseUrl: normalizeApiBaseUrl(envApiBaseUrl || configuredApiBaseUrl),
 		headers: currentEnvironment?.config.headers
 	};
 }
@@ -61,7 +62,7 @@ async function fetchRootAccount(params) {
 	const controller = new AbortController();
 	const timer = setTimeout(() => controller.abort(), params.timeoutMs);
 	try {
-		const response = await params.fetch(accountEndpoint(params.apiBaseUrl1), {
+		const response = await params.fetch(accountEndpoint(params.apiBaseUrl), {
 			headers: {
 				...params.headers ?? {},
 				accept: "application/json",
@@ -93,7 +94,7 @@ async function rootSignedInSummary(options = {}) {
 	const apiKey = explicitApiKey || stored?.accessToken;
 	if (!apiKey) return null;
 	const account = await fetchRootAccount({
-		apiBaseUrl1: stored?.apiBaseUrl1 ?? requestConfig.apiBaseUrl1,
+		apiBaseUrl: stored?.apiBaseUrl ?? requestConfig.apiBaseUrl,
 		apiKey,
 		fetch: options.fetch ?? fetch,
 		headers: requestConfig.headers,

package/man/primitive.1

@@ -99,11 +99,8 @@ API key used when
 .B --api-key
 is not supplied and no saved OAuth credential should be used.
 .TP
-.B PRIMITIVE_API_BASE_URL_1
-Override the primary API base URL. Intended for development and testing.
-.TP
-.B PRIMITIVE_API_BASE_URL_2
-Override the secondary API base URL used for selected send flows. Intended for development and testing.
+.B PRIMITIVE_API_BASE_URL
+Override the API base URL. Intended for development and testing.
 .SH FILES
 .TP
 .I ~/.config/primitive

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitivedotdev/cli",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "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,