primcli 3.0.0-preview.4 → 3.0.0-preview.6

package/dist/oclif/listen-supervisor.js

@@ -1 +1 @@
-export { s as runBackgroundListenSupervisor } from "../listen-background-C0F9gNDD.js";
+export { l as runBackgroundListenSupervisor } from "../listen-background-DyBYca28.js";

package/dist/oclif/receiver-heal.js

@@ -1,7 +1,7 @@
 import { N as agentProfileDirectory, P as agentProfileName, R as loadConnectedAgentProfile, j as AGENT_PROFILE_ENV } from "../cli-config-Ms_0vNjq.js";
-import { a as claimBackgroundListenRestart, n as backgroundListenRestartable, r as backgroundListenStatus } from "../listen-background-C0F9gNDD.js";
-import { d as SESSION_UUID, t as notificationScope } from "../notify-session-aMGIFmeu.js";
-import { It as detectAgentRuntime } from "../api-command-BFfgKPTp.js";
+import { a as backgroundListenStatus, i as backgroundListenRestartable, s as claimBackgroundListenRestart, t as BACKGROUND_LISTEN_RELAUNCH_ENV } from "../listen-background-DyBYca28.js";
+import { d as SESSION_UUID, t as notificationScope } from "../notify-session-DTyg-sfS.js";
+import { It as detectAgentRuntime } from "../api-command-CRjIK1QL.js";
 import { d as readMailJson } from "../shared-mail-files-BAQSGxxz.js";
 import { join } from "node:path";
 import { spawn } from "node:child_process";
@@ -66,6 +66,7 @@ function healSelectedReceiver(options = {}) {
 		PRIMITIVE_CONFIG_DIR: configDir,
 		[RECEIVER_HEAL_ENV]: "0"
 	};
+	delete childEnv[BACKGROUND_LISTEN_RELAUNCH_ENV];
 	(options.spawnListener ?? spawnDetached)(listenArgv, childEnv);
 	return {
 		action: "restarting",

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

@@ -31,23 +31,23 @@ function readRootCredentials(configDir) {
 		return null;
 	}
 }
-function accountEndpoint(apiBaseUrl) {
-	return `${apiBaseUrl.replace(/\/+$/, "")}/account`;
+function whoamiEndpoint(apiBaseUrl) {
+	return `${apiBaseUrl.replace(/\/+$/, "")}/whoami`;
 }
-function parseRootAccount(payload) {
+function parseRootIdentity(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;
+	const identity = data;
+	if (typeof identity.org_id !== "string" || !identity.org_id.trim()) return null;
+	const member = identity.member_address;
 	return {
-		email: account.email,
-		id: account.id
+		memberAddress: member && typeof member.address === "string" && member.address.trim() ? member.address : null,
+		orgId: identity.org_id
 	};
 }
-function rootAuthLine(account) {
-	return `Signed in as ${account.email} (org ${account.id})\n\n`;
+function rootAuthLine(identity) {
+	return identity.memberAddress ? `Signed in as ${identity.memberAddress} (org ${identity.orgId})\n\n` : `Signed in (org ${identity.orgId})\n\n`;
 }
 function rootRequestConfig(configDir, env) {
 	const config = loadCliConfig(configDir);
@@ -60,11 +60,11 @@ function rootRequestConfig(configDir, env) {
 		headers: currentEnvironment?.config.headers
 	};
 }
-async function fetchRootAccount(params) {
+async function fetchRootIdentity(params) {
 	const controller = new AbortController();
 	const timer = setTimeout(() => controller.abort(), params.timeoutMs);
 	try {
-		const response = await params.fetch(accountEndpoint(params.apiBaseUrl), {
+		const response = await params.fetch(whoamiEndpoint(params.apiBaseUrl), {
 			headers: {
 				...params.headers ?? {},
 				accept: "application/json",
@@ -73,7 +73,7 @@ async function fetchRootAccount(params) {
 			signal: controller.signal
 		});
 		if (!response.ok) return null;
-		return parseRootAccount(await response.json().catch(() => null));
+		return parseRootIdentity(await response.json().catch(() => null));
 	} catch {
 		return null;
 	} finally {
@@ -95,14 +95,14 @@ async function rootSignedInSummary(options = {}) {
 	const stored = explicitApiKey ? null : readRootCredentials(configDir);
 	const apiKey = explicitApiKey || stored?.accessToken;
 	if (!apiKey) return null;
-	const account = await fetchRootAccount({
+	const identity = await fetchRootIdentity({
 		apiBaseUrl: stored?.apiBaseUrl ?? requestConfig.apiBaseUrl,
 		apiKey,
 		fetch: options.fetch ?? fetch,
 		headers: requestConfig.headers,
 		timeoutMs: options.timeoutMs ?? ROOT_AUTH_TIMEOUT_MS
 	});
-	return account ? rootAuthLine(account) : null;
+	return identity ? rootAuthLine(identity) : null;
 }
 function shouldShowLoggedOutSignupHint(options = {}) {
 	if ((options.argv ?? process.argv.slice(2)).length > 0) return false;