primcli 1.62.1 → 1.64.0

package/dist/{machine-session-Bdr3jFm4.js → machine-session-B3JznlvO.js}

@@ -1,9 +1,9 @@
-import { b as __exportAll } from "./repeats-x4QM2yoG-De3MV3st.js";
+import { S as __exportAll } from "./repeats-BL7ZC-_6-Dzangtkf.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-DMszFbGn.js";
-import { Ct as cliInvocation, Jn as putAgentContactPolicy, Jt as refreshStoredCliCredentials, Pn as listDomains, Tt as defaultConnectionName, Vn as listSentEmails, Yn as putContact, an as deleteAgentContact, ar as sendEmail, jn as listContacts, kn as listAgentContacts, mn as getContact, nr as searchEmails, on as deleteContact, pn as getAgentContactPolicy, qn as putAgentContact, vn as getEmail } from "./api-command-Bj8WyqXK.js";
+import { Ct as cliInvocation, Jn as putAgentContactPolicy, Jt as refreshStoredCliCredentials, Pn as listDomains, Tt as defaultConnectionName, Vn as listSentEmails, Yn as putContact, an as deleteAgentContact, ar as sendEmail, jn as listContacts, kn as listAgentContacts, mn as getContact, nr as searchEmails, on as deleteContact, pn as getAgentContactPolicy, qn as putAgentContact, vn as getEmail } from "./api-command-C3XihKH7.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-MwlVE90c.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-anckNIzA.js";
-import { a as scopedChatSenderTrust } from "./scoped-chat-C7cpIxVS.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-Bzcs3VBe.js";
+import { a as scopedChatSenderTrust } from "./scoped-chat-BW041zEY.js";
 import { l as stopBackgroundListen, r as backgroundListenStatus } from "./listen-background--0peztKE.js";
 import { t as readSharedMailOwner } from "./shared-mail-watch-DtKpsgg8.js";
 import { accessSync, chmodSync, closeSync, constants, copyFileSync, existsSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, writeFileSync } from "node:fs";
@@ -1632,6 +1632,174 @@ function uninstallClaudeWakeHook(options) {
 	}
 }
 //#endregion
+//#region src/oclif/session-records.ts
+const MACHINE_RUNTIMES = [
+	"claude",
+	"codex",
+	"omp"
+];
+const HASH = /^[a-f0-9]{64}$/;
+const REASON = /^[a-z_]{1,40}$/;
+function sessionRecordsDirectory(configDir) {
+	return join(configDir, "machine", "sessions");
+}
+function sessionRecordPath(configDir, session) {
+	return join(sessionRecordsDirectory(configDir), `${session}.json`);
+}
+function parseRelease(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const row = value;
+	if (typeof row.at !== "string" || row.reason !== "replaced_by_connect" && row.reason !== "credential_changed") return null;
+	return {
+		at: row.at,
+		reason: row.reason,
+		registeredAddress: typeof row.registeredAddress === "string" ? row.registeredAddress : null
+	};
+}
+function readSessionRecord(configDir, session) {
+	try {
+		const value = readMailJson(sessionRecordPath(configDir, session));
+		if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+		const row = value;
+		if (row.version !== 1 || row.session !== session || typeof row.profile !== "string" || typeof row.name !== "string" || !MACHINE_RUNTIMES.includes(row.runtime) || row.createdBy !== "session-register" && row.createdBy !== "existing") return null;
+		return {
+			version: 1,
+			runtime: row.runtime,
+			session,
+			profile: row.profile,
+			name: row.name,
+			createdBy: row.createdBy,
+			address: typeof row.address === "string" ? row.address : null,
+			invitationHash: typeof row.invitationHash === "string" && HASH.test(row.invitationHash) ? row.invitationHash : null,
+			agentInfo: row.agentInfo === "created" || row.agentInfo === "already_present" ? row.agentInfo : null,
+			registeredAt: typeof row.registeredAt === "string" ? row.registeredAt : (/* @__PURE__ */ new Date(0)).toISOString(),
+			endedAt: typeof row.endedAt === "string" ? row.endedAt : null,
+			disconnect: row.disconnect === "done" || row.disconnect === "pending" || row.disconnect === "pending_enrollment" || row.disconnect === "deferred" ? row.disconnect : typeof row.endedAt === "string" ? "done" : null,
+			deferredUntil: typeof row.deferredUntil === "string" ? row.deferredUntil : null,
+			endReason: typeof row.endReason === "string" && REASON.test(row.endReason) ? row.endReason : null,
+			release: parseRelease(row.release)
+		};
+	} catch {
+		return null;
+	}
+}
+function saveSessionRecord(configDir, row) {
+	writeMailJson(sessionRecordPath(configDir, row.session), row);
+}
+/** Serialize every read-modify-write of one session's record. */
+async function withRecordLock(configDir, session, action) {
+	const directory = sessionRecordsDirectory(configDir);
+	privateMailDirectory(directory, true);
+	let release;
+	for (let attempt = 0; attempt < 200 && !release; attempt++) try {
+		release = acquireListenLock(directory, `session-record-${session}`);
+	} catch {
+		await setTimeout$1(50);
+	}
+	if (!release) throw new ListenStateError("The session record is locked by another run.");
+	try {
+		return await action();
+	} finally {
+		release();
+	}
+}
+/** Read, change and save one record under its lock. Returns the saved record. */
+function updateSessionRecord(configDir, session, change) {
+	return withRecordLock(configDir, session, () => {
+		const current = readSessionRecord(configDir, session);
+		const next = change(current);
+		if (next && next !== current) saveSessionRecord(configDir, next);
+		return next ?? current;
+	});
+}
+/** Every readable session record on this machine. */
+function listSessionRecords(configDir) {
+	let names;
+	try {
+		names = readdirSync(sessionRecordsDirectory(configDir));
+	} catch {
+		return [];
+	}
+	return names.flatMap((name) => {
+		const match = /^([0-9a-f-]{36})\.json$/.exec(name);
+		if (!match?.[1]) return [];
+		const record = readSessionRecord(configDir, match[1]);
+		return record ? [record] : [];
+	});
+}
+/**
+* The record no longer owns the credential in its profile: it becomes a
+* record of an agent connected some other way, which a session end leaves
+* connected. Any end that was waiting is dropped with it.
+*/
+function releasedRecord(record, reason, at, current) {
+	return {
+		...record,
+		createdBy: "existing",
+		address: current ? current.address : record.address,
+		invitationHash: current ? current.invitationHash : null,
+		endedAt: null,
+		disconnect: null,
+		deferredUntil: null,
+		endReason: null,
+		release: {
+			at: at.toISOString(),
+			reason,
+			registeredAddress: record.address
+		}
+	};
+}
+/** The invitation hash an enrollment in this profile saved, if any. */
+function enrollmentInvitationHash(configDir, profileName) {
+	try {
+		const state = readMailJson(join(agentProfileDirectory(configDir, profileName), "enrollment", "state.json"), 65536);
+		return typeof state?.invitationHash === "string" && HASH.test(state.invitationHash) ? state.invitationHash : null;
+	} catch {
+		return null;
+	}
+}
+/**
+* A credential was just claimed into `profileName`. Every session record that
+* says `session-register` created the agent in that profile is released,
+* unless this claim is that registration's own enrollment finishing, so a
+* later session end never disconnects the newly connected agent. Best effort:
+* a failure here leaves the end-time credential check as the safeguard.
+*/
+async function releaseRegistrationsForClaim(params) {
+	const own = enrollmentInvitationHash(params.configDir, params.profileName);
+	for (const listed of listSessionRecords(params.configDir)) {
+		if (listed.profile !== params.profileName) continue;
+		try {
+			await updateSessionRecord(params.configDir, listed.session, (current) => {
+				if (!current || current.profile !== params.profileName) return current;
+				if (current.createdBy === "existing") return current.release && (current.address !== params.address || current.invitationHash !== params.invitationHash) ? {
+					...current,
+					address: params.address,
+					invitationHash: params.invitationHash
+				} : current;
+				if (own === params.invitationHash && (current.address === null || current.address.toLowerCase() === params.address.toLowerCase())) return current;
+				return releasedRecord(current, "replaced_by_connect", (params.now ?? (() => /* @__PURE__ */ new Date()))(), {
+					address: params.address,
+					invitationHash: params.invitationHash
+				});
+			});
+		} catch {}
+	}
+}
+/**
+* The profile's credential is being replaced on purpose (for example by
+* `--replace-existing`): release every registration record for it, keeping
+* the registered address for reference.
+*/
+async function releaseRegistrationsForProfile(params) {
+	for (const listed of listSessionRecords(params.configDir)) {
+		if (listed.profile !== params.profileName || listed.createdBy !== "session-register") continue;
+		try {
+			await updateSessionRecord(params.configDir, listed.session, (current) => current && current.profile === params.profileName && current.createdBy === "session-register" ? releasedRecord(current, "replaced_by_connect", (params.now ?? (() => /* @__PURE__ */ new Date()))()) : current);
+		} catch {}
+	}
+}
+//#endregion
 //#region src/oclif/agent-connect.ts
 const MAX_INVITATION_BYTES = 4096;
 const MAX_RESPONSE_BYTES = 32768;
