primcli 1.74.0 → 1.74.1

package/dist/oclif/index.js

@@ -49109,7 +49109,7 @@ const PRIMITIVE_TEAM_AUTHOR = {
 	url: "https://primitive.dev"
 };
 const SDK_VERSION_RANGE = "^2.0.0";
-const CLI_VERSION_RANGE = "^1.74.0";
+const CLI_VERSION_RANGE = "^1.74.1";
 const ESBUILD_VERSION_RANGE = "^0.27.0";
 function renderHandler() {
 	return `// env.PRIMITIVE_API_KEY, env.PRIMITIVE_WEBHOOK_SECRET, and
@@ -56463,15 +56463,36 @@ async function memberCredentialsFor(options) {
 		return null;
 	}
 }
+/**
+* How far the server's claim time may run ahead of the time the CLI saved
+* the key it returned, before the claim is taken to be a later one. It
+* absorbs clock skew between this machine and Primitive.
+*/
+const CLAIM_SKEW_MS = 3e5;
+/**
+* Whether the list shows a saved profile's key is still the connection's
+* current one, without reading the profile's own record. A connection gets a
+* new key only by being claimed again, which moves `claimed_at` past the
+* moment this profile saved its key; a reconnect in progress shows as
+* pending, and its old key is already revoked. Either way the profile reads
+* its own record, which tells a rejected key from a live one.
+*/
+function keyStillCurrent(listed, profile) {
+	if (listed.status !== "connected" && listed.status !== "claimed") return false;
+	const saved = Date.parse(profile.created_at);
+	return listed.claimedAt !== null && Number.isFinite(saved) && listed.claimedAt <= saved + CLAIM_SKEW_MS;
+}
 /** Pages to read before giving up on confirming absence (10,000 agents). */
 const OWNER_LIST_MAX_PAGES = 200;
 /**
-* The member's connection list, hidden agents included, as address to status.
-* Read once per run. `complete` is true only when every page was read and the
+* The member's connection list, hidden agents included, by address. Read
+* once per run. `complete` is true only when every page was read and the
 * last one explicitly ended the list (`meta.cursor: null`): a status found on
-* any page stands, but absence is proof only from a complete list.
+* any page stands, but absence is proof only from a complete list. Paging
+* stops early, with `complete` false, once every address in `wanted` has
+* been found, so a large organization does not cost a long read.
 */
-async function ownerConnectionStatuses(credentials, fetchImpl) {
+async function ownerConnectionStatuses(credentials, fetchImpl, wanted) {
 	const statuses = /* @__PURE__ */ new Map();
 	const partial = () => ({
 		statuses,
@@ -56501,12 +56522,19 @@ async function ownerConnectionStatuses(credentials, fetchImpl) {
 			if (text.length > 1048576) return partial();
 			const body = JSON.parse(text);
 			if (body.success !== true || !Array.isArray(body.data)) return partial();
-			for (const row of body.data) if (typeof row?.address === "string" && typeof row.status === "string") statuses.set(row.address, row.status);
+			for (const row of body.data) if (typeof row?.address === "string" && typeof row.status === "string") {
+				const claimedAt = typeof row.claimed_at === "string" ? Date.parse(row.claimed_at) : NaN;
+				statuses.set(row.address, {
+					status: row.status,
+					claimedAt: Number.isFinite(claimedAt) ? claimedAt : null
+				});
+			}
 			const next = body.meta?.cursor;
 			if (next === null) return {
 				statuses,
 				complete: true
 			};
+			if (wanted && [...wanted].every((address) => statuses.has(address))) return partial();
 			if (typeof next !== "string" || !next || next === cursor) return partial();
 			cursor = next;
 		} catch {
@@ -56834,26 +56862,59 @@ async function runMachineDoctor(options) {
 		let ownerList;
 		let unknown = 0;
 		let connected = 0;
+		let limited = 0;
+		member = await memberCredentialsFor(options);
+		const checkableBy = (credentials, profile) => !!credentials && credentials.org_id === profile.org_id && credentials.api_base_url === profile.api_base_url;
+		let rateLimited = false;
+		const observedFetch = (async (input, init) => {
+			const response = await fetchImpl(input, init);
+			if (response.status === 429) rateLimited = true;
+			return response;
+		});
+		const listable = profiles.filter((entry) => checkableBy(member, entry.profile));
+		if (listable.length && member) ownerList = await ownerConnectionStatuses(member, observedFetch, new Set(listable.map((entry) => entry.profile.agent_address)));
+		const sharedAddresses = /* @__PURE__ */ new Set();
+		{
+			const seen = /* @__PURE__ */ new Set();
+			for (const entry of profiles) {
+				const address = entry.profile.agent_address.toLowerCase();
+				if (seen.has(address)) sharedAddresses.add(address);
+				seen.add(address);
+			}
+		}
+		const unresolved = [];
+		for (const entry of profiles) {
+			const listed = ownerList && checkableBy(member, entry.profile) && !sharedAddresses.has(entry.profile.agent_address.toLowerCase()) ? ownerList.statuses.get(entry.profile.agent_address) : void 0;
+			if (listed?.status === "revoked") orphans.push(entry);
+			else if (listed && keyStillCurrent(listed, entry.profile)) connected++;
+			else unresolved.push(entry);
+		}
 		const states = [];
-		for (let start = 0; start < profiles.length; start += 8) states.push(...await Promise.all(profiles.slice(start, start + 8).map(async (entry) => ({
-			...entry,
-			state: await agentConnectionState(entry.profile, fetchImpl)
-		}))));
+		for (let start = 0; start < unresolved.length; start += 8) {
+			if (rateLimited) {
+				limited = unresolved.length - start;
+				unknown += limited;
+				break;
+			}
+			states.push(...await Promise.all(unresolved.slice(start, start + 8).map(async (entry) => ({
+				...entry,
+				state: await agentConnectionState(entry.profile, observedFetch)
+			}))));
+		}
 		for (const entry of states) if (entry.state === "revoked") orphans.push(entry);
 		else if (entry.state === "rejected") {
-			member ??= await memberCredentialsFor(options);
-			const checkable = !!member && member.org_id === entry.profile.org_id && member.api_base_url === entry.profile.api_base_url;
+			const checkable = checkableBy(member, entry.profile);
 			if (member && !checkable) elsewhere++;
-			if (checkable && member && ownerList === void 0) ownerList = await ownerConnectionStatuses(member, fetchImpl);
-			const listed = checkable && ownerList ? ownerList.statuses.get(entry.profile.agent_address) ?? (ownerList.complete ? "absent" : null) : null;
+			const listed = checkable && ownerList ? ownerList.statuses.get(entry.profile.agent_address)?.status ?? (ownerList.complete ? "absent" : null) : null;
 			if (listed === "revoked" || listed === "absent") orphans.push(entry);
 			else unconfirmed.push(entry.profile.agent_address);
 		} else if (entry.state === "unavailable") unknown++;
 		else connected++;
 		if (orphans.length) return check("profiles.orphaned", "fail", `${orphans.length} saved profiles were disconnected or removed in Primitive: ${orphans.map((entry) => entry.profile.agent_address).join(", ")}. A repair moves them aside locally; nothing changes in Primitive.`, { fixable: true });
 		if (unconfirmed.length || unreadable) return check("profiles.orphaned", "warn", [unconfirmed.length ? `${unconfirmed.length} saved profiles have credentials Primitive no longer accepts (${unconfirmed.slice(0, 5).join(", ")}${unconfirmed.length > 5 ? `, and ${unconfirmed.length - 5} more` : ""}). They cannot send or receive. To clean them up, sign in with \`primitive login --force\` as a member of their organization and run \`primitive machine doctor --fix\`, which confirms each one is disconnected before moving it aside${elsewhere ? `. ${elsewhere} of them belong to an organization or Primitive API your current sign-in is not for, so sign in there to check them` : ""}` : "", unreadable ? `${unreadable} profiles could not be read` : ""].filter(Boolean).join("; ").concat("; they were left unchanged."));
-		if (unknown && !connected) return check("profiles.orphaned", "skip", "Primitive could not be reached to check saved profiles.");
-		return check("profiles.orphaned", "ok", `${connected} saved profiles are connected${unknown ? `; ${unknown} could not be checked` : ""}.`);
+		const limitedNote = limited ? ` Primitive rate limited this check, so ${limited} saved profiles were not asked about; the next run checks them.` : "";
+		if (unknown && !connected) return check("profiles.orphaned", "skip", `Primitive could not be reached to check saved profiles.${limitedNote}`);
+		return check("profiles.orphaned", "ok", `${connected} saved profiles are connected${unknown ? `; ${unknown} could not be checked` : ""}.${limitedNote}`);
 	};
 	const moveOrphans = async () => {
 		let moved = 0;

package/package.json

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