@primitivedotdev/cli 0.35.0 → 0.36.0

package/dist/{cli-config-SktG2dzR.js → cli-config-D7wN_PBc.js}

@@ -620,44 +620,21 @@ const createClient = (config = {}) => {
 * `.forward`) still lives in sdk-node because it needs the
 * `ReceivedEmail` type from the webhook parsing surface.
 */
-const DEFAULT_API_BASE_URL_1 = "https://www.primitive.dev/api/v1";
-const DEFAULT_API_BASE_URL_2 = "https://api.primitive.dev/v1";
+const DEFAULT_API_BASE_URL = "https://api.primitive.dev/v1";
 function createDefaultAuth(apiKey) {
 	return (security) => {
 		if (security.type === "http" && security.scheme === "bearer") return apiKey;
 	};
 }
 var PrimitiveApiClient = class {
-	/**
-	* Generated client targeting the primary API host (apiBaseUrl1). Use
-	* this when passing `client: ...` to a generated operation function
-	* for every endpoint EXCEPT attachment-capable message sends. The
-	* hand-written PrimitiveClient.send / .reply / .forward methods on
-	* the subclass route those sends to the host-2 client internally.
-	*/
 	client;
-	/**
-	* @internal Generated client targeting the attachments-supporting
-	* send host (apiBaseUrl2). Used by PrimitiveClient.send() and
-	* PrimitiveClient.reply() under the hood. Exposed for the CLI's
-	* hand-rolled send/reply commands, which call generated operations
-	* directly; not part of the publicly-documented SDK surface.
-	* Customer code should call .send() / .reply() on the subclass
-	* instead.
-	*/
-	_sendClient;
 	constructor(options = {}) {
-		const { apiKey, auth, apiBaseUrl1 = DEFAULT_API_BASE_URL_1, apiBaseUrl2 = DEFAULT_API_BASE_URL_2, ...config } = options;
+		const { apiKey, auth, apiBaseUrl = DEFAULT_API_BASE_URL, ...config } = options;
 		const resolvedAuth = auth ?? createDefaultAuth(apiKey);
 		this.client = createClient(createConfig({
 			...config,
 			auth: resolvedAuth,
-			baseUrl: apiBaseUrl1
-		}));
-		this._sendClient = createClient(createConfig({
-			...config,
-			auth: resolvedAuth,
-			baseUrl: apiBaseUrl2
+			baseUrl: apiBaseUrl
 		}));
 	}
 	getConfig() {
@@ -849,6 +826,11 @@ function requireString(value, key) {
 	if (typeof raw !== "string" || raw.trim().length === 0) throw new Error(`Stored Primitive CLI credentials are malformed: ${key} must be a non-empty string. ${MALFORMED_CREDENTIALS_HINT}`);
 	return raw;
 }
+function readStoredApiBaseUrl(raw) {
+	const value = raw.api_base_url ?? raw.api_base_url_2 ?? raw.api_base_url_1;
+	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`Stored Primitive CLI credentials are malformed: api_base_url must be a non-empty string. ${MALFORMED_CREDENTIALS_HINT}`);
+	return normalizeApiBaseUrl(value);
+}
 /**
 * Sentinel returned by parseCredentials when the on-disk credentials were
 * written by an API-key-based CLI. The caller treats this as "not logged in"
@@ -880,7 +862,7 @@ function parseCredentials(raw) {
 		oauth_client_id: requireString(raw, "oauth_client_id"),
 		org_id: requireString(raw, "org_id"),
 		org_name: orgName,
-		api_base_url_1: requireString(raw, "api_base_url_1"),
+		api_base_url: readStoredApiBaseUrl(raw),
 		created_at: requireString(raw, "created_at")
 	};
 }
@@ -895,11 +877,28 @@ function normalize(url, fallback) {
 	if (!trimmed) return fallback;
 	return trimmed.replace(/\/+$/, "");
 }
-function normalizeApiBaseUrl1(url) {
-	return normalize(url, DEFAULT_API_BASE_URL_1);
+function canonicalizeKnownApiBaseUrl(url) {
+	let parsed;
+	try {
+		parsed = new URL(url);
+	} catch {
+		return url;
+	}
+	if (parsed.pathname.replace(/\/+$/, "") !== "/api/v1") return url;
+	if (parsed.hostname === "primitive.dev" || parsed.hostname === "www.primitive.dev") {
+		parsed.hostname = "api.primitive.dev";
+		parsed.pathname = "/v1";
+		return parsed.toString().replace(/\/+$/, "");
+	}
+	if (parsed.hostname === "primitive-staging-1.com") {
+		parsed.hostname = "api.primitive-staging-1.com";
+		parsed.pathname = "/v1";
+		return parsed.toString().replace(/\/+$/, "");
+	}
+	return url;
 }
-function normalizeApiBaseUrl2(url) {
-	return normalize(url, DEFAULT_API_BASE_URL_2);
+function normalizeApiBaseUrl(url) {
+	return canonicalizeKnownApiBaseUrl(normalize(url, DEFAULT_API_BASE_URL));
 }
 function cliAccessTokenExpiresAt(expiresInSeconds, now = Date.now) {
 	return new Date(now() + expiresInSeconds * 1e3).toISOString();
@@ -1091,28 +1090,43 @@ function acquireCliCredentialsLock(configDir, options = {}) {
 		});
 	};
 }
+/**
+* Detect the PRIMITIVE_KEY vs PRIMITIVE_API_KEY rename trap.
+*
+* AGX feedback: users on older docs (or coming from other tools) set
+* `PRIMITIVE_KEY` and then cannot figure out why the CLI reports no
+* API key. The CLI reads `PRIMITIVE_API_KEY` only. Returns a stderr
+* hint when `PRIMITIVE_KEY` is set but `PRIMITIVE_API_KEY` is not,
+* otherwise null. Exported as a helper so both `doctor` and the
+* general auth-resolution path surface the same guidance from the
+* first command the user runs, instead of forcing them to discover
+* the rename via `doctor` after the fact.
+*/
+function detectPrimitiveKeyEnvMisname(env = process.env) {
+	const primitiveKey = env.PRIMITIVE_KEY;
+	const primitiveApiKey = env.PRIMITIVE_API_KEY;
+	if ((primitiveKey?.length ?? 0) > 0 && (primitiveApiKey?.length ?? 0) === 0) return "PRIMITIVE_KEY is set but the CLI reads PRIMITIVE_API_KEY. Rename your env var, or re-run with PRIMITIVE_API_KEY=$PRIMITIVE_KEY.";
+	return null;
+}
 function resolveCliAuth(params) {
 	const apiKey = params.apiKey?.trim();
-	const apiBaseUrl2 = normalizeApiBaseUrl2(params.apiBaseUrl2);
+	const apiBaseUrl = normalizeApiBaseUrl(params.apiBaseUrl);
 	if (apiKey) return {
 		apiKey,
-		apiBaseUrl1: normalizeApiBaseUrl1(params.apiBaseUrl1),
-		apiBaseUrl2,
+		apiBaseUrl,
 		credentials: null,
 		source: "flag-or-env"
 	};
 	const credentials = loadCliCredentials(params.configDir);
 	if (credentials) return {
 		apiKey: credentials.access_token,
-		apiBaseUrl1: credentials.api_base_url_1,
-		apiBaseUrl2,
+		apiBaseUrl: credentials.api_base_url,
 		credentials,
 		source: "stored"
 	};
 	return {
 		apiKey: void 0,
-		apiBaseUrl1: normalizeApiBaseUrl1(params.apiBaseUrl1),
-		apiBaseUrl2,
+		apiBaseUrl,
 		credentials: null,
 		source: "none"
 	};
@@ -1169,13 +1183,10 @@ function parseHeaders(raw, context) {
 function parseEnvironmentConfig(raw, context) {
 	if (!isRecord(raw)) throw cliConfigError(`${context} must be a JSON object.`);
 	const env = {};
-	if (raw.api_base_url_1 !== void 0) {
-		if (typeof raw.api_base_url_1 !== "string") throw cliConfigError(`${context}.api_base_url_1 must be a string.`);
-		env.api_base_url_1 = normalizeApiBaseUrl1(raw.api_base_url_1);
-	}
-	if (raw.api_base_url_2 !== void 0) {
-		if (typeof raw.api_base_url_2 !== "string") throw cliConfigError(`${context}.api_base_url_2 must be a string.`);
-		env.api_base_url_2 = normalizeApiBaseUrl2(raw.api_base_url_2);
+	const rawApiBaseUrl = raw.api_base_url ?? raw.api_base_url_2 ?? raw.api_base_url_1;
+	if (rawApiBaseUrl !== void 0) {
+		if (typeof rawApiBaseUrl !== "string") throw cliConfigError(`${context}.api_base_url must be a string.`);
+		env.api_base_url = normalizeApiBaseUrl(rawApiBaseUrl);
 	}
 	const headers = parseHeaders(raw.headers, context);
 	if (Object.keys(headers).length > 0) env.headers = headers;
@@ -1259,7 +1270,7 @@ function resolveConfigEnvironment(config) {
 	} : null;
 }
 function upsertCliEnvironment(params) {
-	const name = normalizeCliEnvironmentName(params.environmentName ?? "default");
+	const name = normalizeCliEnvironmentName(params.environmentName ?? resolveConfigEnvironment(params.config)?.name ?? "default");
 	const existing = params.config.environments[name] ?? {};
 	const nextHeaders = { ...existing.headers ?? {} };
 	for (const assignment of params.headers ?? []) {
@@ -1269,8 +1280,7 @@ function upsertCliEnvironment(params) {
 	for (const rawName of params.unsetHeaders ?? []) delete nextHeaders[validateCliHeaderName(rawName)];
 	const nextEnvironment = {
 		...existing,
-		...params.apiBaseUrl1 !== void 0 ? { api_base_url_1: normalizeApiBaseUrl1(params.apiBaseUrl1) } : {},
-		...params.apiBaseUrl2 !== void 0 ? { api_base_url_2: normalizeApiBaseUrl2(params.apiBaseUrl2) } : {},
+		...params.apiBaseUrl !== void 0 ? { api_base_url: normalizeApiBaseUrl(params.apiBaseUrl) } : {},
 		...Object.keys(nextHeaders).length > 0 ? { headers: nextHeaders } : {}
 	};
 	if (Object.keys(nextHeaders).length === 0) delete nextEnvironment.headers;
@@ -1301,4 +1311,4 @@ function redactCliEnvironment(environment) {
 	};
 }
 //#endregion
-export { createClient as A, saveCliCredentials as C, loadChatConversationByLocalId as D, loadActiveChatState as E, saveActiveChatState as O, resolveCliAuth as S, deleteChatState as T, deleteCliCredentials as _, normalizeCliEnvironmentName as a, normalizeApiBaseUrl1 as b, resolveConfigEnvironment as c, validateCliHeaderName as d, validateCliHeaderValue as f, credentialsPath as g, credentialsLockPath as h, loadCliConfig as i, createConfig as j, PrimitiveApiClient as k, saveCliConfig as l, cliAccessTokenExpiresAt as m, deleteCliConfig as n, redactCliEnvironment as o, acquireCliCredentialsLock as p, emptyCliConfig as r, removeCliEnvironment as s, DEFAULT_ENVIRONMENT as t, upsertCliEnvironment as u, deleteCliCredentialsLock as v, chatStatePath as w, normalizeApiBaseUrl2 as x, loadCliCredentials as y };
+export { createClient as A, saveCliCredentials as C, loadChatConversationByLocalId as D, loadActiveChatState as E, saveActiveChatState as O, resolveCliAuth as S, deleteChatState as T, deleteCliCredentials as _, normalizeCliEnvironmentName as a, loadCliCredentials as b, resolveConfigEnvironment as c, validateCliHeaderName as d, validateCliHeaderValue as f, credentialsPath as g, credentialsLockPath as h, loadCliConfig as i, createConfig as j, PrimitiveApiClient as k, saveCliConfig as l, cliAccessTokenExpiresAt as m, deleteCliConfig as n, redactCliEnvironment as o, acquireCliCredentialsLock as p, emptyCliConfig as r, removeCliEnvironment as s, DEFAULT_ENVIRONMENT as t, upsertCliEnvironment as u, deleteCliCredentialsLock as v, chatStatePath as w, normalizeApiBaseUrl as x, detectPrimitiveKeyEnvMisname as y };