primcli 1.49.0 → 1.51.0

package/dist/{machine-session-BEkDi4_N.js → machine-session-DqxgyupM.js}

@@ -1,9 +1,9 @@
 import { n as __exportAll } from "./rolldown-runtime-CNZpIYwj.js";
 import { B as parseOwnerMemberAddress, F as agentProfilesDirectory, I as connectedAgentIdentity, L as connectedApiBaseUrl, M as AgentConnectionSetupError, N as agentProfileDirectory, P as agentProfileName, R as loadConnectedAgentProfile, U as saveConnectedAgentProfile, V as profileAlreadyConnectedMessage, W as PrimitiveApiClient, j as AGENT_PROFILE_ENV, x as loadCliCredentials, z as parseConnectedAgentProfile } from "./cli-config-DGrZCUfw.js";
-import { $t as getAgentContactPolicy, Dn as listSentEmails, Fn as putContact, Gn as sendEmail, Gt as deleteAgentContact, Hn as searchEmails, Kt as deleteContact, Nn as putAgentContact, Pn as putAgentContactPolicy, Pt as refreshStoredCliCredentials, _n as listContacts, bn as listDomains, en as getContact, hn as listAgentContacts, in as getEmail } from "./api-command-BixHVNwQ.js";
+import { $n as searchEmails, En as listAgentContacts, Gn as putAgentContactPolicy, Gt as refreshStoredCliCredentials, Kn as putContact, On as listContacts, Rn as listSentEmails, V as defaultConnectionName, Wn as putAgentContact, dn as getContact, hn as getEmail, jn as listDomains, nn as deleteAgentContact, nr as sendEmail, rn as deleteContact, un as getAgentContactPolicy } from "./api-command-Bd21hvqY.js";
 import { _ as acquireListenLock, c as mailTime, d as readMailJson, f as removeMailFile, g as ListenStateError, h as writeMailJson, i as mailId, l as privateMailDirectory, o as mailObject, r as mailAddress, s as mailString } from "./shared-mail-files-SPPcis9g.js";
-import { a as scopedChatSenderTrust } from "./scoped-chat-DSLrmgWQ.js";
-import { _ as NativeSessionDisconnectedError, a as readBundledConnectSkill, g as defaultSessionSocket, h as connectNativeSession, m as SESSION_UUID, n as detectAgentRuntime, o as notificationScope, r as installConnectSkill, u as NotificationRetryError } from "./connect-skill-DBkhFAkO.js";
+import { _ as detectAgentRuntime, a as NotificationRetryError, d as defaultSessionSocket, f as NativeSessionDisconnectedError, l as SESSION_UUID, t as notificationScope, u as connectNativeSession, v as installConnectSkill, x as readBundledConnectSkill } from "./notify-session-ejjYXO3O.js";
+import { a as scopedChatSenderTrust } from "./scoped-chat-BJVYBRim.js";
 import { l as stopBackgroundListen, r as backgroundListenStatus } from "./listen-background-CMfxkeVP.js";
 import { t as readSharedMailOwner } from "./shared-mail-watch-CWhpfJ0N.js";
 import { accessSync, chmodSync, closeSync, constants, copyFileSync, existsSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, writeFileSync } from "node:fs";
@@ -1636,6 +1636,7 @@ const MAX_INVITATION_BYTES = 4096;
 const MAX_RESPONSE_BYTES = 32768;
 const UNCERTAIN_CLAIM = "Setup did not complete safely. The invitation may have been consumed. Request a fresh invitation from the owner; do not retry this invitation.";
 const INVITATION_UNAVAILABLE = "This invitation was already used, has expired, or was revoked, so it cannot connect this agent. Ask the owner to copy a fresh setup instruction from the app. Nothing was changed on this machine.";
