primcli 1.38.0 → 1.38.1

package/dist/oclif/index.js

@@ -10741,11 +10741,27 @@ const openapiDocument = {
 					},
 					"quota_mb": {
 						"type": "number",
-						"description": "Storage quota in megabytes (based on plan)"
+						"description": "The plan's included storage in megabytes, the same value as included_mb. It is an allowance, not a limit; see limit_mb."
 					},
 					"percentage": {
 						"type": "number",
-						"description": "Percentage of quota used (1 decimal)"
+						"description": "Storage used as a percentage of the included storage (1 decimal). Can exceed 100."
+					},
+					"included_mb": {
+						"type": "number",
+						"description": "Storage included with the plan, in megabytes."
+					},
+					"limit_mb": {
+						"type": ["number", "null"],
+						"description": "Storage in megabytes past which inbound email is refused. Null when inbound email is never refused for storage."
+					},
+					"overage_mb": {
+						"type": "number",
+						"description": "Storage past included_mb, in megabytes, counting stored email and the search index."
+					},
+					"search_index_bytes": {
+						"type": "integer",
+						"description": "Storage attributed to the semantic search index, in bytes. Counted toward included_mb and overage_mb, never toward limit_mb."
 					},
 					"emails_count": {
 						"type": "integer",
@@ -16888,11 +16904,27 @@ const operationManifest = [
 				},
 				"quota_mb": {
 					"type": "number",
-					"description": "Storage quota in megabytes (based on plan)"
+					"description": "The plan's included storage in megabytes, the same value as included_mb. It is an allowance, not a limit; see limit_mb."
 				},
 				"percentage": {
 					"type": "number",
-					"description": "Percentage of quota used (1 decimal)"
+					"description": "Storage used as a percentage of the included storage (1 decimal). Can exceed 100."
+				},
+				"included_mb": {
+					"type": "number",
+					"description": "Storage included with the plan, in megabytes."
+				},
+				"limit_mb": {
+					"type": ["number", "null"],
+					"description": "Storage in megabytes past which inbound email is refused. Null when inbound email is never refused for storage."
+				},
+				"overage_mb": {
+					"type": "number",
+					"description": "Storage past included_mb, in megabytes, counting stored email and the search index."
+				},
+				"search_index_bytes": {
+					"type": "integer",
+					"description": "Storage attributed to the semantic search index, in bytes. Counted toward included_mb and overage_mb, never toward limit_mb."
 				},
 				"emails_count": {
 					"type": "integer",
@@ -45850,7 +45882,7 @@ const PRIMITIVE_TEAM_AUTHOR = {
 	url: "https://primitive.dev"
 };
 const SDK_VERSION_RANGE = "^1.34.0";
-const CLI_VERSION_RANGE = "^1.38.0";
+const CLI_VERSION_RANGE = "^1.38.1";
 const ESBUILD_VERSION_RANGE = "^0.27.0";
 function renderHandler() {
 	return `// env.PRIMITIVE_API_KEY, env.PRIMITIVE_WEBHOOK_SECRET, and
@@ -51081,6 +51113,52 @@ function retryAfterSeconds$1(result) {
 	const parsed = Number.parseInt(raw, 10);
 	return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
 }
+const SIGN_IN_EMAIL_CHANGE_REQUIRED = "sign_in_email_change_required";
+const SIGN_IN_EMAIL_CHANGE_REQUIRED_FALLBACK = "Your Primitive sign-in email is on a domain Primitive receives mail for. Change it to an external address in the browser, then log in again.";
+function errorMessage$1(payload) {
+	if (!payload || typeof payload !== "object") return null;
+	const inner = payload.error;
+	const message = (inner && typeof inner === "object" ? inner : payload).message;
+	return typeof message === "string" && message.trim() !== "" ? message.trim() : null;
+}
+async function pollCliLoginUntilApproved(params) {
+	const wait = params.sleep ?? sleep;
+	const { retryCommand, start } = params;
+	const deadline = Date.now() + start.expires_in * 1e3;
+	let interval = Math.min(Math.max(1, start.interval), MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS);
+	let nextPollDelay = 1;
+	while (Date.now() < deadline) {
+		await wait(nextPollDelay * 1e3);
+		nextPollDelay = interval;
+		const polled = await params.poll(start.device_code);
+		if (polled.data) {
+			const login = unwrapData$2(polled.data);
+			if (!login) throw cliError$3("Primitive API returned an empty CLI poll response.");
+			return login;
+		}
+		const payload = extractErrorPayload(polled.error);
+		const code = extractErrorCode(payload);
+		if (code === API_ERROR_CODES.authorizationPending) {
+			nextPollDelay = interval;
+			continue;
+		}
+		if (code === API_ERROR_CODES.slowDown) {
+			interval = Math.min(retryAfterSeconds$1(polled) ?? interval + 5, MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS);
+			nextPollDelay = interval;
+			continue;
+		}
+		if (code === "sign_in_email_change_required") throw new Errors.CLIError(errorMessage$1(payload) ?? SIGN_IN_EMAIL_CHANGE_REQUIRED_FALLBACK, {
+			code: SIGN_IN_EMAIL_CHANGE_REQUIRED,
+			exit: 1
+		});
+		if (code === API_ERROR_CODES.accessDenied) throw cliError$3("Primitive CLI login was denied in the browser.");
+		if (code === API_ERROR_CODES.expiredToken) throw cliError$3(`Primitive CLI login expired. Run \`primitive ${retryCommand}\` again.`);
+		if (code === API_ERROR_CODES.invalidDeviceCode) throw cliError$3(`Primitive CLI login device code is invalid. Run \`primitive ${retryCommand}\` again.`);
+		writeErrorWithHints(payload);
+		throw cliError$3("Primitive CLI login failed while polling for approval.");
+	}
+	throw cliError$3(`Primitive CLI login expired. Run \`primitive ${retryCommand}\` again.`);
+}
 async function checkExistingLogin(params) {
 	const requestConfig = resolveCliApiRequestConfig({
 		apiBaseUrl: params.apiBaseUrl,
@@ -51217,57 +51295,32 @@ var LoginCommand$1 = class extends Command {
 		}
 		process.stderr.write(`If the browser did not open, visit: ${start.verification_uri_complete}\n`);
 		process.stderr.write("Waiting for browser approval...\n");
-		const deadline = Date.now() + start.expires_in * 1e3;
-		let interval = Math.min(Math.max(1, start.interval), MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS);
-		let nextPollDelay = 1;
-		while (Date.now() < deadline) {
-			await sleep(nextPollDelay * 1e3);
-			nextPollDelay = interval;
-			const polled = await pollCliLogin({
-				body: { device_code: start.device_code },
+		const login = await pollCliLoginUntilApproved({
+			poll: (deviceCode) => pollCliLogin({
+				body: { device_code: deviceCode },
 				client: apiClient.client,
 				responseStyle: "fields"
-			});
-			if (polled.data) {
-				const login = unwrapData$2(polled.data);
-				if (!login) throw cliError$3("Primitive API returned an empty CLI poll response.");
-				deleteChatState(this.config.configDir);
-				saveCliCredentials(this.config.configDir, {
-					access_token: login.access_token,
-					api_base_url: apiBaseUrl,
-					auth_method: "oauth",
-					created_at: (/* @__PURE__ */ new Date()).toISOString(),
-					expires_at: cliAccessTokenExpiresAt(login.expires_in),
-					oauth_client_id: login.oauth_client_id,
-					oauth_grant_id: login.oauth_grant_id,
-					org_id: login.org_id,
-					org_name: login.org_name,
-					refresh_token: login.refresh_token,
-					token_type: login.token_type
-				});
-				const org = login.org_name ? ` (${login.org_name})` : "";
-				process.stderr.write(`Logged in to org ${login.org_id}${org}.\n`);
-				process.stderr.write(`Saved credentials to ${credentialsPath(this.config.configDir)}.\n`);
-				return;
-			}
-			const payload = extractErrorPayload(polled.error);
-			const code = extractErrorCode(payload);
-			if (code === API_ERROR_CODES.authorizationPending) {
-				nextPollDelay = interval;
-				continue;
-			}
-			if (code === API_ERROR_CODES.slowDown) {
-				interval = Math.min(retryAfterSeconds$1(polled) ?? interval + 5, MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS);
-				nextPollDelay = interval;
-				continue;
-			}
-			if (code === API_ERROR_CODES.accessDenied) throw cliError$3("Primitive CLI login was denied in the browser.");
-			if (code === API_ERROR_CODES.expiredToken) throw cliError$3(`Primitive CLI login expired. Run \`primitive ${retryCommand}\` again.`);
-			if (code === API_ERROR_CODES.invalidDeviceCode) throw cliError$3(`Primitive CLI login device code is invalid. Run \`primitive ${retryCommand}\` again.`);
-			writeErrorWithHints(payload);
-			throw cliError$3("Primitive CLI login failed while polling for approval.");
-		}
-		throw cliError$3(`Primitive CLI login expired. Run \`primitive ${retryCommand}\` again.`);
+			}),
+			retryCommand,
+			start
+		});
+		deleteChatState(this.config.configDir);
+		saveCliCredentials(this.config.configDir, {
+			access_token: login.access_token,
+			api_base_url: apiBaseUrl,
+			auth_method: "oauth",
+			created_at: (/* @__PURE__ */ new Date()).toISOString(),
+			expires_at: cliAccessTokenExpiresAt(login.expires_in),
+			oauth_client_id: login.oauth_client_id,
+			oauth_grant_id: login.oauth_grant_id,
+			org_id: login.org_id,
+			org_name: login.org_name,
+			refresh_token: login.refresh_token,
+			token_type: login.token_type
+		});
+		const org = login.org_name ? ` (${login.org_name})` : "";
+		process.stderr.write(`Logged in to org ${login.org_id}${org}.\n`);
+		process.stderr.write(`Saved credentials to ${credentialsPath(this.config.configDir)}.\n`);
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primcli",
-  "version": "1.38.0",
+  "version": "1.38.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,