@@ -1952,7 +2120,7 @@ async function connectAgent(params) {
 	let release;
 	try {
 		privateMailDirectory(directory, true);
-		release = acquireListenLock(directory, "agent-connection-setup");
+		release = params.claimLockHeld ? () => {} : acquireListenLock(directory, "agent-connection-setup");
 	} catch {
 		throw new AgentConnectionSetupError("Agent setup is already running, or its private directory is unavailable. No invitation was submitted.");
 	}
@@ -2012,6 +2180,14 @@ async function connectAgent(params) {
 			const profile = profileFromClaim(body, invitation, invitationHash, params.now ?? Date.now);
 			const name = claimedConnectionName(body);
 			saveConnectedAgentProfile(params.configDir, profileName, profile);
+			try {
+				await releaseRegistrationsForClaim({
+					configDir: params.configDir,
+					profileName,
+					address: profile.agent_address,
+					invitationHash: profile.invitation_hash
+				});
+			} catch {}
 			try {
 				writeMailJson(journal, {
 					version: 1,
@@ -2365,6 +2541,297 @@ async function runAddressNotesRequest(client, request) {
 	return data;
 }
 //#endregion
+//#region src/oclif/agent-disconnect.ts
+var AgentDisconnectError = class extends Error {};
+/** The profile no longer holds the credential the caller expected to revoke. */
+var AgentCredentialChangedError = class extends AgentDisconnectError {};
+function credentialDigest(profile) {
+	return createHash("sha256").update("primitive-agent-disconnect-v1\0").update(profile.api_key).digest("hex");
+}
+function boundSession(directory, profile) {
+	const raw = readMailJson(join(directory, "setup.json"));
+	if (raw === null) return null;
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new AgentDisconnectError("Saved session setup is invalid. The connection was not changed.");
+	const row = raw;
+	if (row.receiverMode === "poll" && row.session === null && row.invitationHash === profile.invitation_hash) return null;
+	if (typeof row.session !== "string" || !SESSION_UUID.test(row.session) || row.invitationHash !== profile.invitation_hash) throw new AgentDisconnectError("Saved session binding does not match this profile. The connection was not changed.");
+	return row.session.toLowerCase();
+}
+function receiverStopped(status) {
+	return status.phase === null || status.phase === "stopped" || status.phase === "failed" || status.reason === "exited";
+}
+function confirmationPath(directory, profile) {
+	return join(directory, `disconnected-${profile.invitation_hash}.json`);
+}
+/** The saved setup's disconnect marker, when it is a well-formed record. */
+function markerRecord(directory, invitationHash) {
+	const raw = readMailJson(join(directory, `disconnected-${invitationHash}.json`));
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
+	const row = raw;
+	return row.version === 1 && typeof row.revoked_at === "string" && Number.isFinite(Date.parse(row.revoked_at)) ? row : null;
+}
+function confirmedLocally(directory, profile) {
+	const raw = readMailJson(confirmationPath(directory, profile));
+	if (raw === null) return false;
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new AgentDisconnectError("Saved revocation confirmation is invalid. The credential was preserved.");
+	const row = raw;
+	if (row.version !== 1 || row.address !== profile.agent_address || row.api_base_url !== profile.api_base_url || row.credential_digest !== credentialDigest(profile) || typeof row.revoked_at !== "string" || !Number.isFinite(Date.parse(row.revoked_at))) throw new AgentDisconnectError("Saved revocation confirmation does not match this credential. The credential was preserved.");
+	return true;
+}
+/** The API error code from an error envelope, when it has one. */
+function errorCode(error) {
+	if (!error || typeof error !== "object") return void 0;
+	const inner = error.error;
+	const code = inner && typeof inner === "object" ? inner.code : error.code;
+	return typeof code === "string" && /^[a-z0-9_]{1,64}$/.test(code) ? code : void 0;
+}
+/**
+* Whether Primitive confirms, with this same credential, that it no longer
+* authenticates: a definite 401 from the connection's own record, or that
+* record reporting the connection revoked. A server error, a timeout, a
+* network failure or any other answer is not a confirmation.
+*/
+async function credentialRevokedByServer(profile, fetcher = fetch) {
+	try {
+		const response = await fetcher(`${profile.api_base_url}/agent-connections/me`, {
+			method: "GET",
+			redirect: "error",
+			signal: AbortSignal.timeout(1e4),
+			headers: {
+				authorization: `Bearer ${profile.api_key}`,
+				accept: "application/json"
+			}
+		});
+		if (response.status !== 200) {
+			await response.body?.cancel().catch(() => void 0);
+			return response.status === 401;
+		}
+		const text = await response.text();
+		if (text.length > 65536) return false;
+		const body = JSON.parse(text);
+		const connection = body?.data?.connection;
+		return body?.success === true && typeof connection?.address === "string" && connection.address.toLowerCase() === profile.agent_address.toLowerCase() && connection.status === "revoked";
+	} catch {
+		return false;
+	}
+}
+async function revoke(profile, fetcher) {
+	const client = new PrimitiveApiClient({
+		apiKey: profile.api_key,
+		apiBaseUrl: profile.api_base_url,
+		...fetcher ? { fetch: fetcher } : {}
+	});
+	let result;
+	try {
+		result = await client.client.delete({
+			security: [{
+				scheme: "bearer",
+				type: "http"
+			}],
+			url: "/agent-connections/{address}",
+			path: { address: profile.agent_address },
+			redirect: "error",
+			signal: AbortSignal.timeout(25e3),
+			responseStyle: "fields"
+		});
+	} catch {
+		throw new AgentDisconnectError("Revocation outcome is unknown after a transport error. The profile and credential were preserved. Check the agent in the app before retrying.");
+	}
+	if (result.error !== void 0) {
+		const status = result.response?.status;
+		if (status === void 0) throw new AgentDisconnectError("Revocation outcome is unknown: no response was received from Primitive. The profile and credential were preserved. Check your connection, then retry or check the agent in the app.");
+		if (status === 401 && await credentialRevokedByServer(profile, fetcher)) return "already_revoked";
+		const code = errorCode(result.error);
+		const label = `HTTP ${status}${code ? `, ${code}` : ""}`;
+		throw new AgentDisconnectError(status === 401 ? `Revocation was not confirmed (${label}). The credential was preserved; it may already be invalid. Check the agent in the app before retrying.` : status >= 500 ? `Primitive returned a server error while revoking this agent (${label}), so revocation is unconfirmed. The profile was preserved. Retry the same command; a 401 on retry means the credential was already revoked.` : `Revocation was refused by Primitive (${label}). The credential was preserved. Check the agent in the app before retrying.`);
+	}
+	const envelope = result.data;
+	if (!envelope || typeof envelope !== "object" || Array.isArray(envelope)) throw new AgentDisconnectError("Revocation response was incomplete. The credential was preserved. Check the agent in the app before retrying.");
+	const row = envelope;
+	const data = row.data;
+	const connection = data && typeof data === "object" && !Array.isArray(data) ? data.connection : void 0;
+	if (row.success !== true || !connection || typeof connection !== "object" || Array.isArray(connection) || connection.address !== profile.agent_address || connection.owner_address !== profile.owner_address || connection.status !== "revoked") throw new AgentDisconnectError("Revocation response was incomplete. The credential was preserved. Check the agent in the app before retrying.");
+	return "confirmed";
+}
+/** Revoke one selected connected credential; never alter OAuth login or mail evidence. */
+async function disconnectAgent(params) {
+	const profileName = agentProfileName(params.profileName);
+	if (!loadConnectedAgentProfile(params.configDir, profileName)) throw new AgentDisconnectError("This agent profile is not configured. Nothing was changed.");
+	const directory = agentProfileDirectory(params.configDir, profileName);
+	let releaseSetup;
+	let releaseClaim;
+	try {
+		releaseSetup = acquireListenLock(directory, "setup");
+		releaseClaim = acquireListenLock(agentProfilesDirectory(params.configDir), "agent-connection-setup");
+		const profile = loadConnectedAgentProfile(params.configDir, profileName);
+		if (!profile) throw new AgentDisconnectError("The selected profile changed before disconnect. Nothing was changed.");
+		if (params.expected && (profile.agent_address.toLowerCase() !== params.expected.address.toLowerCase() || profile.invitation_hash !== params.expected.invitationHash)) throw new AgentCredentialChangedError("The profile holds a different credential than expected. Nothing was changed.");
+		const session = boundSession(directory, profile);
+		const receiver = session ? await (params.stopReceiver ?? stopBackgroundListen)({
+			configDir: params.configDir,
+			scope: notificationScope(profile.api_base_url, profile.api_key),
+			threadId: session
+		}) : null;
+		if (receiver && !receiverStopped(receiver)) throw new AgentDisconnectError("The bound receiver has not confirmed stopping. The connection and credential were preserved. Check listener status before retrying.");
+		const previous = confirmedLocally(directory, profile);
+		const revocation = previous ? "previously_confirmed" : await revoke(profile, params.fetch);
+		if (!previous) try {
+			writeMailJson(confirmationPath(directory, profile), {
+				version: 1,
+				address: profile.agent_address,
+				api_base_url: profile.api_base_url,
+				credential_digest: credentialDigest(profile),
+				revoked_at: (params.now ?? (() => /* @__PURE__ */ new Date()))().toISOString(),
+				...revocation === "already_revoked" ? { reason: "server_revoked" } : {}
+			});
+		} catch {
+			throw new AgentDisconnectError("Primitive confirmed revocation, but its local confirmation could not be saved. The credential was preserved. Keep this profile for recovery.");
+		}
+		const current = loadConnectedAgentProfile(params.configDir, profileName);
+		if (!current || current.api_key !== profile.api_key) throw new AgentDisconnectError("The selected profile changed after revocation. Its credential was preserved for inspection.");
+		try {
+			removeMailFile(join(directory, "connection.json"));
+		} catch {
+			throw new AgentDisconnectError("Primitive confirmed revocation, but the local credential could not be removed. Confirmation is saved; retry this command to finish local cleanup.");
+		}
+		const externalHook = session ? uninstallClaudeWakeHook({
+			configDir: params.configDir,
+			profileName,
+			agentAddress: profile.agent_address,
+			sessionId: session,
+			env: params.env
+		}) ? "removed" : "unavailable" : null;
+		return {
+			status: "disconnected",
+			identity: connectedAgentIdentity(profileName, profile),
+			receiver,
+			revocation,
+			externalHook
+		};
+	} catch (error) {
+		if (error instanceof AgentDisconnectError) throw error;
+		throw new AgentDisconnectError("Disconnect could not safely complete. The credential and local evidence were preserved. Check this profile and listener status before retrying.");
+	} finally {
+		releaseClaim?.();
+		releaseSetup?.();
+	}
+}
+/**
+* Whether the saved setup bound to `invitationHash` belongs to a credential
+* whose revocation is confirmed locally: its disconnect marker exists and,
+* when the credential file is still present, matches that credential. Such
+* a setup is evidence only; it no longer binds this profile to an address.
+*/
+function savedSetupRevoked(configDir, profileName, invitationHash) {
+	if (!/^[a-f0-9]{64}$/.test(invitationHash)) return false;
+	try {
+		const directory = agentProfileDirectory(configDir, profileName);
+		if (!markerRecord(directory, invitationHash)) return false;
+		const profile = loadConnectedAgentProfile(configDir, profileName);
+		if (!profile) return true;
+		return profile.invitation_hash === invitationHash && confirmedLocally(directory, profile);
+	} catch {
+		return false;
+	}
+}
+/**
+* Move a revoked setup aside, the same way a replacement does, so a new
+* invitation can be claimed into the same profile. Files are renamed, never
+* deleted, and kept for recovery.
+*/
+function archiveRevokedSetup(configDir, profileName, now) {
+	const directory = agentProfileDirectory(configDir, profileName);
+	const stamp = now.toISOString().replace(/[^0-9]/g, "");
+	for (const path of [
+		join(directory, "setup.json"),
+		join(directory, "enrollment", "state.json"),
+		join(directory, "connection.json")
+	]) try {
+		renameSync(path, join(dirname(path), `replaced-${stamp}-${basename(path)}`));
+	} catch (error) {
+		if (error.code !== "ENOENT") throw error;
+	}
+}
+/**
+* Run a claim into `profileName`, first moving aside a saved setup whose
+* credential is confirmed revoked, so the new credential is never saved
+* beside a setup naming the old invitation. The profile's setup lock and the
+* machine-wide claim lock are taken (in the order setup and disconnect use)
+* before anything is checked or moved, and held through the claim, which is
+* told the claim lock is already held. A profile with no saved setup is
+* claimed as before, without these locks.
+*/
+async function claimOverRevokedSetup(params, claim) {
+	const directory = agentProfileDirectory(params.configDir, params.profileName);
+	const path = join(directory, "setup.json");
+	if (!existsSync(path)) return claim(false);
+	let releaseSetup;
+	let releaseClaim;
+	try {
+		try {
+			releaseSetup = acquireListenLock(directory, "setup");
+			releaseClaim = acquireListenLock(agentProfilesDirectory(params.configDir), "agent-connection-setup");
+		} catch {
+			throw new AgentConnectionSetupError("Another agent setup is running on this machine. No invitation was claimed and nothing was changed; retry when it finishes.");
+		}
+		let saved = null;
+		try {
+			saved = readMailJson(path);
+		} catch {}
+		const savedHash = saved && typeof saved === "object" && !Array.isArray(saved) ? saved.invitationHash : void 0;
+		if (typeof savedHash === "string" && savedHash !== params.invitationHash && savedSetupRevoked(params.configDir, params.profileName, savedHash)) archiveRevokedSetup(params.configDir, params.profileName, (params.now ?? (() => /* @__PURE__ */ new Date()))());
+		return await claim(true);
+	} finally {
+		releaseClaim?.();
+		releaseSetup?.();
+	}
+}
+/**
+* Of the addresses bound to a session, clear the ones Primitive confirms are
+* already revoked: each is disconnected locally (receiver stopped, hooks
+* removed, credential removed, marker written) so it no longer counts as the
+* session's address. A live credential, or one whose state cannot be
+* confirmed, is kept and still counts.
+*/
+async function clearRevokedAddresses(params) {
+	const remaining = [];
+	const cleared = [];
+	for (const row of params.rows) {
+		let checked = null;
+		try {
+			const profile = loadConnectedAgentProfile(params.configDir, row.profile);
+			if (profile && await credentialRevokedByServer(profile, params.fetch)) checked = profile;
+		} catch {
+			checked = null;
+		}
+		if (!checked) {
+			remaining.push(row);
+			continue;
+		}
+		try {
+			await (params.disconnect ?? disconnectAgent)({
+				configDir: params.configDir,
+				profileName: row.profile,
+				fetch: params.fetch,
+				stopReceiver: params.stopReceiver,
+				now: params.now,
+				env: params.env,
+				expected: {
+					address: checked.agent_address,
+					invitationHash: checked.invitation_hash
+				}
+			});
+			cleared.push(row);
+		} catch {
+			remaining.push(row);
+		}
+	}
+	return {
+		remaining,
+		cleared
+	};
+}
+//#endregion
 //#region src/oclif/agent-setup-read.ts
 function retryDelay(response, attempt, now) {
 	const raw = response?.headers.get("retry-after")?.trim();
@@ -3193,6 +3660,14 @@ function refuseSetupConflicts(state, params) {
 	];
 	if (conflicts.length) throw fail(`This profile's saved setup conflicts with ${conflicts.join(" and ")}. Omit the option to reuse the saved setup. Its session and notification preferences were not changed.${params.resume ? "" : " Do not create a separate profile on your own: if this session should get a different address, ask the user whether to keep the existing one or disconnect it first."}`);
 }
+function invitationHashOrNull(invitation) {
+	if (invitation === void 0) return null;
+	try {
+		return agentInvitationHash(invitation);
+	} catch {
+		return null;
+	}
+}
 /** One resumable operation owns setup plumbing; it never stores or replays the invitation. */
 async function setupAgent(params) {
 	const profileName = agentProfileName(params.profileName);
@@ -3212,7 +3687,9 @@ async function setupAgent(params) {
 		const value = readMailJson(join(directory, "setup.json"));
 		saved = value === null ? null : parseState(value);
 	} catch {}
-	if (saved) refuseSetupConflicts(saved, params);
+	const newHash = params.resume ? null : invitationHashOrNull(params.invitation);
+	const replacesRevoked = (state) => newHash !== null && state.invitationHash !== newHash && savedSetupRevoked(params.configDir, profileName, state.invitationHash);
+	if (saved && !replacesRevoked(saved)) refuseSetupConflicts(saved, params);
 	const receiverMode = params.receiverMode ?? (params.resume ? saved?.receiverMode : void 0);
 	if (params.session === void 0 && (receiverMode ?? "native") !== "poll") throw fail("--session requires the exact loaded session UUID. Without one, use --receiver poll. No invitation was claimed.");
 	if ((receiverMode ?? "native") === "native" && params.session) try {
@@ -3222,12 +3699,26 @@ async function setupAgent(params) {
 	}
 	privateMailDirectory(directory, true);
 	const release = acquireListenLock(directory, "setup");
+	let releaseClaim;
 	let discardStub = false;
 	let claimedName;
 	try {
 		const path = join(directory, "setup.json");
 		const value = readMailJson(path);
 		let state = value === null ? null : parseState(value);
+		if (state && replacesRevoked(state)) {
+			try {
+				releaseClaim = acquireListenLock(agentProfilesDirectory(params.configDir), "agent-connection-setup");
+			} catch {
+				throw fail("Another agent setup is running on this machine. No invitation was claimed and nothing was changed; retry when it finishes.");
+			}
+			const current = readMailJson(path);
+			state = current === null ? null : parseState(current);
+			if (state && replacesRevoked(state)) {
+				archiveRevokedSetup(params.configDir, profileName, new Date(dependencies.now()));
+				state = null;
+			}
+		}
 		if (state) refuseSetupConflicts(state, params);
 		if (!state && loadConnectedAgentProfile(params.configDir, profileName)) throw fail("This profile was configured without a setup binding. Use its existing session setup; do not adopt it into another session.");
 		if (params.resume && !state) throw fail("No resumable setup exists for this profile. Do not adopt another session's identity.");
@@ -3256,7 +3747,8 @@ async function setupAgent(params) {
 					profileName,
 					invitation: params.invitation ?? "",
 					fetch: params.fetch,
-					presence: true
+					presence: true,
+					claimLockHeld: releaseClaim !== void 0
 				})).name;
 			} catch (error) {
 				if (error instanceof AgentInvitationRejectedError && created) {
@@ -3268,6 +3760,9 @@ async function setupAgent(params) {
 					}
 				}
 				throw error;
+			} finally {
+				releaseClaim?.();
+				releaseClaim = void 0;
 			}
 		}
 		const profile = loadConnectedAgentProfile(params.configDir, profileName);
@@ -3357,6 +3852,7 @@ async function setupAgent(params) {
 		}
 		return result(state.receiverMode === "external" ? EXTERNAL_HOOKS_PENDING : state.receiverMode === "poll" ? "poll" : healthy ? "healthy" : "not_ready", ownerNotifications);
 	} finally {
+		releaseClaim?.();
 		release();
 		if (discardStub) removeEmptyDirectory(directory);
 	}
@@ -3699,229 +4195,96 @@ async function runAgentConnect(options) {
 		});
 	}
 	const pendingPath = join(agentProfileDirectory(options.configDir, profileName), PENDING_AGENT_INFO_FILE);
-	const noteValue = agentInfo ?? readPendingAgentInfo(pendingPath);
-	let agentInfoState = "not_requested";
-	if (noteValue === null) skipped.push({
-		step: "agent_info",
-		reason: "not_requested"
-	});
-	else if (!verified) {
-		agentInfoState = "pending_verification";
-		savePendingAgentInfo(pendingPath, noteValue);
-		skipped.push({
-			step: "agent_info",
-			reason: "pending_verification"
-		});
-	} else {
-		agentInfoState = await dependencies.seedAgentInfo(profileName, noteValue);
-		if (agentInfoState === "failed") {
-			savePendingAgentInfo(pendingPath, noteValue);
-			skipped.push({
-				step: "agent_info",
-				reason: "failed"
-			});
-		} else clearPendingAgentInfo(pendingPath);
-		if (agentInfoState === "already_present") skipped.push({
-			step: "agent_info",
-			reason: "already_present"
-		});
-	}
-	const receiving = receiver === "external" ? {
-		...result.receiving,
-		state: externalReceivingState(externalHook),
-		mode: "external",
-		hook: externalHook
-	} : receiver === "poll" ? {
-		...result.receiving,
-		mode: "poll",
-		checkCommand: pollCheckCommand(invocation, result.identity.profileName),
-		...fallback ? {
-			fallbackReason: fallback.reason,
-			fallbackDetail: fallback.detail,
-			codexVersion: fallback.codexVersion
-		} : {}
-	} : {
-		...result.receiving,
-		mode: "native",
-		mailCheck: mailCheck?.state ?? "not_started",
-		lastSuccessfulMailCheckAt: mailCheck?.lastSuccessfulMailCheckAt ?? null
-	};
-	const receiverReady = receiver === "external" ? externalHook === "installed_unverified" : receiver === "poll" || result.receiving.state === "healthy";
-	const resumeCommand = [
-		invocation,
-		"agent connect",
-		`--profile ${result.identity.profileName}`,
-		...session ? [`--session ${session}`] : [],
-		`--receiver ${receiver}`,
-		"--resume",
-		...options.contactRequests ?? savedSetup(options.configDir, profileName)?.contactRequests ? ["--contact-requests"] : [],
-		...options.skill === false ? ["--no-skill"] : [],
-		...options.project ? ["--project"] : [],
-		"--json"
-	].join(" ");
-	return {
-		status: verified && receiverReady ? "connected" : "pending",
-		address: result.identity.agentAddress,
-		orgId: result.identity.orgId,
-		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: {
-			version: options.cliVersion,
-			capabilities: [...AGENT_CONNECT_CAPABILITIES]
-		},
-		skill,
-		verification: result.verification,
-		receiving,
-		...result.ownerNotifications ? { ownerNotifications: result.ownerNotifications } : {},
-		agentInfo: agentInfoState,
-		skipped,
-		warnings,
-		selectProfile: `PRIMITIVE_AGENT_PROFILE=${result.identity.profileName}`,
-		resumeCommand,
-		guidance: `${result.guidance} ${ownerReportGuidance(identity)}`,
-		identity,
-		externalHook
-	};
-}
-//#endregion
-//#region src/oclif/agent-disconnect.ts
-var AgentDisconnectError = class extends Error {};
-function credentialDigest(profile) {
-	return createHash("sha256").update("primitive-agent-disconnect-v1\0").update(profile.api_key).digest("hex");
-}
-function boundSession(directory, profile) {
-	const raw = readMailJson(join(directory, "setup.json"));
-	if (raw === null) return null;
-	if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new AgentDisconnectError("Saved session setup is invalid. The connection was not changed.");
-	const row = raw;
-	if (row.receiverMode === "poll" && row.session === null && row.invitationHash === profile.invitation_hash) return null;
-	if (typeof row.session !== "string" || !SESSION_UUID.test(row.session) || row.invitationHash !== profile.invitation_hash) throw new AgentDisconnectError("Saved session binding does not match this profile. The connection was not changed.");
-	return row.session.toLowerCase();
-}
-function receiverStopped(status) {
-	return status.phase === null || status.phase === "stopped" || status.phase === "failed" || status.reason === "exited";
-}
-function confirmationPath(directory, profile) {
-	return join(directory, `disconnected-${profile.invitation_hash}.json`);
-}
-function confirmedLocally(directory, profile) {
-	const raw = readMailJson(confirmationPath(directory, profile));
-	if (raw === null) return false;
-	if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new AgentDisconnectError("Saved revocation confirmation is invalid. The credential was preserved.");
-	const row = raw;
-	if (row.version !== 1 || row.address !== profile.agent_address || row.api_base_url !== profile.api_base_url || row.credential_digest !== credentialDigest(profile) || typeof row.revoked_at !== "string" || !Number.isFinite(Date.parse(row.revoked_at))) throw new AgentDisconnectError("Saved revocation confirmation does not match this credential. The credential was preserved.");
-	return true;
-}
-/** The API error code from an error envelope, when it has one. */
-function errorCode(error) {
-	if (!error || typeof error !== "object") return void 0;
-	const inner = error.error;
-	const code = inner && typeof inner === "object" ? inner.code : error.code;
-	return typeof code === "string" && /^[a-z0-9_]{1,64}$/.test(code) ? code : void 0;
-}
-async function revoke(profile, fetcher) {
-	const client = new PrimitiveApiClient({
-		apiKey: profile.api_key,
-		apiBaseUrl: profile.api_base_url,
-		...fetcher ? { fetch: fetcher } : {}
-	});
-	let result;
-	try {
-		result = await client.client.delete({
-			security: [{
-				scheme: "bearer",
-				type: "http"
-			}],
-			url: "/agent-connections/{address}",
-			path: { address: profile.agent_address },
-			redirect: "error",
-			signal: AbortSignal.timeout(25e3),
-			responseStyle: "fields"
-		});
-	} catch {
-		throw new AgentDisconnectError("Revocation outcome is unknown after a transport error. The profile and credential were preserved. Check the agent in the app before retrying.");
-	}
-	if (result.error !== void 0) {
-		const status = result.response?.status;
-		if (status === void 0) throw new AgentDisconnectError("Revocation outcome is unknown: no response was received from Primitive. The profile and credential were preserved. Check your connection, then retry or check the agent in the app.");
-		const code = errorCode(result.error);
-		const label = `HTTP ${status}${code ? `, ${code}` : ""}`;
-		throw new AgentDisconnectError(status === 401 ? `Revocation was not confirmed (${label}). The credential was preserved; it may already be invalid. Check the agent in the app before retrying.` : status >= 500 ? `Primitive returned a server error while revoking this agent (${label}), so revocation is unconfirmed. The profile was preserved. Retry the same command; a 401 on retry means the credential was already revoked.` : `Revocation was refused by Primitive (${label}). The credential was preserved. Check the agent in the app before retrying.`);
-	}
-	const envelope = result.data;
-	if (!envelope || typeof envelope !== "object" || Array.isArray(envelope)) throw new AgentDisconnectError("Revocation response was incomplete. The credential was preserved. Check the agent in the app before retrying.");
-	const row = envelope;
-	const data = row.data;
-	const connection = data && typeof data === "object" && !Array.isArray(data) ? data.connection : void 0;
-	if (row.success !== true || !connection || typeof connection !== "object" || Array.isArray(connection) || connection.address !== profile.agent_address || connection.owner_address !== profile.owner_address || connection.status !== "revoked") throw new AgentDisconnectError("Revocation response was incomplete. The credential was preserved. Check the agent in the app before retrying.");
-}
-/** Revoke one selected connected credential; never alter OAuth login or mail evidence. */
-async function disconnectAgent(params) {
-	const profileName = agentProfileName(params.profileName);
-	if (!loadConnectedAgentProfile(params.configDir, profileName)) throw new AgentDisconnectError("This agent profile is not configured. Nothing was changed.");
-	const directory = agentProfileDirectory(params.configDir, profileName);
-	let releaseSetup;
-	let releaseClaim;
-	try {
-		releaseSetup = acquireListenLock(directory, "setup");
-		releaseClaim = acquireListenLock(agentProfilesDirectory(params.configDir), "agent-connection-setup");
-		const profile = loadConnectedAgentProfile(params.configDir, profileName);
-		if (!profile) throw new AgentDisconnectError("The selected profile changed before disconnect. Nothing was changed.");
-		const session = boundSession(directory, profile);
-		const receiver = session ? await (params.stopReceiver ?? stopBackgroundListen)({
-			configDir: params.configDir,
-			scope: notificationScope(profile.api_base_url, profile.api_key),
-			threadId: session
-		}) : null;
-		if (receiver && !receiverStopped(receiver)) throw new AgentDisconnectError("The bound receiver has not confirmed stopping. The connection and credential were preserved. Check listener status before retrying.");
-		const previous = confirmedLocally(directory, profile);
-		if (!previous) await revoke(profile, params.fetch);
-		if (!previous) try {
-			writeMailJson(confirmationPath(directory, profile), {
-				version: 1,
-				address: profile.agent_address,
-				api_base_url: profile.api_base_url,
-				credential_digest: credentialDigest(profile),
-				revoked_at: (params.now ?? (() => /* @__PURE__ */ new Date()))().toISOString()
+	const noteValue = agentInfo ?? readPendingAgentInfo(pendingPath);
+	let agentInfoState = "not_requested";
+	if (noteValue === null) skipped.push({
+		step: "agent_info",
+		reason: "not_requested"
+	});
+	else if (!verified) {
+		agentInfoState = "pending_verification";
+		savePendingAgentInfo(pendingPath, noteValue);
+		skipped.push({
+			step: "agent_info",
+			reason: "pending_verification"
+		});
+	} else {
+		agentInfoState = await dependencies.seedAgentInfo(profileName, noteValue);
+		if (agentInfoState === "failed") {
+			savePendingAgentInfo(pendingPath, noteValue);
+			skipped.push({
+				step: "agent_info",
+				reason: "failed"
 			});
-		} catch {
-			throw new AgentDisconnectError("Primitive confirmed revocation, but its local confirmation could not be saved. The credential was preserved. Keep this profile for recovery.");
-		}
-		const current = loadConnectedAgentProfile(params.configDir, profileName);
-		if (!current || current.api_key !== profile.api_key) throw new AgentDisconnectError("The selected profile changed after revocation. Its credential was preserved for inspection.");
-		try {
-			removeMailFile(join(directory, "connection.json"));
-		} catch {
-			throw new AgentDisconnectError("Primitive confirmed revocation, but the local credential could not be removed. Confirmation is saved; retry this command to finish local cleanup.");
-		}
-		const externalHook = session ? uninstallClaudeWakeHook({
-			configDir: params.configDir,
-			profileName,
-			agentAddress: profile.agent_address,
-			sessionId: session,
-			env: params.env
-		}) ? "removed" : "unavailable" : null;
-		return {
-			status: "disconnected",
-			identity: connectedAgentIdentity(profileName, profile),
-			receiver,
-			revocation: previous ? "previously_confirmed" : "confirmed",
-			externalHook
-		};
-	} catch (error) {
-		if (error instanceof AgentDisconnectError) throw error;
-		throw new AgentDisconnectError("Disconnect could not safely complete. The credential and local evidence were preserved. Check this profile and listener status before retrying.");
-	} finally {
-		releaseClaim?.();
-		releaseSetup?.();
+		} else clearPendingAgentInfo(pendingPath);
+		if (agentInfoState === "already_present") skipped.push({
+			step: "agent_info",
+			reason: "already_present"
+		});
 	}
+	const receiving = receiver === "external" ? {
+		...result.receiving,
+		state: externalReceivingState(externalHook),
+		mode: "external",
+		hook: externalHook
+	} : receiver === "poll" ? {
+		...result.receiving,
+		mode: "poll",
+		checkCommand: pollCheckCommand(invocation, result.identity.profileName),
+		...fallback ? {
+			fallbackReason: fallback.reason,
+			fallbackDetail: fallback.detail,
+			codexVersion: fallback.codexVersion
+		} : {}
+	} : {
+		...result.receiving,
+		mode: "native",
+		mailCheck: mailCheck?.state ?? "not_started",
+		lastSuccessfulMailCheckAt: mailCheck?.lastSuccessfulMailCheckAt ?? null
+	};
+	const receiverReady = receiver === "external" ? externalHook === "installed_unverified" : receiver === "poll" || result.receiving.state === "healthy";
+	const resumeCommand = [
+		invocation,
+		"agent connect",
+		`--profile ${result.identity.profileName}`,
+		...session ? [`--session ${session}`] : [],
+		`--receiver ${receiver}`,
+		"--resume",
+		...options.contactRequests ?? savedSetup(options.configDir, profileName)?.contactRequests ? ["--contact-requests"] : [],
+		...options.skill === false ? ["--no-skill"] : [],
+		...options.project ? ["--project"] : [],
+		"--json"
+	].join(" ");
+	return {
+		status: verified && receiverReady ? "connected" : "pending",
+		address: result.identity.agentAddress,
+		orgId: result.identity.orgId,
+		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: {
+			version: options.cliVersion,
+			capabilities: [...AGENT_CONNECT_CAPABILITIES]
+		},
+		skill,
+		verification: result.verification,
+		receiving,
+		...result.ownerNotifications ? { ownerNotifications: result.ownerNotifications } : {},
+		agentInfo: agentInfoState,
+		skipped,
+		warnings,
+		selectProfile: `PRIMITIVE_AGENT_PROFILE=${result.identity.profileName}`,
+		resumeCommand,
+		guidance: `${result.guidance} ${ownerReportGuidance(identity)}`,
+		identity,
+		externalHook
+	};
 }
 //#endregion
 //#region src/oclif/agent-enroll.ts
@@ -4434,7 +4797,7 @@ async function enrollAgent(params) {
 //#endregion
 //#region src/oclif/machine-session.ts
 var machine_session_exports = /* @__PURE__ */ __exportAll({
-	MACHINE_RUNTIMES: () => MACHINE_RUNTIMES,
+	HOOK_END_GRACE_MS: () => HOOK_END_GRACE_MS,
 	OMP_MAIN: () => OMP_MAIN,
 	agentConnectionState: () => agentConnectionState,
 	agentInfoForSession: () => agentInfoForSession,
@@ -4453,40 +4816,6 @@ var machine_session_exports = /* @__PURE__ */ __exportAll({
 	runtimeSessionId: () => runtimeSessionId,
 	workspaceName: () => workspaceName
 });
-const MACHINE_RUNTIMES = [
-	"claude",
-	"codex",
-	"omp"
-];
-function sessionRecordPath(configDir, session) {
-	return join(configDir, "machine", "sessions", `${session}.json`);
-}
-function readSessionRecord(configDir, session) {
-	try {
-		const value = readMailJson(sessionRecordPath(configDir, session));
-		if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-		const row = value;
-		if (row.version !== 1 || row.session !== session || typeof row.profile !== "string" || typeof row.name !== "string" || !MACHINE_RUNTIMES.includes(row.runtime) || row.createdBy !== "session-register" && row.createdBy !== "existing") return null;
-		return {
-			version: 1,
-			runtime: row.runtime,
-			session,
-			profile: row.profile,
-			name: row.name,
-			createdBy: row.createdBy,
-			address: typeof row.address === "string" ? row.address : null,
-			agentInfo: row.agentInfo === "created" || row.agentInfo === "already_present" ? row.agentInfo : null,
-			registeredAt: typeof row.registeredAt === "string" ? row.registeredAt : (/* @__PURE__ */ new Date(0)).toISOString(),
-			endedAt: typeof row.endedAt === "string" ? row.endedAt : null,
-			disconnect: row.disconnect === "done" || row.disconnect === "pending" || row.disconnect === "pending_enrollment" ? row.disconnect : typeof row.endedAt === "string" ? "done" : null
-		};
-	} catch {
-		return null;
-	}
-}
-function saveSessionRecord(configDir, row) {
-	writeMailJson(sessionRecordPath(configDir, row.session), row);
-}
 /** The repository (or directory) a session works in, for its default name. */
 function workspaceName(cwd) {
 	let current = resolve(cwd);
@@ -4644,32 +4973,6 @@ function receiverMode(setupDirectory) {
 		return null;
 	}
 }
-/** Serialize every read-modify-write of one session's record. */
-async function withRecordLock(configDir, session, action) {
-	const directory = join(configDir, "machine", "sessions");
-	privateMailDirectory(directory, true);
-	let release;
-	for (let attempt = 0; attempt < 200 && !release; attempt++) try {
-		release = acquireListenLock(directory, `session-record-${session}`);
-	} catch {
-		await setTimeout$1(50);
-	}
-	if (!release) throw new ListenStateError("The session record is locked by another run.");
-	try {
-		return await action();
-	} finally {
-		release();
-	}
-}
-/** Read, change and save one record under its lock. Returns the saved record. */
-function updateSessionRecord(configDir, session, change) {
-	return withRecordLock(configDir, session, () => {
-		const current = readSessionRecord(configDir, session);
-		const next = change(current);
-		if (next && next !== current) saveSessionRecord(configDir, next);
-		return next ?? current;
-	});
-}
 /** The address an interrupted enrollment saved, when there is one. */
 function enrollmentAddress(configDir, profileName) {
 	try {
@@ -4791,17 +5094,95 @@ async function revokeWithMemberLogin(configDir, address, fetchImpl = fetch) {
 		return false;
 	}
 }
+const DISCONNECT_DEFAULTS = {
+	disconnect: disconnectAgent,
+	revokeByAddress: revokeWithMemberLogin,
+	uninstallHook: (options) => uninstallClaudeWakeHook(options),
+	now: () => /* @__PURE__ */ new Date()
+};
 /** Enrollment saves its state before any request, so a quiet record this old created nothing. */
 const ENROLLMENT_SETTLED_MS = 6e5;
+function sameAddress(a, b) {
+	return a !== null && b !== null && a.toLowerCase() === b.toLowerCase();
+}
+/**
+* Whether the profile's current credential is the one this registration
+* created. Another credential can sit in the same profile after `agent
+* connect` or a replacement, and that one must never be disconnected here.
+*/
+function holdsRegisteredCredential(configDir, record, current) {
+	if (record.invitationHash) return record.invitationHash === current.invitation_hash && (record.address === null || sameAddress(record.address, current.agent_address));
+	if (record.address) return sameAddress(record.address, current.agent_address);
+	return sameAddress(enrollmentAddress(configDir, record.profile).address, current.agent_address);
+}
+/** A saved revocation confirmation in the profile names this address. */
+function addressRevokedLocally(configDir, profileName, address) {
+	try {
+		const directory = agentProfileDirectory(configDir, profileName);
+		return readdirSync(directory).some((name) => {
+			if (!/^disconnected-[a-f0-9]{64}\.json$/.test(name)) return false;
+			try {
+				const row = readMailJson(join(directory, name));
+				return typeof row?.address === "string" && sameAddress(row.address, address);
+			} catch {
+				return false;
+			}
+		});
+	} catch {
+		return false;
+	}
+}
+/**
+* The profile holds another credential now. Leave it connected; remove only
+* the registered agent's own exact-session hooks (they are keyed by its
+* address, so the current agent's hooks are untouched), and revoke the
+* registered agent by address if nothing confirms it is already revoked.
+* When the current credential has the registered address (the same address
+* reconnected with a new credential), hooks and a revocation by address would
+* both hit the current agent, so nothing is touched.
+*/
+async function cleanUpReplacedRegistration(configDir, record, current, deps, env, fetchImpl) {
+	const address = record.address;
+	if (!address || sameAddress(address, current.agent_address)) return;
+	if (record.runtime === "claude") try {
+		deps.uninstallHook({
+			configDir,
+			profileName: record.profile,
+			agentAddress: address,
+			sessionId: record.session,
+			env
+		});
+	} catch {}
+	if (addressRevokedLocally(configDir, record.profile, address)) return;
+	try {
+		await deps.revokeByAddress(configDir, address, fetchImpl);
+	} catch {}
+}
 async function disconnectSessionAgent(configDir, record, deps, env, fetchImpl, enrollmentSettled = false) {
 	try {
-		if (loadConnectedAgentProfile(configDir, record.profile)) {
-			await deps.disconnect({
-				configDir,
-				profileName: record.profile,
-				fetch: fetchImpl,
-				env
-			});
+		const current = loadConnectedAgentProfile(configDir, record.profile);
+		if (current) {
+			const release = async (holder) => {
+				await cleanUpReplacedRegistration(configDir, record, holder, deps, env, fetchImpl);
+				return "released";
+			};
+			if (!holdsRegisteredCredential(configDir, record, current)) return await release(current);
+			try {
+				await deps.disconnect({
+					configDir,
+					profileName: record.profile,
+					fetch: fetchImpl,
+					env,
+					expected: {
+						address: current.agent_address,
+						invitationHash: current.invitation_hash
+					}
+				});
+			} catch (error) {
+				if (!(error instanceof AgentCredentialChangedError)) throw error;
+				const holder = loadConnectedAgentProfile(configDir, record.profile);
+				return holder ? await release(holder) : "pending";
+			}
 			return "done";
 		}
 		if (disconnectConfirmedLocally(configDir, record.profile)) return "done";
@@ -4818,10 +5199,16 @@ async function disconnectSessionAgent(configDir, record, deps, env, fetchImpl, e
 }
 async function finishSessionDisconnect(configDir, record, deps, env, fetchImpl, enrollmentSettled = false) {
 	const outcome = await disconnectSessionAgent(configDir, record, deps, env, fetchImpl, enrollmentSettled);
-	return (await updateSessionRecord(configDir, record.session, (current) => !current || current.disconnect === "done" || current.disconnect === outcome ? current : {
-		...current,
-		disconnect: outcome
-	}))?.disconnect === "done" ? "done" : outcome;
+	const saved = await updateSessionRecord(configDir, record.session, (current) => {
+		if (current?.createdBy !== "session-register" || current.disconnect === "done") return current;
+		if (outcome === "released") return releasedRecord(current, "credential_changed", deps.now());
+		return current.disconnect === outcome ? current : {
+			...current,
+			disconnect: outcome
+		};
+	});
+	if (saved?.createdBy === "existing" && outcome === "released") return "released";
+	return saved?.disconnect === "done" ? "done" : outcome;
 }
 const RECEIVING = {
 	claude: "external_hook",
@@ -4836,6 +5223,8 @@ function withDefined(defaults, overrides) {
 }
 const HELD_DETAIL = "This session already receives as another connected profile, so this profile's receive hooks were not added. Run `primitive machine doctor --fix --profile <profile>` to bind it deliberately.";
 const ENDED_DETAIL = "This session ended, so its agent was disconnected. A new address is never created for the same session.";
+const ENDED_DEFERRED_DETAIL = "This session ended moments ago. Its agent is disconnected after a short wait unless the session starts again first.";
+const RELEASED_DETAIL = "This session's profile now holds an agent connected some other way, so it was left connected.";
 const ENDED_PENDING_DETAIL = "This session ended, but disconnecting its agent has not been confirmed yet; `primitive machine doctor --fix` retries it.";
 /**
 * Give this session an address once. Safe to run on every start and resume:
@@ -4851,9 +5240,7 @@ async function registerSession(options) {
 		seedAgentInfo: (configDir, profileName, value) => seedAgentInfoNote(configDir, profileName, value, options.fetch),
 		connectionState: (profile) => agentConnectionState(profile, options.fetch),
 		ompSession: ompProcessSession,
-		now: () => /* @__PURE__ */ new Date(),
-		disconnect: disconnectAgent,
-		revokeByAddress: revokeWithMemberLogin
+		...DISCONNECT_DEFAULTS
 	}, options.dependencies);
 	const runtime = options.runtime;
 	const base = {
@@ -4920,7 +5307,18 @@ async function registerSession(options) {
 	};
 	const cwd = resolve(options.cwd ?? process.cwd());
 	const ended = async (current, enrolledNow = false) => {
+		if (current.disconnect === "deferred") return {
+			...known,
+			address: current.address,
+			status: "ended",
+			detail: ENDED_DEFERRED_DETAIL
+		};
 		const outcome = current.disconnect === "done" && !enrolledNow ? "done" : await finishSessionDisconnect(options.configDir, current, deps, env, options.fetch, enrolledNow);
+		if (outcome === "released") return {
+			...known,
+			status: "already_registered",
+			detail: RELEASED_DETAIL
+		};
 		return {
 			...known,
 			address: current.address,
@@ -4928,7 +5326,7 @@ async function registerSession(options) {
 			detail: outcome === "done" ? ENDED_DETAIL : ENDED_PENDING_DETAIL
 		};
 	};
-	const newRecord = (createdBy, address) => ({
+	const newRecord = (createdBy, address, invitationHash = null) => ({
 		version: 1,
 		runtime,
 		session: sessionId,
@@ -4936,13 +5334,23 @@ async function registerSession(options) {
 		name: defaultSessionName(runtime, cwd),
 		createdBy,
 		address,
+		invitationHash,
 		agentInfo: null,
 		registeredAt: deps.now().toISOString(),
 		endedAt: null,
-		disconnect: null
+		disconnect: null,
+		deferredUntil: null,
+		endReason: null,
+		release: null
 	});
 	try {
-		let record = readSessionRecord(options.configDir, sessionId);
+		let record = await updateSessionRecord(options.configDir, sessionId, (current) => current?.endedAt && current.disconnect === "deferred" ? {
+			...current,
+			endedAt: null,
+			disconnect: null,
+			deferredUntil: null,
+			endReason: null
+		} : current);
 		if (record?.endedAt) return await ended(record);
 		const finishAgentInfo = async () => {
 			if (reused || record?.agentInfo) return;
@@ -4968,7 +5376,7 @@ async function registerSession(options) {
 		const installHook = (profile) => runtime !== "claude" || receiverMode(agentProfileDirectory(options.configDir, profileName)) !== "external" ? "installed" : claudeHook(profile.agent_address);
 		const existing = loadConnectedAgentProfile(options.configDir, profileName);
 		if (existing) {
-			record = await updateSessionRecord(options.configDir, sessionId, (current) => current ?? newRecord("existing", existing.agent_address));
+			record = await updateSessionRecord(options.configDir, sessionId, (current) => current ?? newRecord("existing", existing.agent_address, existing.invitation_hash));
 			if (!record) throw new Error("session record unavailable");
 			if (record.endedAt) return await ended(record);
 			const state = await deps.connectionState(existing);
@@ -5045,14 +5453,18 @@ async function registerSession(options) {
 			enrollError = error;
 		}
 		let created = result?.identity.agentAddress ?? null;
-		if (!created) try {
-			created = loadConnectedAgentProfile(options.configDir, profileName)?.agent_address ?? enrollmentAddress(options.configDir, profileName).address;
+		let saved = null;
+		try {
+			saved = loadConnectedAgentProfile(options.configDir, profileName);
 		} catch {
-			created = enrollmentAddress(options.configDir, profileName).address;
+			saved = null;
 		}
-		record = await updateSessionRecord(options.configDir, sessionId, (current) => current && created && current.address !== created ? {
+		created ??= saved?.agent_address ?? enrollmentAddress(options.configDir, profileName).address;
+		const createdHash = saved && created && sameAddress(saved.agent_address, created) ? saved.invitation_hash : null;
+		record = await updateSessionRecord(options.configDir, sessionId, (current) => current && current.createdBy === "session-register" && created && (current.address !== created || createdHash !== null && current.invitationHash !== createdHash) ? {
 			...current,
-			address: created
+			address: created,
+			invitationHash: createdHash ?? current.invitationHash
 		} : current);
 		if (!record) throw new Error("session record unavailable");
 		if (record.endedAt) return await ended(record, true);
@@ -5100,17 +5512,30 @@ async function registerSession(options) {
 	}
 }
 /**
+* How long an end from a runtime hook waits before disconnecting. A runtime
+* reports the same end for a restart, a switch to another session and a real
+* exit, so the hook cannot tell them apart; a start of the same session
+* within this window cancels the end and keeps its agent.
+*/
+const HOOK_END_GRACE_MS = 3e5;
+/** The end of this record is a hook's, still waiting. */
+function deferredEnd(record) {
+	return Boolean(record?.endedAt) && record?.disconnect === "deferred";
+}
+/**
 * Disconnect the agent a session got from `session-register`. Agents
-* connected any other way are left alone. The end is recorded first, under
-* the record's lock, so a registration still enrolling sees it and
-* disconnects the agent it creates. Never throws.
+* connected any other way are left alone, including a credential connected
+* later into the same profile. The end is recorded first, under the record's
+* lock, so a registration still enrolling sees it and disconnects the agent
+* it creates. With `graceMs` (an end reported by a runtime hook) the
+* disconnect waits that long, and a start of the same session meanwhile
+* cancels it. Never throws.
 */
 async function endSession(options) {
 	const env = options.env ?? process.env;
 	const deps = withDefined({
-		disconnect: disconnectAgent,
-		revokeByAddress: revokeWithMemberLogin,
-		now: () => /* @__PURE__ */ new Date()
+		...DISCONNECT_DEFAULTS,
+		sleep: (milliseconds) => setTimeout$1(milliseconds)
 	}, options.dependencies);
 	const runtime = options.runtime;
 	const base = {
@@ -5135,20 +5560,36 @@ async function endSession(options) {
 		detail: "No session ID was given or found. Nothing was changed."
 	};
 	const sessionId = session.toLowerCase();
+	const graceMs = Math.max(0, options.graceMs ?? 0);
+	const reason = options.reason && /^[a-z_]{1,40}$/.test(options.reason) ? options.reason : null;
 	try {
 		let managed = false;
 		let alreadyDone = false;
-		const record = await updateSessionRecord(options.configDir, sessionId, (current) => {
+		let deferred = false;
+		let record = await updateSessionRecord(options.configDir, sessionId, (current) => {
 			if (current?.createdBy !== "session-register") return current;
 			managed = true;
 			if (current.endedAt && current.disconnect === "done") {
 				alreadyDone = true;
 				return current;
 			}
+			const now = deps.now();
+			if (graceMs > 0 && (!current.endedAt || deferredEnd(current))) {
+				deferred = true;
+				return {
+					...current,
+					endedAt: now.toISOString(),
+					disconnect: "deferred",
+					deferredUntil: new Date(now.getTime() + graceMs).toISOString(),
+					endReason: reason
+				};
+			}
 			return {
 				...current,
-				endedAt: current.endedAt ?? deps.now().toISOString(),
-				disconnect: "pending"
+				endedAt: current.endedAt ?? now.toISOString(),
+				disconnect: current.disconnect === "pending_enrollment" ? "pending_enrollment" : "pending",
+				deferredUntil: null,
+				endReason: current.endReason ?? reason
 			};
 		});
 		const known = {
@@ -5166,7 +5607,34 @@ async function endSession(options) {
 			status: "already_ended",
 			detail: "This session's agent was already disconnected."
 		};
-		return await finishSessionDisconnect(options.configDir, record, deps, env, options.fetch) === "done" ? {
+		if (deferred) {
+			const marked = record.endedAt;
+			await deps.sleep(graceMs);
+			let resumed = false;
+			record = await updateSessionRecord(options.configDir, sessionId, (current) => {
+				if (current?.createdBy !== "session-register" || current.endedAt !== marked || current.disconnect !== "deferred") {
+					resumed = true;
+					return current;
+				}
+				return {
+					...current,
+					disconnect: "pending",
+					deferredUntil: null
+				};
+			});
+			if (resumed || !record) return {
+				...known,
+				status: "resumed",
+				detail: "The session started again (or was ended again) before its end took effect, so this end left its agent connected."
+			};
+		}
+		const outcome = await finishSessionDisconnect(options.configDir, record, deps, env, options.fetch);
+		if (outcome === "released") return {
+			...known,
+			status: "left_connected",
+			detail: "This session's profile now holds an agent that `agent session-register` did not create, so it was left connected. Only the registered agent's own receive hooks were removed."
+		};
+		return outcome === "done" ? {
 			...known,
 			status: "disconnected",
 			detail: "This session's agent was disconnected."
@@ -5184,30 +5652,42 @@ async function endSession(options) {
 		};
 	}
 }
-/** Ended sessions whose agent disconnect still needs confirming. */
-function pendingSessionDisconnects(configDir) {
-	const directory = join(configDir, "machine", "sessions");
-	let names;
-	try {
-		names = readdirSync(directory);
-	} catch {
-		return [];
-	}
-	return names.flatMap((name) => {
-		const match = /^([0-9a-f-]{36})\.json$/.exec(name);
-		if (!match?.[1]) return [];
-		const record = readSessionRecord(configDir, match[1]);
-		return record?.endedAt && (record.disconnect === "pending" || record.disconnect === "pending_enrollment") ? [record] : [];
-	});
+/**
+* Ended sessions whose agent disconnect still needs confirming, including a
+* hook's end whose grace period is over but whose own process never finished
+* it (for example because the machine shut down).
+*/
+function pendingSessionDisconnects(configDir, now = /* @__PURE__ */ new Date()) {
+	return listSessionRecords(configDir).filter((record) => record.createdBy === "session-register" && record.endedAt && (record.disconnect === "pending" || record.disconnect === "pending_enrollment" || record.disconnect === "deferred" && !(Date.parse(record.deferredUntil ?? "") > now.getTime())));
 }
-/** Retry every pending disconnect. Returns how many are now confirmed. */
+/**
+* Retry every pending disconnect. Each goes through the same credential check
+* as a session end, so a profile reconnected some other way is left connected
+* (and counts as resolved). Returns how many are now resolved.
+*/
 async function retryPendingDisconnects(configDir, options = {}) {
-	const deps = withDefined({
-		disconnect: disconnectAgent,
-		revokeByAddress: revokeWithMemberLogin
-	}, options.dependencies);
+	const deps = withDefined(DISCONNECT_DEFAULTS, options.dependencies);
 	let done = 0;
-	for (const record of pendingSessionDisconnects(configDir)) if (await finishSessionDisconnect(configDir, record, deps, options.env ?? process.env, options.fetch) === "done") done++;
+	for (const listed of pendingSessionDisconnects(configDir, deps.now())) {
+		let record = listed;
+		if (listed.disconnect === "deferred") {
+			let changed = false;
+			record = await updateSessionRecord(configDir, listed.session, (current) => {
+				if (!current || current.endedAt !== listed.endedAt || current.disconnect !== "deferred") {
+					changed = true;
+					return current;
+				}
+				return {
+					...current,
+					disconnect: "pending",
+					deferredUntil: null
+				};
+			});
+			if (changed || !record) continue;
+		}
+		const outcome = await finishSessionDisconnect(configDir, record, deps, options.env ?? process.env, options.fetch);
+		if (outcome === "done" || outcome === "released") done++;
+	}
 	return done;
 }
 /** Read Claude's hook JSON from stdin within a short budget. */
@@ -5232,7 +5712,8 @@ async function readClaudeHookInput(stdin, timeoutMs = 2e3) {
 		if (typeof value?.session_id !== "string" || !SESSION_UUID.test(value.session_id)) return null;
 		return {
 			sessionId: value.session_id.toLowerCase(),
-			cwd: typeof value.cwd === "string" && value.cwd ? value.cwd : null
+			cwd: typeof value.cwd === "string" && value.cwd ? value.cwd : null,
+			reason: typeof value.reason === "string" && /^[a-z_]{1,40}$/.test(value.reason) ? value.reason : null
 		};
 	} catch {
 		return null;
@@ -5267,4 +5748,4 @@ async function runDetached(params) {
 	}
 }
 //#endregion
-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 };
+export { boundSessionProfiles as $, AgentDisconnectError as A, runContactRequest as B, verificationReplySubmitted as C, createNotificationContactPolicy as D, NetworkAdmissionPendingError as E, addressNoteTarget as F, receiverStatusCommand as G, agentInvitationHash as H, runAddressNotesRequest as I, savedReceiver as J, refusalAfterReplacement as K, ContactsApiError as L, clearRevokedAddresses as M, disconnectAgent as N, evaluateContactPolicy as O, AddressNotesApiError as P, recordHookMailCheck as Q, contactAddress as R, externalReceivingState as S, NETWORK_ADMISSION_PENDING_RETRY_MS as T, connectAgent as U, agentConnectionStatus as V, readAgentInvitation as W, releaseRegistrationsForProfile as X, MACHINE_RUNTIMES as Y, installClaudeWakeHook as Z, defaultAgentProfileName as _, upsertManagedBlock as _t, endSession as a, ephemeralCliReason as at, runAgentConnect as b, refreshOwnerMemberAddressPeriodically as bt, pendingSessionDisconnects as c, inspectClaudeHooks as ct, registerSession as d, samePath as dt, claudeConfigDir as et, retryPendingDisconnects as f, writeClaudeSettings as ft, connectWarnings as g, readManagedFile as gt, enrollmentResumes as h, jsonIndentation as ht, connectedProfilesForSession as i, ensureHookLauncher as it, claimOverRevokedSetup as j, canonicalContactSelector as k, psProcessInfo as l, readClaudeSettings as lt, enrollAgent as m, inspectManagedBlock as mt, OMP_MAIN as n, describeSessionHookChange as nt, headlessClaudeRun as o, findOnPath as ot, runDetached as p, MachineFileError as pt, saveConnectionName as q, agentConnectionState as r, describeSessionHookItem as rt, machine_session_exports as s, hasMachineSessionHooks as st, HOOK_END_GRACE_MS as t, currentCliLocation as tt, readClaudeHookInput as u, repairClaudeHooks as ut, invitationProfileName as v, writeManagedFile as vt, ContactPolicyReadRetryError as w, RECEIVER_MODES as x, withOwnerMemberAddress as xt, pollCheckCommand as y, readHookLauncherWarning as yt, contactAgentAddress as z };