+const INVITATION_ATTEMPTED_HERE = "An earlier setup on this machine already submitted this invitation and did not finish, so it was not submitted again; it may already be used. Ask the owner to copy a fresh setup instruction from the app. Nothing was changed on this machine.";
 const INVITATION_INVALID = "Primitive rejected this invitation as invalid. Ask the owner to copy a fresh setup instruction from the app. Nothing was changed on this machine.";
 /**
 * The server answered the claim with a definite refusal, so nothing was
@@ -1683,12 +1684,70 @@ async function definiteClaimRefusal(response) {
 	}
 	return null;
 }
+/** The message for an invitation another profile on this machine already claimed. */
+function invitationUsedHereMessage(address) {
+	return `This invitation was already used on this machine${address ? ` to connect ${address}` : ""} under another profile, so it cannot connect this agent. Ask the owner to copy a fresh setup instruction from the app. Nothing was changed on this machine.`;
+}
+/**
+* A local record says this invitation was submitted before. It is never
+* submitted again: the claim is one-use, and a second submission could not
+* recover a credential lost with an earlier response. The refusal names the
+* address when the earlier attempt finished, and is a definite local refusal
+* either way, so a caller may discard whatever it created for this run.
+*/
+function earlierAttemptRefusal(configDir, journal, invitationHash) {
+	const record = journal;
+	let address = null;
+	if (record?.status === "claimed" && typeof record.agent_address === "string") address = record.agent_address;
+	else if (typeof record?.profile_name === "string") try {
+		const earlier = loadConnectedAgentProfile(configDir, record.profile_name);
+		if (earlier?.invitation_hash === invitationHash) address = earlier.agent_address;
+	} catch {}
+	return address !== null || record?.status === "claimed" ? new AgentInvitationRejectedError(invitationUsedHereMessage(address), "invitation_used_here") : new AgentInvitationRejectedError(INVITATION_ATTEMPTED_HERE, "invitation_attempted_here");
+}
 /** Removes a directory only when it is empty. Best effort. */
 function removeEmptyDirectory(path) {
 	try {
 		rmdirSync(path);
 	} catch {}
 }
+const CONNECTION_NAME_FILE = "connection-name.json";
+/**
+* The display name this profile's claim reported, saved beside the profile
+* so a resumed setup can report it too. Undefined when none was saved.
+*/
+function savedConnectionName(configDir, profileName) {
+	try {
+		const saved = readMailJson(join(agentProfileDirectory(configDir, profileName), CONNECTION_NAME_FILE));
+		return saved?.version === 1 ? claimedConnectionName({ data: { connection: { name: saved.name } } }) : void 0;
+	} catch {
+		return;
+	}
+}
+/**
+* Saves the connection's current display name beside its profile: from the
+* claim, and again after `agent rename`. Best effort: without it a resume
+* omits the name, as for a claim made by an older version.
+*/
+function saveConnectionName(configDir, profileName, name) {
+	try {
+		writeMailJson(join(agentProfileDirectory(configDir, profileName), CONNECTION_NAME_FILE), {
+			version: 1,
+			name
+		});
+	} catch {}
+}
+/** The display name a claim response reports, or undefined when unusable. */
+function claimedConnectionName(value) {
+	const name = value?.data?.connection?.name;
+	if (typeof name !== "string") return void 0;
+	const trimmed = name.trim();
+	const printable = Array.from(trimmed).every((character) => {
+		const code = character.charCodeAt(0);
+		return code >= 32 && !(code >= 127 && code <= 159) && code !== 8232 && code !== 8233;
+	});
+	return trimmed.length > 0 && trimmed.length <= 80 && printable ? trimmed : void 0;
+}
 /** The receiver a saved profile's setup record names. Offline. */
 function savedReceiver(configDir, profileName) {
 	try {
@@ -1903,12 +1962,18 @@ async function connectAgent(params) {
 				identity: connectedAgentIdentity(profileName, existing)
 			};
 		}
+		const journal = join(directory, "claims", `${invitationHash}.json`);
+		privateMailDirectory(join(directory, "claims"), true);
+		let earlier;
+		try {
+			earlier = readMailJson(journal);
+		} catch {
+			throw new AgentConnectionSetupError(UNCERTAIN_CLAIM);
+		}
+		if (earlier !== null) throw earlierAttemptRefusal(params.configDir, earlier, invitationHash);
 		privateMailDirectory(join(directory, "profiles"), true);
 		const profileDirectory = agentProfileDirectory(params.configDir, profileName);
 		privateMailDirectory(profileDirectory, true);
-		const journal = join(directory, "claims", `${invitationHash}.json`);
-		privateMailDirectory(join(directory, "claims"), true);
-		if (readMailJson(journal) !== null) throw new AgentConnectionSetupError(UNCERTAIN_CLAIM);
 		writeMailJson(journal, {
 			version: 1,
 			profile_name: profileName,
@@ -1940,11 +2005,23 @@ async function connectAgent(params) {
 				removeEmptyDirectory(profileDirectory);
 				throw refusal;
 			}
-			const profile = profileFromClaim(await readClaimResponse(response), invitation, invitationHash, params.now ?? Date.now);
+			const body = await readClaimResponse(response);
+			const profile = profileFromClaim(body, invitation, invitationHash, params.now ?? Date.now);
+			const name = claimedConnectionName(body);
 			saveConnectedAgentProfile(params.configDir, profileName, profile);
+			try {
+				writeMailJson(journal, {
+					version: 1,
+					profile_name: profileName,
+					status: "claimed",
+					agent_address: profile.agent_address
+				});
+			} catch {}
+			if (name !== void 0) saveConnectionName(params.configDir, profileName, name);
 			return {
 				status: "claimed",
-				identity: connectedAgentIdentity(profileName, profile)
+				identity: connectedAgentIdentity(profileName, profile),
+				...name === void 0 ? {} : { name }
 			};
 		} catch (error) {
 			if (error instanceof AgentInvitationRejectedError) throw error;
@@ -3140,6 +3217,7 @@ async function setupAgent(params) {
 	privateMailDirectory(directory, true);
 	const release = acquireListenLock(directory, "setup");
 	let discardStub = false;
+	let claimedName;
 	try {
 		const path = join(directory, "setup.json");
 		const value = readMailJson(path);
@@ -3167,13 +3245,13 @@ async function setupAgent(params) {
 				writeMailJson(path, state);
 			}
 			try {
-				await connectAgent({
+				claimedName = (await connectAgent({
 					configDir: params.configDir,
 					profileName,
 					invitation: params.invitation ?? "",
 					fetch: params.fetch,
 					presence: true
-				});
+				})).name;
 			} catch (error) {
 				if (error instanceof AgentInvitationRejectedError && created) {
 					discardStub = true;
@@ -3215,8 +3293,10 @@ async function setupAgent(params) {
 			"bounced",
 			"canceled"
 		].includes(state.receipt?.status ?? "") ? "reply_failed" : ["unknown", "wait_timeout"].includes(state.receipt?.status ?? "") ? "delivery_unknown" : "reply_submitted" : state?.phase === "sending" ? "send_unknown" : "challenge_pending";
+		claimedName ??= savedConnectionName(params.configDir, profileName);
 		const result = (receiving, ownerNotifications) => ({
 			identity: context.identity,
+			...claimedName === void 0 ? {} : { connectionName: claimedName },
 			sessionId: params.session ?? state?.session ?? null,
 			verification: {
 				state: confirmed && submittedState() === "reply_submitted" ? "verified" : submittedState(),
@@ -3675,6 +3755,10 @@ async function runAgentConnect(options) {
 		ownerAddress: result.identity.ownerAddress,
 		ownerMemberAddress,
 		profile: result.identity.profileName,
+		...result.connectionName === void 0 ? {} : {
+			name: result.connectionName,
+			nameIsDefault: defaultConnectionName(result.connectionName, result.identity.agentAddress)
+		},
 		sessionId: session ?? null,
 		runtime,
 		cli: {
@@ -3696,45 +3780,6 @@ async function runAgentConnect(options) {
 	};
 }
 //#endregion
-//#region src/oclif/agent-identity-suggestions.ts
-/** The connection name enrollment uses when none is given. */
-const DEFAULT_ENROLL_NAME = "Coding agent";
-/** npx runs the CLI from its cache; print follow-up commands the same way. */
-function cliInvocation(entry) {
-	return entry && /[\\/]_npx[\\/]/.test(entry) ? "npx -y primitive@latest" : "primitive";
-}
-/**
-* Whether an enrollment's connection name is the fallback it chose by itself.
-* Session registration's `<runtime>-<repository>` names are reported by
-* registration, which knows the exact name it generated.
-*/
-function generatedAgentName(name) {
-	return name === DEFAULT_ENROLL_NAME;
-}
-/**
-* Additive result fields for a connect, enroll or session registration.
-* `nameIsDefault` appears only when it is known whether the connection name
-* is one this CLI generated. The runtime note is suggested once, after a
-* connection this run completed.
-*/
-function identitySuggestions(params) {
-	const prefix = `PRIMITIVE_AGENT_PROFILE=${params.profile} ${params.invocation}`;
-	const suggestions = [];
-	const nameIsDefault = params.nameIsDefault;
-	if (nameIsDefault) suggestions.push({
-		kind: "rename",
-		command: `${prefix} agent rename "<new name>"`
-	});
-	if (params.connectedNow) suggestions.push({
-		kind: "runtime_note",
-		command: `${prefix} agent runtime set`
-	});
-	return nameIsDefault === void 0 ? { suggestions } : {
-		nameIsDefault,
-		suggestions
-	};
-}
-//#endregion
 //#region src/oclif/agent-disconnect.ts
 var AgentDisconnectError = class extends Error {};
 function credentialDigest(profile) {
@@ -5211,4 +5256,4 @@ async function runDetached(params) {
 	}
 }
 //#endregion
-export { currentCliLocation as $, NETWORK_ADMISSION_PENDING_RETRY_MS as A, contactAgentAddress as B, invitationProfileName as C, externalReceivingState as D, RECEIVER_MODES as E, AddressNotesApiError as F, readAgentInvitation as G, agentConnectionStatus as H, addressNoteTarget as I, savedReceiver as J, receiverStatusCommand as K, runAddressNotesRequest as L, createNotificationContactPolicy as M, evaluateContactPolicy as N, verificationReplySubmitted as O, canonicalContactSelector as P, claudeConfigDir as Q, ContactsApiError as R, defaultAgentProfileName as S, runAgentConnect as T, agentInvitationHash as U, runContactRequest as V, connectAgent as W, recordHookMailCheck as X, installClaudeWakeHook as Y, boundSessionProfiles as Z, disconnectAgent as _, readHookLauncherWarning as _t, endSession as a, hasMachineSessionHooks as at, identitySuggestions as b, pendingSessionDisconnects as c, repairClaudeHooks as ct, registerSession as d, MachineFileError as dt, describeSessionHookChange as et, retryPendingDisconnects as f, inspectManagedBlock as ft, AgentDisconnectError as g, writeManagedFile as gt, enrollmentResumes as h, upsertManagedBlock as ht, connectedProfilesForSession as i, findOnPath as it, NetworkAdmissionPendingError as j, ContactPolicyReadRetryError as k, psProcessInfo as l, samePath as lt, enrollAgent as m, readManagedFile as mt, OMP_MAIN as n, ensureHookLauncher as nt, headlessClaudeRun as o, inspectClaudeHooks as ot, runDetached as p, jsonIndentation as pt, refusalAfterReplacement as q, agentConnectionState as r, ephemeralCliReason as rt, machine_session_exports as s, readClaudeSettings as st, MACHINE_RUNTIMES as t, describeSessionHookItem as tt, readClaudeHookInput as u, writeClaudeSettings as ut, cliInvocation as v, refreshOwnerMemberAddressPeriodically as vt, pollCheckCommand as w, connectWarnings as x, generatedAgentName as y, withOwnerMemberAddress as yt, contactAddress as z };
+export { describeSessionHookItem as $, evaluateContactPolicy as A, agentInvitationHash as B, RECEIVER_MODES as C, NETWORK_ADMISSION_PENDING_RETRY_MS as D, ContactPolicyReadRetryError as E, ContactsApiError as F, saveConnectionName as G, readAgentInvitation as H, contactAddress as I, recordHookMailCheck as J, savedReceiver as K, contactAgentAddress as L, AddressNotesApiError as M, addressNoteTarget as N, NetworkAdmissionPendingError as O, runAddressNotesRequest as P, describeSessionHookChange as Q, runContactRequest as R, runAgentConnect as S, verificationReplySubmitted as T, receiverStatusCommand as U, connectAgent as V, refusalAfterReplacement as W, claudeConfigDir as X, boundSessionProfiles as Y, currentCliLocation as Z, disconnectAgent as _, withOwnerMemberAddress as _t, endSession as a, readClaudeSettings as at, invitationProfileName as b, pendingSessionDisconnects as c, writeClaudeSettings as ct, registerSession as d, jsonIndentation as dt, ensureHookLauncher as et, retryPendingDisconnects as f, readManagedFile as ft, AgentDisconnectError as g, refreshOwnerMemberAddressPeriodically as gt, enrollmentResumes as h, readHookLauncherWarning as ht, connectedProfilesForSession as i, inspectClaudeHooks as it, canonicalContactSelector as j, createNotificationContactPolicy as k, psProcessInfo as l, MachineFileError as lt, enrollAgent as m, writeManagedFile as mt, OMP_MAIN as n, findOnPath as nt, headlessClaudeRun as o, repairClaudeHooks as ot, runDetached as p, upsertManagedBlock as pt, installClaudeWakeHook as q, agentConnectionState as r, hasMachineSessionHooks as rt, machine_session_exports as s, samePath as st, MACHINE_RUNTIMES as t, ephemeralCliReason as tt, readClaudeHookInput as u, inspectManagedBlock as ut, connectWarnings as v, externalReceivingState as w, pollCheckCommand as x, defaultAgentProfileName as y, agentConnectionStatus as z };