primcli 1.39.0 → 1.41.0

package/dist/oclif/index.js

@@ -1,10 +1,10 @@
 import { a as REPEAT_IDLE_MAX_MINUTES, d as parseRepeatTick, f as preparePresenceAliveEmail, g as isEmailReceivedEvent, i as REPEAT_EVERY_MAX_MINUTES, l as parseInteractionEnvelope$1, m as repeatStopCommand, o as REPEAT_MAX_SENDS_MAX, p as prepareSignalEmail, s as buildRepeatStopBody, u as parsePresenceEnvelope, v as parseWebhookEvent, y as parseFromHeader } from "../repeats-CoK0tpCK-Bx7nmyRi.js";
 import { a as agentProfilesDirectory, c as loadConnectedAgentProfile, d as requireDefaultLoginProfile, f as saveConnectedAgentProfile, i as agentProfileName, l as parseConnectedAgentProfile, n as AgentConnectionSetupError, o as connectedAgentIdentity, r as agentProfileDirectory, s as connectedApiBaseUrl, t as AGENT_PROFILE_ENV, u as parseOwnerMemberAddress } from "../connected-agent-profile-8tpOMdq3.js";
-import { $ as putAgentContactPolicy, A as getRepeatingSend, B as listEmails, C as getEmail, Ct as updateFunction, D as getInboxStatus, Dt as updateWakeSchedule, E as getFunctionTestRunTrace, Et as updateWakeAuthorization, F as listAgentNetworks, G as listRoutes, H as listFunctionLogs, I as listContacts, J as listWakeDispatches, K as listSentEmails, L as listDefaultNetworkAgents, M as getThread, N as getWakeSchedule, O as getMemory, Ot as verifyAgentClaim, P as listAgentContacts, Q as putAgentContact, R as listDefaultNetworkMembers, S as getDefaultNetworkAgent, St as updateDefaultNetworkMember, T as getFunctionRouting, Tt as updateRoute, U as listFunctions, V as listEndpoints, W as listRepeatingSends, X as pollCliLogin, Y as listWakeSchedules, Z as pullWebhookEvent, _ as getAccount, _t as startAgentSignup, a as createEndpoint, at as resendAgentSignupVerification, b as getConversation, bt as testFunction, c as createWakeAuthorization, ct as searchEmails, d as deleteContact, dt as sendEmail, et as putContact, f as deleteMemory, ft as setFunctionRoute, gt as startAgentClaim, h as deleteWakeSchedule, ht as simulateRoute, i as completeWebhookEvent, it as replyToEmail, j as getSentEmail, k as getOrgRoutingTopology, kt as verifyAgentSignup, l as createWakeSchedule, lt as searchMemories, m as deleteWakeAuthorization, mt as setMemory, n as checkDefaultNetworkContactAdmission, nt as removeDefaultNetworkMember, o as createFunction, ot as runWakeSchedule, p as deleteRoute, pt as setFunctionSecret, q as listWakeAuthorizations, r as cliLogout, rt as reorderRoutes, s as createRoute, t as addDefaultNetworkMember, tt as redeemCreditCode, u as deleteAgentContact, ut as semanticSearch, v as getAgentContactPolicy, vt as startCliLogin, w as getFunction, wt as updateRepeatingSend, x as getCreditBalance, xt as unsetFunctionRoute, y as getContact, yt as stopRepeatFromEmail, z as listDomains } from "../sdk.gen-CgKZwHs3.js";
+import { $ as putAgentContactPolicy, A as getRepeatingSend, B as listEmails, C as getEmail, Ct as updateFunction, D as getInboxStatus, Dt as updateWakeSchedule, E as getFunctionTestRunTrace, Et as updateWakeAuthorization, F as listAgentNetworks, G as listRoutes, H as listFunctionLogs, I as listContacts, J as listWakeDispatches, K as listSentEmails, L as listDefaultNetworkAgents, M as getThread, N as getWakeSchedule, O as getMemory, Ot as verifyAgentClaim, P as listAgentContacts, Q as putAgentContact, R as listDefaultNetworkMembers, S as getDefaultNetworkAgent, St as updateDefaultNetworkMember, T as getFunctionRouting, Tt as updateRoute, U as listFunctions, V as listEndpoints, W as listRepeatingSends, X as pollCliLogin, Y as listWakeSchedules, Z as pullWebhookEvent, _ as getAccount, _t as startAgentSignup, a as createEndpoint, at as resendAgentSignupVerification, b as getConversation, bt as testFunction, c as createWakeAuthorization, ct as searchEmails, d as deleteContact, dt as sendEmail, et as putContact, f as deleteMemory, ft as setFunctionRoute, gt as startAgentClaim, h as deleteWakeSchedule, ht as simulateRoute, i as completeWebhookEvent, it as replyToEmail, j as getSentEmail, k as getOrgRoutingTopology, kt as verifyAgentSignup, l as createWakeSchedule, lt as searchMemories, m as deleteWakeAuthorization, mt as setMemory, n as checkDefaultNetworkContactAdmission, nt as removeDefaultNetworkMember, o as createFunction, ot as runWakeSchedule, p as deleteRoute, pt as setFunctionSecret, q as listWakeAuthorizations, r as cliLogout, rt as reorderRoutes, s as createRoute, t as addDefaultNetworkMember, tt as redeemCreditCode, u as deleteAgentContact, ut as semanticSearch, v as getAgentContactPolicy, vt as startCliLogin, w as getFunction, wt as updateRepeatingSend, x as getCreditBalance, xt as unsetFunctionRoute, y as getContact, yt as stopRepeatFromEmail, z as listDomains } from "../sdk.gen-I4mhUuUW.js";
 import { A as saveActiveChatState, C as resolveCliAuth, D as deleteChatState, E as chatStatePath, O as loadActiveChatState, T as saveSignupCredentials, _ as deleteCliCredentials, a as normalizeCliEnvironmentName, b as hasStoredCliLogin, c as resolveConfigEnvironment, g as credentialsPath, h as credentialsLockPath, i as loadCliConfig, j as PrimitiveApiClient, k as loadChatConversationByLocalId, l as saveCliConfig, m as cliAccessTokenExpiresAt, n as deleteCliConfig, o as redactCliEnvironment, p as acquireCliCredentialsLock, r as emptyCliConfig, s as removeCliEnvironment, u as upsertCliEnvironment, v as deleteCliCredentialsLock, w as saveCliCredentials, x as loadCliCredentials, y as detectPrimitiveKeyEnvMisname } from "../cli-config-UOlrfcPz.js";
 import { S as resolveListenSubscription, _ as acquireListenLock, a as mailLockBusy, c as mailTime, d as readMailJson, f as removeMailFile, g as ListenStateError, h as writeMailJson, i as mailId, l as privateMailDirectory, m as withMailLock, o as mailObject, p as syncMailDirectory, r as mailAddress, s as mailString, u as privateMailPermissions, x as normalizeListenOrigin, y as listenIdentity } from "../shared-mail-files-CZqI1kj6.js";
-import { $ as extractErrorCode, A as reserveSharedMailSubscription, At as queryUsesAutomated, B as sentInThread, C as thrownErrorExitCode, Ct as AutomatedFilterUnsupportedError, D as ensureSharedMailSubscription, Dt as expectedAutomatedVerdicts, E as sharedMailScope, Et as ensureSearchReportsAutomated, F as describeWake, Ft as resolveCliApiRequestConfig, G as EventConnection, H as serverRelationship, I as displayAddress, J as pushFile, K as EventReceiverError, L as formatWakeContext, M as readConversationFollow, Mt as createAuthenticatedCliApiClient, N as otherParticipants, Nt as createCliApiClient, O as createSharedMailWaiter, Ot as hasAutomatedVerdict, P as bareAddress, Pt as refreshStoredCliCredentials, Q as createOperationCommand, R as latestOwnOutbound, S as successfulSendOutcome, St as AUTOMATED_VALUES, T as openSharedMailReceiver, Tt as automatedRejectedError, U as wakeRelationship, V as serverMuted, W as readSharedMailOwner, X as API_ERROR_CODES, Y as API_BASE_URL_FLAG_DESCRIPTION, Z as TIME_FLAG_DESCRIPTION, _ as reportSendCommandResult, _t as queryUsesAwaiting, a as assertValidIdempotencyKey, at as writeErrorWithHints, b as sentHistoryWindowStart, bt as AUTOMATED_FILTER_UNSUPPORTED_CODE, c as checkPriorReplies, ct as REPLY_STATE_UNSUPPORTED_CODE, d as formatDeletedEarlierSendNotice, dt as awaitingRejectedError, et as extractErrorPayload, f as formatPriorRepliesCheckSkipped, ft as ensureSearchReportsReplyState, g as priorRepliesThatWentOut, gt as isAwaitingRejectedError, h as formatSendRecordFailureSummary, ht as hasReplyState, i as apiResultHttpStatus, it as surfaceUnauthorizedHint, j as followEmailConversation, k as openSharedMailStore, kt as isAutomatedRejectedError, l as classifySendError, lt as ReplyStateUnsupportedError, m as formatSendFailureSummary, mt as formatRepliesCell, n as IDEMPOTENCY_KEY_FLAG_DESCRIPTION, nt as readTextFileFlag, o as buildFollowUpCommand, ot as AWAITING_FLAG_DESCRIPTION, p as formatPriorRepliesWarning, pt as formatAwaitingCell, q as pullFile, r as SEND_OUTCOME_HELP, rt as runWithTiming, s as buildThrownSendFailureEnvelope, st as AWAITING_VALUES, t as sendSignal, tt as formatErrorPayload, u as deriveSendIdempotencyKey, ut as assertAwaitingFilterRows, v as sendIdentityFields, vt as formatAlreadySentNotice, w as reconcileChatSend, wt as assertAutomatedVerdict, x as serializeErrorPayload, xt as AUTOMATED_FLAG_DESCRIPTION, y as sendOutcomeExitCode, yt as writeIdempotentReplayBannerIfReplay, z as readThreadContext } from "../signal-command-C8Ph0ylh.js";
-import { _ as NativeSessionDisconnectedError, a as readBundledConnectSkill, b as NotificationOutcomeUnknownError, c as openSessionNotifications, d as isRoutineNotificationContent, f as notificationPartReader, g as defaultSessionSocket, h as connectNativeSession, i as installedVersion, l as notificationReceiptPage, m as SESSION_UUID$1, n as detectAgentRuntime, o as notificationScope, p as readConversationStatusContent, r as installConnectSkill, s as notificationSenders, t as connectSkillTarget, u as NotificationRetryError, v as NativeSessionError, y as NativeSessionNotLoadedError } from "../connect-skill-DjKt8NC8.js";
+import { $ as extractErrorCode, A as reserveSharedMailSubscription, At as queryUsesAutomated, B as sentInThread, C as thrownErrorExitCode, Ct as AutomatedFilterUnsupportedError, D as ensureSharedMailSubscription, Dt as expectedAutomatedVerdicts, E as sharedMailScope, Et as ensureSearchReportsAutomated, F as describeWake, Ft as resolveCliApiRequestConfig, G as EventConnection, H as serverRelationship, I as displayAddress, J as pushFile, K as EventReceiverError, L as formatWakeContext, M as readConversationFollow, Mt as createAuthenticatedCliApiClient, N as otherParticipants, Nt as createCliApiClient, O as createSharedMailWaiter, Ot as hasAutomatedVerdict, P as bareAddress, Pt as refreshStoredCliCredentials, Q as createOperationCommand, R as latestOwnOutbound, S as successfulSendOutcome, St as AUTOMATED_VALUES, T as openSharedMailReceiver, Tt as automatedRejectedError, U as wakeRelationship, V as serverMuted, W as readSharedMailOwner, X as API_ERROR_CODES, Y as API_BASE_URL_FLAG_DESCRIPTION, Z as TIME_FLAG_DESCRIPTION, _ as reportSendCommandResult, _t as queryUsesAwaiting, a as assertValidIdempotencyKey, at as writeErrorWithHints, b as sentHistoryWindowStart, bt as AUTOMATED_FILTER_UNSUPPORTED_CODE, c as checkPriorReplies, ct as REPLY_STATE_UNSUPPORTED_CODE, d as formatDeletedEarlierSendNotice, dt as awaitingRejectedError, et as extractErrorPayload, f as formatPriorRepliesCheckSkipped, ft as ensureSearchReportsReplyState, g as priorRepliesThatWentOut, gt as isAwaitingRejectedError, h as formatSendRecordFailureSummary, ht as hasReplyState, i as apiResultHttpStatus, it as surfaceUnauthorizedHint, j as followEmailConversation, k as openSharedMailStore, kt as isAutomatedRejectedError, l as classifySendError, lt as ReplyStateUnsupportedError, m as formatSendFailureSummary, mt as formatRepliesCell, n as IDEMPOTENCY_KEY_FLAG_DESCRIPTION, nt as readTextFileFlag, o as buildFollowUpCommand, ot as AWAITING_FLAG_DESCRIPTION, p as formatPriorRepliesWarning, pt as formatAwaitingCell, q as pullFile, r as SEND_OUTCOME_HELP, rt as runWithTiming, s as buildThrownSendFailureEnvelope, st as AWAITING_VALUES, t as sendSignal, tt as formatErrorPayload, u as deriveSendIdempotencyKey, ut as assertAwaitingFilterRows, v as sendIdentityFields, vt as formatAlreadySentNotice, w as reconcileChatSend, wt as assertAutomatedVerdict, x as serializeErrorPayload, xt as AUTOMATED_FLAG_DESCRIPTION, y as sendOutcomeExitCode, yt as writeIdempotentReplayBannerIfReplay, z as readThreadContext } from "../signal-command-BFPKbatO.js";
+import { _ as NativeSessionDisconnectedError, a as readBundledConnectSkill, b as NotificationOutcomeUnknownError, c as openSessionNotifications, d as isRoutineNotificationContent, f as notificationPartReader, g as defaultSessionSocket, h as connectNativeSession, i as installedVersion, l as notificationReceiptPage, m as SESSION_UUID$1, n as detectAgentRuntime, o as notificationScope, p as readConversationStatusContent, r as installConnectSkill, s as notificationSenders, t as connectSkillTarget, u as NotificationRetryError, v as NativeSessionError, y as NativeSessionNotLoadedError } from "../connect-skill-DuanRI34.js";
 import { c as startBackgroundListen, i as backgroundListenToken, l as stopBackgroundListen, o as runBackgroundListen, r as backgroundListenStatus, u as verifyBackgroundListenTarget } from "../listen-background-Bsofqq_6.js";
 import { F as readBeforeDeadline, I as scopedChatSenderTrust, L as presenceDisposition, M as isConnectedChatCredential, N as isPlainChatReply, P as isScopedChatReply, R as readPresenceProjection, T as restoreAutoWorking, g as haltAutoWorking, h as dispatchAutoWorking, l as autoSignalEligible, m as dispatchAutoRead } from "../auto-signals-C8nMME8J.js";
 import { t as guardJsonOutputCommands } from "../json-output-BVRgl6jf.js";
@@ -1695,8 +1695,15 @@ const openapiDocument = {
 			"get": {
 				"operationId": "getConversation",
 				"summary": "Get the conversation an email belongs to",
-				"description": "Returns the full conversation the given inbound email belongs\nto, as ordered, ready-to-prompt turns WITH bodies. It resolves\nthe thread from the email and returns every message oldest-first,\nso an agent that received an email can pass `messages` straight\nto a chat model in one call instead of walking `/threads/{id}`\nplus `/emails/{id}` and `/sent-emails/{id}` per message.\n\nEach message carries a `direction` (`inbound` | `outbound`) and a\nderived `role`: `inbound` -> `user`, `outbound` -> `assistant`\n(your own prior replies). The role mapping assumes the caller\nowns the outbound side, which is the agent-reply case this exists\nfor. If the email has no thread yet (a brand-new message), the\nconversation is just that one message as a single user turn.\n\nThe message list is capped; check `truncated` to detect when\nolder messages were omitted. Consecutive same-role turns are not\nmerged here; that normalization is model-specific and left to the\ncaller.\n",
+				"description": "Returns the full conversation the given inbound email belongs\nto, as ordered, ready-to-prompt turns WITH bodies. It resolves\nthe thread from the email and returns every message oldest-first,\nso an agent that received an email can pass `messages` straight\nto a chat model in one call instead of walking `/threads/{id}`\nplus `/emails/{id}` and `/sent-emails/{id}` per message.\n\nEach message carries a `direction` (`inbound` | `outbound`) and a\nderived `role`: `inbound` -> `user`, `outbound` -> `assistant`\n(your own prior replies). The role mapping assumes the caller\nowns the outbound side, which is the agent-reply case this exists\nfor. If the email has no thread yet (a brand-new message), the\nconversation is just that one message as a single user turn.\n\nThe message list is capped; check `truncated` to detect when\nolder messages were omitted. Consecutive same-role turns are not\nmerged here; that normalization is model-specific and left to the\ncaller.\n\nPass `since` for an incremental read. `since=start` returns the\nfull conversation plus a `cursor`. Sending that `cursor` back as\n`since` returns only the messages created or changed after it,\noldest first, with the same per-message shape, and a new\n`cursor`. Without `since` the response carries no `cursor` and\nno per-message `status`.\n",
 				"tags": ["Emails"],
+				"parameters": [{
+					"name": "since",
+					"in": "query",
+					"required": false,
+					"schema": { "type": "string" },
+					"description": "Incremental read position. Either the literal `start` or a\n`cursor` returned by a previous read of this endpoint. Any\nother value returns 400 `validation_error`.\n\nWith `start`, the response holds every message the read\nwithout `since` would return, plus `cursor`. With a cursor,\n`messages` holds only the messages created or changed after\nit, oldest first. A change includes an inbound message\nbecoming visible or its body being filled, withheld or\ndiscarded, and a delivery status change on an outbound\nmessage. `thread_id`, `subject`, `message_count` and\n`truncated` always describe the whole conversation, not the\nreturned messages.\n\nThe cursor is an opaque string. Send it back verbatim and do\nnot parse it or build one; its format can change. A message\ncan be returned again by a later read (for example while\nolder writes are still committing), so upsert messages by\n`id`. Deleted messages are not reported; a periodic\n`since=start` read (or a read without `since`) reconciles.\n"
+				}],
 				"responses": {
 					"200": {
 						"description": "Conversation",
@@ -12247,6 +12254,10 @@ const openapiDocument = {
 					"messages": {
 						"type": "array",
 						"items": { "$ref": "#/components/schemas/ConversationMessage" }
+					},
+					"cursor": {
+						"type": "string",
+						"description": "Present only on a `since` read: the position to send as\n`since` on the next read. An opaque string: send it back\nverbatim and do not parse it or build one.\n"
 					}
 				},
 				"required": [
@@ -12258,7 +12269,7 @@ const openapiDocument = {
 			},
 			"ConversationMessage": {
 				"type": "object",
-				"description": "One message in the conversation, with its body and a chat role.",
+				"description": "One message in the conversation, with its body and a chat role.\n`status` is the delivery status of an outbound message, as on\n`/sent-emails/{id}`, and is present only on a `since` read and\nonly on outbound messages.\n",
 				"properties": {
 					"role": {
 						"type": "string",
@@ -12287,397 +12298,398 @@ const openapiDocument = {
 						"format": "date-time",
 						"description": "received_at for inbound, created_at for outbound."
 					},
-					"presence_control": { "$ref": "#/components/schemas/PresenceControl" },
-					"repeat": {
-						"type": ["object", "null"],
-						"description": "Set when Primitive sent this message as part of a repeating send. Resolved from Primitive's own records, never from the message content. Null on every other message and on servers that predate repeating sends.",
-						"properties": {
-							"repeat_id": {
-								"type": "string",
-								"format": "uuid"
-							},
-							"sequence": {
-								"type": "integer",
-								"minimum": 1
-							}
-						},
-						"required": ["repeat_id", "sequence"]
-					},
-					"sender_member": {
-						"type": ["object", "null"],
-						"description": "Verified human authorship, projected only within the member organization. Historical attribution is not current sending or owner authority.",
-						"properties": {
-							"address": {
-								"type": "string",
-								"format": "email"
-							},
-							"user_id": { "type": "string" },
-							"name": { "type": ["string", "null"] }
-						},
-						"required": [
-							"address",
-							"user_id",
-							"name"
-						]
-					}
-				},
-				"required": [
-					"role",
-					"direction",
-					"id",
-					"text"
-				]
-			},
-			"SendMailAttachment": {
-				"type": "object",
-				"additionalProperties": false,
-				"properties": {
-					"filename": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 255,
-						"description": "Attachment filename. Control characters are rejected."
-					},
-					"content_type": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 255,
-						"description": "Optional MIME content type. Control characters are rejected."
-					},
-					"content_base64": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 44040192,
-						"description": "Base64-encoded attachment bytes."
-					}
-				},
-				"required": ["filename", "content_base64"]
-			},
-			"SendMailPayloadRef": {
-				"type": "object",
-				"additionalProperties": false,
-				"description": "A reference to an already-uploaded Primitive Payloads object, delivered as an attachment without inlining the bytes - the way to send an attachment larger than the inline cap. Upload the object via /v1/payloads (with a client-held CEK the server never sees), then reference it here.",
-				"properties": {
-					"root": {
-						"type": "string",
-						"pattern": "^[0-9a-f]{64}$",
-						"description": "The 64-char lowercase-hex Merkle root of a finalized payloads object."
-					},
-					"filename": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 255,
-						"description": "Attachment filename presented to the recipient."
-					},
-					"content_type": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 255,
-						"description": "Optional MIME content type."
-					},
-					"cek": {
-						"type": "string",
-						"pattern": "^[A-Za-z0-9_-]{1,128}$",
-						"description": "Base64url-encoded (unpadded) content-encryption key the recipient uses to decrypt. Travels with the email; the object store only ever holds ciphertext."
-					}
-				},
-				"required": [
-					"root",
-					"filename",
-					"cek"
-				]
-			},
-			"SendMailInput": {
-				"type": "object",
-				"additionalProperties": false,
-				"properties": {
-					"repeat": { "$ref": "#/components/schemas/RepeatInput" },
-					"from": {
-						"type": "string",
-						"minLength": 3,
-						"maxLength": 998,
-						"description": "RFC 5322 From header. The sender domain must be a verified outbound domain for your organization."
-					},
-					"to": {
-						"type": "string",
-						"minLength": 3,
-						"maxLength": 320,
-						"description": "Recipient address. Recipient eligibility depends on your account's outbound entitlements."
-					},
-					"cc": {
-						"description": "Carbon-copy recipients. Either a single address or an array of addresses. Each entry must be a single address; use the array form for multiple recipients. Cc recipients are visible to everyone who receives the message. The combined number of to, cc, and bcc recipients must not exceed 100.",
-						"oneOf": [{
-							"type": "string",
-							"minLength": 1
-						}, {
-							"type": "array",
-							"minItems": 1,
-							"maxItems": 100,
-							"items": {
-								"type": "string",
-								"minLength": 1
-							}
-						}]
-					},
-					"bcc": {
-						"description": "Blind-carbon-copy recipients. Either a single address or an array of addresses. Each entry must be a single address; use the array form for multiple recipients. Bcc recipients receive the message but are not disclosed to the other recipients: no Bcc header is sent. The combined number of to, cc, and bcc recipients must not exceed 100.",
-						"oneOf": [{
-							"type": "string",
-							"minLength": 1
-						}, {
-							"type": "array",
-							"minItems": 1,
-							"maxItems": 100,
-							"items": {
-								"type": "string",
-								"minLength": 1
-							}
-						}]
-					},
-					"subject": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 998,
-						"description": "Subject line for the outbound message"
-					},
-					"body_text": {
-						"type": "string",
-						"description": "Plain-text message body. At least one of body_text or body_html is required. The combined UTF-8 byte length of body_text and body_html must be at most 262144 bytes."
-					},
-					"body_html": {
-						"type": "string",
-						"description": "HTML message body. At least one of body_text or body_html is required. The combined UTF-8 byte length of body_text and body_html must be at most 262144 bytes."
-					},
-					"in_reply_to": {
-						"type": "string",
-						"minLength": 1,
-						"maxLength": 998,
-						"pattern": "^[^\\x00-\\x1F\\x7F]+$",
-						"description": "Message-ID of the direct parent email when sending a threaded reply."
-					},
-					"references": {
-						"type": "array",
-						"maxItems": 100,
-						"description": "Full ordered message-id chain for the thread.",
-						"items": {
-							"type": "string",
-							"minLength": 1,
-							"maxLength": 998,
-							"pattern": "^[^\\x00-\\x1F\\x7F]+$"
-						}
-					},
-					"attachments": {
-						"type": "array",
-						"maxItems": 100,
-						"description": "Inline attachments. Send requests with attachments to https://api.primitive.dev/v1/send-mail. Combined raw decoded attachment bytes must be at most 31457280.",
-						"items": { "$ref": "#/components/schemas/SendMailAttachment" }
-					},
-					"payload_attachments": {
-						"type": "array",
-						"maxItems": 1,
-						"description": "Deliver an already-uploaded Primitive Payloads object as an attachment by reference, without inlining the bytes - the way to send attachments larger than the inline cap. Upload the object via /v1/payloads (client-held CEK), then reference it here. v1 supports at most one.",
-						"items": { "$ref": "#/components/schemas/SendMailPayloadRef" }
-					},
-					"wait": {
-						"type": "boolean",
-						"description": "When true, wait for the first downstream SMTP delivery outcome before returning."
-					},
-					"wait_timeout_ms": {
-						"type": "integer",
-						"minimum": 1e3,
-						"maximum": 3e4,
-						"description": "Maximum time to wait for a delivery outcome when wait is true. Defaults to 30000."
-					},
-					"scheduled_at": {
-						"type": "string",
-						"format": "date-time",
-						"description": "Optional future execution time (ISO 8601). When set, the\nsend is recorded with status `scheduled` and executed at\nthe requested time instead of immediately. Must be in the\nfuture and at most 30 days out. Incompatible with `wait`\n(a scheduled send resolves after this request completes)\nand with `attachments` / `payload_attachments` (not yet\nsupported on scheduled sends). Reschedule via PATCH\n/sent-emails/{id}; cancel via /sent-emails/{id}/cancel.\n"
-					}
-				},
-				"required": [
-					"from",
-					"to",
-					"subject"
-				]
-			},
-			"EmailStatus": {
-				"type": "string",
-				"description": "Lifecycle status of an INBOUND email (a row in the `emails`\ntable). Distinct from `SentEmailStatus`, which describes\nthe OUTBOUND lifecycle (the `sent_emails` table) and uses\na different vocabulary because the lifecycles differ.\nPossible values:\n\n  - `pending`: the row was inserted at ingestion (mx_main)\n    and has not yet completed the spam / filter / auth\n    pipeline. Body and parsed fields are present; webhook\n    delivery is not yet scheduled. Most rows transition out\n    of `pending` within seconds.\n  - `accepted`: the inbound passed the policy gates and is\n    queued for webhook delivery. The `webhook_status` field\n    tracks the separate webhook-delivery lifecycle from\n    this point.\n  - `completed`: terminal success. Webhook delivery\n    attempted and acknowledged by every active endpoint, OR\n    no endpoints are configured, so the row is durably\n    archived.\n  - `rejected`: terminal failure at ingestion (spam, blocked\n    sender, filter rule, malformed). The body and metadata\n    are stored for auditing but no webhook fires and the\n    row is not repliable.\n\nSee also `webhook_status` (separate enum tracking the\nwebhook-delivery state machine) and `SentEmailStatus` (the\noutbound vocabulary).\n",
-				"enum": [
-					"pending",
-					"accepted",
-					"completed",
-					"rejected"
-				]
-			},
-			"EmailWebhookStatus": {
-				"type": ["string", "null"],
-				"description": "Webhook-delivery state for an inbound email. Tracks a\nSEPARATE lifecycle from the email's `status` field; the\nsame row carries both. Possible values:\n\n  - `pending`: ingestion is past `pending` (the email itself\n    is `accepted`) but the webhook fan-out has not yet\n    started for this row.\n  - `in_flight`: at least one delivery attempt is in flight.\n  - `fired`: terminal success. Every active endpoint\n    acknowledged the delivery (or accepted it after retries).\n  - `failed`: terminal partial-failure. At least one endpoint\n    exhausted its retry budget; some endpoints may still\n    have succeeded.\n  - `exhausted`: terminal failure. Every endpoint exhausted\n    its retry budget without success.\n  - `null`: no endpoints configured, so no webhook lifecycle\n    applies.\n\nNote that the value `pending` here does NOT mean the email\nis `pending`; it means the email is past ingestion but\nwebhook delivery has not yet begun. Two overlapping uses\nof the word `pending` for distinct lifecycle phases.\n",
-				"enum": [
-					"pending",
-					"in_flight",
-					"fired",
-					"failed",
-					"exhausted",
-					null
-				]
-			},
-			"SentEmailStatus": {
-				"type": "string",
-				"description": "Lifecycle status of a sent_emails row. Possible values:\n\n  - `queued`: pre-call INSERT; the outbound agent has not\n    yet replied.\n  - `submitted_to_agent`: agent accepted; `queue_id` is set.\n  - `agent_failed`: agent rejected; `error_code` and\n    `error_message` carry the reason.\n  - `gate_denied`: a recipient-scope gate denied the send;\n    the agent was never called. The `gates` array carries\n    the denial detail. /send-mail returns 403 in this case\n    so callers see the denial synchronously; /sent-emails\n    additionally records the row for historical lookup,\n    which is when this status appears in a listing.\n  - `unknown`: terminal indeterminate; the on-box log\n    poller couldn't classify the receiver's response.\n  - `delivered` / `bounced` / `deferred` / `wait_timeout`:\n    terminal delivery outcomes (see DeliveryStatus).\n  - `scheduled`: created with a future `scheduled_at` and\n    not yet executed; `scheduled_at` carries the pending\n    execution time. Reschedulable via PATCH\n    /sent-emails/{id} and cancelable via\n    /sent-emails/{id}/cancel while in this status.\n  - `canceled`: terminal; a scheduled send canceled before\n    execution. `canceled_at` carries the cancellation time\n    and nothing was dispatched.\n",
-				"enum": [
-					"queued",
-					"submitted_to_agent",
-					"agent_failed",
-					"gate_denied",
-					"unknown",
-					"delivered",
-					"bounced",
-					"deferred",
-					"wait_timeout",
-					"scheduled",
-					"canceled"
-				]
-			},
-			"DeliveryStatus": {
-				"type": "string",
-				"description": "Narrower enum covering only the four terminal delivery\noutcomes returned to a synchronous `wait: true` send.\n\nOn the SendMailResult shape, `delivery_status` is always\nequal to `status` whenever both are present (i.e. on\nterminal-state replays and live wait=true responses).\nThe two fields exist so callers that want to type-narrow\non \"this is a delivery outcome\" can pattern-match against\nthe four-value enum without handling the broader\nSentEmailStatus value set (which also covers `queued`,\n`submitted_to_agent`, `agent_failed`, `gate_denied`,\n`unknown`).\n\nOn async-mode and pre-terminal responses, `delivery_status`\nis absent and only `status` is populated. Use `status` if\nyou want a single field that's always present.\n",
-				"enum": [
-					"delivered",
-					"bounced",
-					"deferred",
-					"wait_timeout"
-				]
-			},
-			"SentEmailSummary": {
-				"type": "object",
-				"description": "List-row projection of a sent-email record. Drops\n`body_text` and `body_html` to keep paginated responses\nsmall; fetch /sent-emails/{id} for the full record with\nbodies.\n",
-				"properties": {
-					"id": {
-						"type": "string",
-						"format": "uuid"
-					},
 					"status": { "$ref": "#/components/schemas/SentEmailStatus" },
-					"status_changed_at": {
-						"type": "string",
-						"format": "date-time",
-						"description": "Timestamp of the most recent status transition.\nPolling clients should treat `status='queued'` AND\n`status_changed_at` older than 5 minutes as\n\"stuck-queued\" (the post-tx UPDATE failed and the\nactual delivery state is recoverable from on-box logs\nvia `queue_id` when populated, or `request_id`).\n"
-					},
-					"created_at": {
-						"type": "string",
-						"format": "date-time"
-					},
-					"updated_at": {
-						"type": "string",
-						"format": "date-time"
-					},
-					"client_idempotency_key": {
-						"type": ["string", "null"],
-						"description": "Effective idempotency key used for this send. If the\ncaller passed the `Idempotency-Key` header, this is\nthat value; otherwise it's a server-derived hash of\nthe canonical request payload.\n"
-					},
-					"content_hash": {
-						"type": "string",
-						"description": "Stable hash of the canonical send payload."
-					},
-					"from_header": {
-						"type": "string",
-						"description": "Raw `From:` header as sent on the wire, including any\ndisplay name (e.g. `\"Acme Support\" <agent@acme.test>`).\n"
-					},
-					"from_address": {
-						"type": "string",
-						"description": "Bare email address parsed from `from_header`."
-					},
-					"to_header": {
-						"type": "string",
-						"description": "Raw `To:` header as sent on the wire, including any\ndisplay name.\n"
-					},
-					"to_address": {
-						"type": "string",
-						"description": "Bare email address parsed from `to_header`."
-					},
-					"subject": { "type": "string" },
-					"body_size_bytes": {
-						"type": "integer",
-						"description": "Total UTF-8 byte length of `body_text` + `body_html`.\nSurfaced on the list endpoint so callers can see \"this\nrow has a 4MB body\" without fetching it.\n"
-					},
-					"content_discarded_at": {
-						"type": ["string", "null"],
-						"format": "date-time",
-						"description": "Timestamp at which the bodies were discarded by an\nentitlement-driven retention policy. Null when bodies\nare still present. The detail endpoint returns\nnull-valued `body_text`/`body_html` for discarded rows.\n"
-					},
-					"message_id": {
-						"type": ["string", "null"],
-						"description": "Wire-level Message-ID assigned to the outbound message\n(RFC 5322). Null on rows that never reached signing\n(queued, gate_denied, agent_failed before signing).\n"
-					},
-					"in_reply_to": {
-						"type": ["string", "null"],
-						"description": "Wire-level In-Reply-To header value, when this send\nwas a reply.\n"
-					},
-					"email_references": {
-						"type": ["string", "null"],
-						"description": "Wire-level References header value, when this send\nwas a reply.\n"
-					},
-					"in_reply_to_email_id": {
-						"type": ["string", "null"],
-						"format": "uuid",
-						"description": "Reference to the inbound `emails.id` that this send\nreplied to, when known. Populated when the caller used\n/emails/{id}/reply or when /send-mail's `in_reply_to`\nmatched a stored inbound message_id in the same org.\n"
-					},
-					"thread_id": {
-						"type": ["string", "null"],
-						"format": "uuid",
-						"description": "Conversation thread this send belongs to. A reply inherits\nthe thread of the inbound it answers; a fresh send starts a\nnew thread. Fetch `/threads/{thread_id}` for the full\nordered thread (inbound + outbound interleaved). NULL on\ngate-denied sends and on sends created before threading was\nenabled.\n"
-					},
-					"queue_id": {
-						"type": ["string", "null"],
-						"description": "Message identifier assigned by Primitive's outbound\nrelay once the agent accepts the message. Null on\nqueued, gate_denied, and agent_failed rows.\n"
-					},
-					"smtp_response_code": {
-						"type": ["integer", "null"],
-						"description": "Receiver's 3-digit SMTP code (e.g. 250, 550, 451).\nPopulated on terminal delivery statuses; may be null\non a deferred where the agent never got an SMTP-level\nresponse (TCP refused, DNS failed, TLS handshake\nfailed). `smtp_response_text` still carries Postfix's\ndescriptive text in those cases.\n"
-					},
-					"smtp_response_text": {
-						"type": ["string", "null"],
-						"description": "Free-form text portion of the receiver's SMTP\nresponse. The most useful debugging signal on a\n`bounced` or `deferred` row.\n"
-					},
-					"smtp_enhanced_status_code": {
-						"type": ["string", "null"],
-						"description": "RFC 3463 enhanced status code (e.g. `5.1.1` for \"Bad\ndestination mailbox address\"). Distinct from\n`smtp_response_code`: the basic 3-digit code is coarse\n(550 = \"permanent failure\"), the enhanced code is\nfiner-grained.\n"
-					},
-					"dkim_selector": {
-						"type": ["string", "null"],
-						"description": "DKIM selector used to sign the outbound message.\nPublic DNS data; useful for diagnosing why a downstream\nverifier rejected the signature.\n"
-					},
-					"dkim_domain": {
-						"type": ["string", "null"],
-						"description": "DKIM signing domain."
-					},
-					"error_code": {
-						"type": ["string", "null"],
-						"description": "Stable public error code on `agent_failed` rows. The\nagent's internal codes are remapped to a stable public\ntaxonomy (see `publicAgentError` in the server) so this\nfield is safe to branch on across agent versions.\n"
-					},
-					"error_message": {
-						"type": ["string", "null"],
-						"description": "Free-form error message accompanying `error_code`."
-					},
-					"gates": {
-						"type": ["array", "null"],
-						"items": { "$ref": "#/components/schemas/GateDenial" },
-						"description": "Gate-denial detail on `gate_denied` rows. Mirrors the\nsynchronous /send-mail 403 contract so a caller's\nGateDenial handler is the same across live denies and\nhistorical lookups. Null on every other status.\n"
-					},
-					"request_id": {
-						"type": ["string", "null"],
-						"description": "Server-issued request identifier from the original\n/send-mail call. Surfaced as the `X-Request-Id`\nresponse header on the live send and recorded here\nfor support escalation.\n"
-					},
-					"scheduled_at": {
-						"type": ["string", "null"],
-						"format": "date-time",
-						"description": "Requested execution time for a scheduled send. Kept\nafter execution as the historical schedule; null on\nordinary immediate sends.\n"
-					},
-					"canceled_at": {
-						"type": ["string", "null"],
-						"format": "date-time",
-						"description": "When a scheduled send was canceled. Null unless the row\nreached the `canceled` status.\n"
-					},
+					"presence_control": { "$ref": "#/components/schemas/PresenceControl" },
+					"repeat": {
+						"type": ["object", "null"],
+						"description": "Set when Primitive sent this message as part of a repeating send. Resolved from Primitive's own records, never from the message content. Null on every other message and on servers that predate repeating sends.",
+						"properties": {
+							"repeat_id": {
+								"type": "string",
+								"format": "uuid"
+							},
+							"sequence": {
+								"type": "integer",
+								"minimum": 1
+							}
+						},
+						"required": ["repeat_id", "sequence"]
+					},
+					"sender_member": {
+						"type": ["object", "null"],
+						"description": "Verified human authorship, projected only within the member organization. Historical attribution is not current sending or owner authority.",
+						"properties": {
+							"address": {
+								"type": "string",
+								"format": "email"
+							},
+							"user_id": { "type": "string" },
+							"name": { "type": ["string", "null"] }
+						},
+						"required": [
+							"address",
+							"user_id",
+							"name"
+						]
+					}
+				},
+				"required": [
+					"role",
+					"direction",
+					"id",
+					"text"
+				]
+			},
+			"SendMailAttachment": {
+				"type": "object",
+				"additionalProperties": false,
+				"properties": {
+					"filename": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 255,
+						"description": "Attachment filename. Control characters are rejected."
+					},
+					"content_type": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 255,
+						"description": "Optional MIME content type. Control characters are rejected."
+					},
+					"content_base64": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 44040192,
+						"description": "Base64-encoded attachment bytes."
+					}
+				},
+				"required": ["filename", "content_base64"]
+			},
+			"SendMailPayloadRef": {
+				"type": "object",
+				"additionalProperties": false,
+				"description": "A reference to an already-uploaded Primitive Payloads object, delivered as an attachment without inlining the bytes - the way to send an attachment larger than the inline cap. Upload the object via /v1/payloads (with a client-held CEK the server never sees), then reference it here.",
+				"properties": {
+					"root": {
+						"type": "string",
+						"pattern": "^[0-9a-f]{64}$",
+						"description": "The 64-char lowercase-hex Merkle root of a finalized payloads object."
+					},
+					"filename": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 255,
+						"description": "Attachment filename presented to the recipient."
+					},
+					"content_type": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 255,
+						"description": "Optional MIME content type."
+					},
+					"cek": {
+						"type": "string",
+						"pattern": "^[A-Za-z0-9_-]{1,128}$",
+						"description": "Base64url-encoded (unpadded) content-encryption key the recipient uses to decrypt. Travels with the email; the object store only ever holds ciphertext."
+					}
+				},
+				"required": [
+					"root",
+					"filename",
+					"cek"
+				]
+			},
+			"SendMailInput": {
+				"type": "object",
+				"additionalProperties": false,
+				"properties": {
+					"repeat": { "$ref": "#/components/schemas/RepeatInput" },
+					"from": {
+						"type": "string",
+						"minLength": 3,
+						"maxLength": 998,
+						"description": "RFC 5322 From header. The sender domain must be a verified outbound domain for your organization."
+					},
+					"to": {
+						"type": "string",
+						"minLength": 3,
+						"maxLength": 320,
+						"description": "Recipient address. Recipient eligibility depends on your account's outbound entitlements."
+					},
+					"cc": {
+						"description": "Carbon-copy recipients. Either a single address or an array of addresses. Each entry must be a single address; use the array form for multiple recipients. Cc recipients are visible to everyone who receives the message. The combined number of to, cc, and bcc recipients must not exceed 100.",
+						"oneOf": [{
+							"type": "string",
+							"minLength": 1
+						}, {
+							"type": "array",
+							"minItems": 1,
+							"maxItems": 100,
+							"items": {
+								"type": "string",
+								"minLength": 1
+							}
+						}]
+					},
+					"bcc": {
+						"description": "Blind-carbon-copy recipients. Either a single address or an array of addresses. Each entry must be a single address; use the array form for multiple recipients. Bcc recipients receive the message but are not disclosed to the other recipients: no Bcc header is sent. The combined number of to, cc, and bcc recipients must not exceed 100.",
+						"oneOf": [{
+							"type": "string",
+							"minLength": 1
+						}, {
+							"type": "array",
+							"minItems": 1,
+							"maxItems": 100,
+							"items": {
+								"type": "string",
+								"minLength": 1
+							}
+						}]
+					},
+					"subject": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 998,
+						"description": "Subject line for the outbound message"
+					},
+					"body_text": {
+						"type": "string",
+						"description": "Plain-text message body. At least one of body_text or body_html is required. The combined UTF-8 byte length of body_text and body_html must be at most 262144 bytes."
+					},
+					"body_html": {
+						"type": "string",
+						"description": "HTML message body. At least one of body_text or body_html is required. The combined UTF-8 byte length of body_text and body_html must be at most 262144 bytes."
+					},
+					"in_reply_to": {
+						"type": "string",
+						"minLength": 1,
+						"maxLength": 998,
+						"pattern": "^[^\\x00-\\x1F\\x7F]+$",
+						"description": "Message-ID of the direct parent email when sending a threaded reply."
+					},
+					"references": {
+						"type": "array",
+						"maxItems": 100,
+						"description": "Full ordered message-id chain for the thread.",
+						"items": {
+							"type": "string",
+							"minLength": 1,
+							"maxLength": 998,
+							"pattern": "^[^\\x00-\\x1F\\x7F]+$"
+						}
+					},
+					"attachments": {
+						"type": "array",
+						"maxItems": 100,
+						"description": "Inline attachments. Send requests with attachments to https://api.primitive.dev/v1/send-mail. Combined raw decoded attachment bytes must be at most 31457280.",
+						"items": { "$ref": "#/components/schemas/SendMailAttachment" }
+					},
+					"payload_attachments": {
+						"type": "array",
+						"maxItems": 1,
+						"description": "Deliver an already-uploaded Primitive Payloads object as an attachment by reference, without inlining the bytes - the way to send attachments larger than the inline cap. Upload the object via /v1/payloads (client-held CEK), then reference it here. v1 supports at most one.",
+						"items": { "$ref": "#/components/schemas/SendMailPayloadRef" }
+					},
+					"wait": {
+						"type": "boolean",
+						"description": "When true, wait for the first downstream SMTP delivery outcome before returning."
+					},
+					"wait_timeout_ms": {
+						"type": "integer",
+						"minimum": 1e3,
+						"maximum": 3e4,
+						"description": "Maximum time to wait for a delivery outcome when wait is true. Defaults to 30000."
+					},
+					"scheduled_at": {
+						"type": "string",
+						"format": "date-time",
+						"description": "Optional future execution time (ISO 8601). When set, the\nsend is recorded with status `scheduled` and executed at\nthe requested time instead of immediately. Must be in the\nfuture and at most 30 days out. Incompatible with `wait`\n(a scheduled send resolves after this request completes)\nand with `attachments` / `payload_attachments` (not yet\nsupported on scheduled sends). Reschedule via PATCH\n/sent-emails/{id}; cancel via /sent-emails/{id}/cancel.\n"
+					}
+				},
+				"required": [
+					"from",
+					"to",
+					"subject"
+				]
+			},
+			"EmailStatus": {
+				"type": "string",
+				"description": "Lifecycle status of an INBOUND email (a row in the `emails`\ntable). Distinct from `SentEmailStatus`, which describes\nthe OUTBOUND lifecycle (the `sent_emails` table) and uses\na different vocabulary because the lifecycles differ.\nPossible values:\n\n  - `pending`: the row was inserted at ingestion (mx_main)\n    and has not yet completed the spam / filter / auth\n    pipeline. Body and parsed fields are present; webhook\n    delivery is not yet scheduled. Most rows transition out\n    of `pending` within seconds.\n  - `accepted`: the inbound passed the policy gates and is\n    queued for webhook delivery. The `webhook_status` field\n    tracks the separate webhook-delivery lifecycle from\n    this point.\n  - `completed`: terminal success. Webhook delivery\n    attempted and acknowledged by every active endpoint, OR\n    no endpoints are configured, so the row is durably\n    archived.\n  - `rejected`: terminal failure at ingestion (spam, blocked\n    sender, filter rule, malformed). The body and metadata\n    are stored for auditing but no webhook fires and the\n    row is not repliable.\n\nSee also `webhook_status` (separate enum tracking the\nwebhook-delivery state machine) and `SentEmailStatus` (the\noutbound vocabulary).\n",
+				"enum": [
+					"pending",
+					"accepted",
+					"completed",
+					"rejected"
+				]
+			},
+			"EmailWebhookStatus": {
+				"type": ["string", "null"],
+				"description": "Webhook-delivery state for an inbound email. Tracks a\nSEPARATE lifecycle from the email's `status` field; the\nsame row carries both. Possible values:\n\n  - `pending`: ingestion is past `pending` (the email itself\n    is `accepted`) but the webhook fan-out has not yet\n    started for this row.\n  - `in_flight`: at least one delivery attempt is in flight.\n  - `fired`: terminal success. Every active endpoint\n    acknowledged the delivery (or accepted it after retries).\n  - `failed`: terminal partial-failure. At least one endpoint\n    exhausted its retry budget; some endpoints may still\n    have succeeded.\n  - `exhausted`: terminal failure. Every endpoint exhausted\n    its retry budget without success.\n  - `null`: no endpoints configured, so no webhook lifecycle\n    applies.\n\nNote that the value `pending` here does NOT mean the email\nis `pending`; it means the email is past ingestion but\nwebhook delivery has not yet begun. Two overlapping uses\nof the word `pending` for distinct lifecycle phases.\n",
+				"enum": [
+					"pending",
+					"in_flight",
+					"fired",
+					"failed",
+					"exhausted",
+					null
+				]
+			},
+			"SentEmailStatus": {
+				"type": "string",
+				"description": "Lifecycle status of a sent_emails row. Possible values:\n\n  - `queued`: pre-call INSERT; the outbound agent has not\n    yet replied.\n  - `submitted_to_agent`: agent accepted; `queue_id` is set.\n  - `agent_failed`: agent rejected; `error_code` and\n    `error_message` carry the reason.\n  - `gate_denied`: a recipient-scope gate denied the send;\n    the agent was never called. The `gates` array carries\n    the denial detail. /send-mail returns 403 in this case\n    so callers see the denial synchronously; /sent-emails\n    additionally records the row for historical lookup,\n    which is when this status appears in a listing.\n  - `unknown`: terminal indeterminate; the on-box log\n    poller couldn't classify the receiver's response.\n  - `delivered` / `bounced` / `deferred` / `wait_timeout`:\n    terminal delivery outcomes (see DeliveryStatus).\n  - `scheduled`: created with a future `scheduled_at` and\n    not yet executed; `scheduled_at` carries the pending\n    execution time. Reschedulable via PATCH\n    /sent-emails/{id} and cancelable via\n    /sent-emails/{id}/cancel while in this status.\n  - `canceled`: terminal; a scheduled send canceled before\n    execution. `canceled_at` carries the cancellation time\n    and nothing was dispatched.\n",
+				"enum": [
+					"queued",
+					"submitted_to_agent",
+					"agent_failed",
+					"gate_denied",
+					"unknown",
+					"delivered",
+					"bounced",
+					"deferred",
+					"wait_timeout",
+					"scheduled",
+					"canceled"
+				]
+			},
+			"DeliveryStatus": {
+				"type": "string",
+				"description": "Narrower enum covering only the four terminal delivery\noutcomes returned to a synchronous `wait: true` send.\n\nOn the SendMailResult shape, `delivery_status` is always\nequal to `status` whenever both are present (i.e. on\nterminal-state replays and live wait=true responses).\nThe two fields exist so callers that want to type-narrow\non \"this is a delivery outcome\" can pattern-match against\nthe four-value enum without handling the broader\nSentEmailStatus value set (which also covers `queued`,\n`submitted_to_agent`, `agent_failed`, `gate_denied`,\n`unknown`).\n\nOn async-mode and pre-terminal responses, `delivery_status`\nis absent and only `status` is populated. Use `status` if\nyou want a single field that's always present.\n",
+				"enum": [
+					"delivered",
+					"bounced",
+					"deferred",
+					"wait_timeout"
+				]
+			},
+			"SentEmailSummary": {
+				"type": "object",
+				"description": "List-row projection of a sent-email record. Drops\n`body_text` and `body_html` to keep paginated responses\nsmall; fetch /sent-emails/{id} for the full record with\nbodies.\n",
+				"properties": {
+					"id": {
+						"type": "string",
+						"format": "uuid"
+					},
+					"status": { "$ref": "#/components/schemas/SentEmailStatus" },
+					"status_changed_at": {
+						"type": "string",
+						"format": "date-time",
+						"description": "Timestamp of the most recent status transition.\nPolling clients should treat `status='queued'` AND\n`status_changed_at` older than 5 minutes as\n\"stuck-queued\" (the post-tx UPDATE failed and the\nactual delivery state is recoverable from on-box logs\nvia `queue_id` when populated, or `request_id`).\n"
+					},
+					"created_at": {
+						"type": "string",
+						"format": "date-time"
+					},
+					"updated_at": {
+						"type": "string",
+						"format": "date-time"
+					},
+					"client_idempotency_key": {
+						"type": ["string", "null"],
+						"description": "Effective idempotency key used for this send. If the\ncaller passed the `Idempotency-Key` header, this is\nthat value; otherwise it's a server-derived hash of\nthe canonical request payload.\n"
+					},
+					"content_hash": {
+						"type": "string",
+						"description": "Stable hash of the canonical send payload."
+					},
+					"from_header": {
+						"type": "string",
+						"description": "Raw `From:` header as sent on the wire, including any\ndisplay name (e.g. `\"Acme Support\" <agent@acme.test>`).\n"
+					},
+					"from_address": {
+						"type": "string",
+						"description": "Bare email address parsed from `from_header`."
+					},
+					"to_header": {
+						"type": "string",
+						"description": "Raw `To:` header as sent on the wire, including any\ndisplay name.\n"
+					},
+					"to_address": {
+						"type": "string",
+						"description": "Bare email address parsed from `to_header`."
+					},
+					"subject": { "type": "string" },
+					"body_size_bytes": {
+						"type": "integer",
+						"description": "Total UTF-8 byte length of `body_text` + `body_html`.\nSurfaced on the list endpoint so callers can see \"this\nrow has a 4MB body\" without fetching it.\n"
+					},
+					"content_discarded_at": {
+						"type": ["string", "null"],
+						"format": "date-time",
+						"description": "Timestamp at which the bodies were discarded by an\nentitlement-driven retention policy. Null when bodies\nare still present. The detail endpoint returns\nnull-valued `body_text`/`body_html` for discarded rows.\n"
+					},
+					"message_id": {
+						"type": ["string", "null"],
+						"description": "Wire-level Message-ID assigned to the outbound message\n(RFC 5322). Null on rows that never reached signing\n(queued, gate_denied, agent_failed before signing).\n"
+					},
+					"in_reply_to": {
+						"type": ["string", "null"],
+						"description": "Wire-level In-Reply-To header value, when this send\nwas a reply.\n"
+					},
+					"email_references": {
+						"type": ["string", "null"],
+						"description": "Wire-level References header value, when this send\nwas a reply.\n"
+					},
+					"in_reply_to_email_id": {
+						"type": ["string", "null"],
+						"format": "uuid",
+						"description": "Reference to the inbound `emails.id` that this send\nreplied to, when known. Populated when the caller used\n/emails/{id}/reply or when /send-mail's `in_reply_to`\nmatched a stored inbound message_id in the same org.\n"
+					},
+					"thread_id": {
+						"type": ["string", "null"],
+						"format": "uuid",
+						"description": "Conversation thread this send belongs to. A reply inherits\nthe thread of the inbound it answers; a fresh send starts a\nnew thread. Fetch `/threads/{thread_id}` for the full\nordered thread (inbound + outbound interleaved). NULL on\ngate-denied sends and on sends created before threading was\nenabled.\n"
+					},
+					"queue_id": {
+						"type": ["string", "null"],
+						"description": "Message identifier assigned by Primitive's outbound\nrelay once the agent accepts the message. Null on\nqueued, gate_denied, and agent_failed rows.\n"
+					},
+					"smtp_response_code": {
+						"type": ["integer", "null"],
+						"description": "Receiver's 3-digit SMTP code (e.g. 250, 550, 451).\nPopulated on terminal delivery statuses; may be null\non a deferred where the agent never got an SMTP-level\nresponse (TCP refused, DNS failed, TLS handshake\nfailed). `smtp_response_text` still carries Postfix's\ndescriptive text in those cases.\n"
+					},
+					"smtp_response_text": {
+						"type": ["string", "null"],
+						"description": "Free-form text portion of the receiver's SMTP\nresponse. The most useful debugging signal on a\n`bounced` or `deferred` row.\n"
+					},
+					"smtp_enhanced_status_code": {
+						"type": ["string", "null"],
+						"description": "RFC 3463 enhanced status code (e.g. `5.1.1` for \"Bad\ndestination mailbox address\"). Distinct from\n`smtp_response_code`: the basic 3-digit code is coarse\n(550 = \"permanent failure\"), the enhanced code is\nfiner-grained.\n"
+					},
+					"dkim_selector": {
+						"type": ["string", "null"],
+						"description": "DKIM selector used to sign the outbound message.\nPublic DNS data; useful for diagnosing why a downstream\nverifier rejected the signature.\n"
+					},
+					"dkim_domain": {
+						"type": ["string", "null"],
+						"description": "DKIM signing domain."
+					},
+					"error_code": {
+						"type": ["string", "null"],
+						"description": "Stable public error code on `agent_failed` rows. The\nagent's internal codes are remapped to a stable public\ntaxonomy (see `publicAgentError` in the server) so this\nfield is safe to branch on across agent versions.\n"
+					},
+					"error_message": {
+						"type": ["string", "null"],
+						"description": "Free-form error message accompanying `error_code`."
+					},
+					"gates": {
+						"type": ["array", "null"],
+						"items": { "$ref": "#/components/schemas/GateDenial" },
+						"description": "Gate-denial detail on `gate_denied` rows. Mirrors the\nsynchronous /send-mail 403 contract so a caller's\nGateDenial handler is the same across live denies and\nhistorical lookups. Null on every other status.\n"
+					},
+					"request_id": {
+						"type": ["string", "null"],
+						"description": "Server-issued request identifier from the original\n/send-mail call. Surfaced as the `X-Request-Id`\nresponse header on the live send and recorded here\nfor support escalation.\n"
+					},
+					"scheduled_at": {
+						"type": ["string", "null"],
+						"format": "date-time",
+						"description": "Requested execution time for a scheduled send. Kept\nafter execution as the historical schedule; null on\nordinary immediate sends.\n"
+					},
+					"canceled_at": {
+						"type": ["string", "null"],
+						"format": "date-time",
+						"description": "When a scheduled send was canceled. Null unless the row\nreached the `canceled` status.\n"
+					},
 					"presence_control": { "$ref": "#/components/schemas/PresenceControl" },
 					"repeat": {
 						"type": ["object", "null"],
@@ -22645,7 +22657,7 @@ const operationManifest = [
 		"binaryResponse": false,
 		"bodyRequired": false,
 		"command": "get-conversation",
-		"description": "Returns the full conversation the given inbound email belongs\nto, as ordered, ready-to-prompt turns WITH bodies. It resolves\nthe thread from the email and returns every message oldest-first,\nso an agent that received an email can pass `messages` straight\nto a chat model in one call instead of walking `/threads/{id}`\nplus `/emails/{id}` and `/sent-emails/{id}` per message.\n\nEach message carries a `direction` (`inbound` | `outbound`) and a\nderived `role`: `inbound` -> `user`, `outbound` -> `assistant`\n(your own prior replies). The role mapping assumes the caller\nowns the outbound side, which is the agent-reply case this exists\nfor. If the email has no thread yet (a brand-new message), the\nconversation is just that one message as a single user turn.\n\nThe message list is capped; check `truncated` to detect when\nolder messages were omitted. Consecutive same-role turns are not\nmerged here; that normalization is model-specific and left to the\ncaller.\n",
+		"description": "Returns the full conversation the given inbound email belongs\nto, as ordered, ready-to-prompt turns WITH bodies. It resolves\nthe thread from the email and returns every message oldest-first,\nso an agent that received an email can pass `messages` straight\nto a chat model in one call instead of walking `/threads/{id}`\nplus `/emails/{id}` and `/sent-emails/{id}` per message.\n\nEach message carries a `direction` (`inbound` | `outbound`) and a\nderived `role`: `inbound` -> `user`, `outbound` -> `assistant`\n(your own prior replies). The role mapping assumes the caller\nowns the outbound side, which is the agent-reply case this exists\nfor. If the email has no thread yet (a brand-new message), the\nconversation is just that one message as a single user turn.\n\nThe message list is capped; check `truncated` to detect when\nolder messages were omitted. Consecutive same-role turns are not\nmerged here; that normalization is model-specific and left to the\ncaller.\n\nPass `since` for an incremental read. `since=start` returns the\nfull conversation plus a `cursor`. Sending that `cursor` back as\n`since` returns only the messages created or changed after it,\noldest first, with the same per-message shape, and a new\n`cursor`. Without `since` the response carries no `cursor` and\nno per-message `status`.\n",
 		"hasJsonBody": false,
 		"method": "GET",
 		"operationId": "getConversation",
@@ -22657,7 +22669,13 @@ const operationManifest = [
 			"required": true,
 			"type": "string"
 		}],
-		"queryParams": [],
+		"queryParams": [{
+			"description": "Incremental read position. Either the literal `start` or a\n`cursor` returned by a previous read of this endpoint. Any\nother value returns 400 `validation_error`.\n\nWith `start`, the response holds every message the read\nwithout `since` would return, plus `cursor`. With a cursor,\n`messages` holds only the messages created or changed after\nit, oldest first. A change includes an inbound message\nbecoming visible or its body being filled, withheld or\ndiscarded, and a delivery status change on an outbound\nmessage. `thread_id`, `subject`, `message_count` and\n`truncated` always describe the whole conversation, not the\nreturned messages.\n\nThe cursor is an opaque string. Send it back verbatim and do\nnot parse it or build one; its format can change. A message\ncan be returned again by a later read (for example while\nolder writes are still committing), so upsert messages by\n`id`. Deleted messages are not reported; a periodic\n`since=start` read (or a read without `since`) reconciles.\n",
+			"enum": null,
+			"name": "since",
+			"required": false,
+			"type": "string"
+		}],
 		"requestSchema": null,
 		"responseSchema": {
 			"type": "object",
@@ -22684,7 +22702,7 @@ const operationManifest = [
 					"type": "array",
 					"items": {
 						"type": "object",
-						"description": "One message in the conversation, with its body and a chat role.",
+						"description": "One message in the conversation, with its body and a chat role.\n`status` is the delivery status of an outbound message, as on\n`/sent-emails/{id}`, and is present only on a `since` read and\nonly on outbound messages.\n",
 						"properties": {
 							"role": {
 								"type": "string",
@@ -22713,6 +22731,23 @@ const operationManifest = [
 								"format": "date-time",
 								"description": "received_at for inbound, created_at for outbound."
 							},
+							"status": {
+								"type": "string",
+								"description": "Lifecycle status of a sent_emails row. Possible values:\n\n  - `queued`: pre-call INSERT; the outbound agent has not\n    yet replied.\n  - `submitted_to_agent`: agent accepted; `queue_id` is set.\n  - `agent_failed`: agent rejected; `error_code` and\n    `error_message` carry the reason.\n  - `gate_denied`: a recipient-scope gate denied the send;\n    the agent was never called. The `gates` array carries\n    the denial detail. /send-mail returns 403 in this case\n    so callers see the denial synchronously; /sent-emails\n    additionally records the row for historical lookup,\n    which is when this status appears in a listing.\n  - `unknown`: terminal indeterminate; the on-box log\n    poller couldn't classify the receiver's response.\n  - `delivered` / `bounced` / `deferred` / `wait_timeout`:\n    terminal delivery outcomes (see DeliveryStatus).\n  - `scheduled`: created with a future `scheduled_at` and\n    not yet executed; `scheduled_at` carries the pending\n    execution time. Reschedulable via PATCH\n    /sent-emails/{id} and cancelable via\n    /sent-emails/{id}/cancel while in this status.\n  - `canceled`: terminal; a scheduled send canceled before\n    execution. `canceled_at` carries the cancellation time\n    and nothing was dispatched.\n",
+								"enum": [
+									"queued",
+									"submitted_to_agent",
+									"agent_failed",
+									"gate_denied",
+									"unknown",
+									"delivered",
+									"bounced",
+									"deferred",
+									"wait_timeout",
+									"scheduled",
+									"canceled"
+								]
+							},
 							"presence_control": { "anyOf": [{
 								"type": "object",
 								"properties": {
@@ -22773,6 +22808,10 @@ const operationManifest = [
 							"text"
 						]
 					}
+				},
+				"cursor": {
+					"type": "string",
+					"description": "Present only on a `since` read: the position to send as\n`since` on the next read. An opaque string: send it back\nverbatim and do not parse it or build one.\n"
 				}
 			},
 			"required": [
@@ -34983,440 +35022,1355 @@ function isMemoryJsonValue(value, seen = /* @__PURE__ */ new Set()) {
 	}
 }
 //#endregion
-//#region src/oclif/claude-wake-install.ts
-const HOOK_MARKER = "primitive-agent-wake-v1";
-const WAKE_EVENTS = ["Stop", "SessionStart"];
-const PENDING_MARKER$1 = "primitive-pending-mail-v1";
-const PENDING_EVENT = "PostToolUse";
-const LOCK_WAIT$1 = new Int32Array(new SharedArrayBuffer(4));
-function record$4(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function claudeWakeHookStatus(options) {
-	const unavailable = {
-		installed: false,
-		lastFiredAt: null,
-		liveness: "unknown"
-	};
-	try {
-		const configDir = resolve(options.configDir);
-		const profileName = agentProfileName(options.profileName);
-		const agentAddress = mailAddress(options.agentAddress);
-		if (!SESSION_UUID$1.test(options.sessionId)) return unavailable;
-		const sessionId = options.sessionId.toLowerCase();
-		const settings = readMailJson(join(resolve(options.env?.CLAUDE_CONFIG_DIR || join(homedir(), ".claude")), "settings.json"));
-		if (!record$4(settings) || !record$4(settings.hooks)) return unavailable;
-		const hooks = settings.hooks;
-		const owns = (event, script, marker) => {
-			const entries = hooks[event];
-			return Array.isArray(entries) && entries.some((entry) => record$4(entry) && Array.isArray(entry.hooks) && entry.hooks.some((candidate) => {
-				if (!record$4(candidate) || !Array.isArray(candidate.args)) return false;
-				const args = candidate.args;
-				const offset = 2;
-				return candidate.type === "command" && candidate.command === process.execPath && args.length === 7 && typeof args[0] === "string" && basename(args[0]) === script && args[offset] === configDir && args[offset + 1] === profileName && args[offset + 2] === agentAddress && args[offset + 3] === sessionId && args[offset + 4] === marker;
-			}));
-		};
-		const installed = owns("Stop", "claude-wake.mjs", HOOK_MARKER) && owns("SessionStart", "claude-wake.mjs", HOOK_MARKER) && owns(PENDING_EVENT, "claude-pending-mail.mjs", PENDING_MARKER$1);
-		let lastFiredAt = null;
-		const fired = readMailJson(join(agentProfileDirectory(configDir, profileName), `pending-mail-${sessionId}.fired.json`));
-		if (record$4(fired) && fired.version === 1 && typeof fired.at === "string" && Number.isFinite(Date.parse(fired.at))) lastFiredAt = fired.at;
-		return {
-			installed,
-			lastFiredAt,
-			liveness: "unknown"
-		};
-	} catch {
-		return unavailable;
-	}
-}
-function editClaudeSettings(claudeDir, edit) {
-	mkdirSync(claudeDir, {
-		recursive: true,
-		mode: 448
-	});
-	let release;
-	for (let attempt = 0; attempt < 40; attempt++) try {
-		release = acquireListenLock(claudeDir, "primitive-claude-settings");
-		break;
-	} catch {
-		Atomics.wait(LOCK_WAIT$1, 0, 0, 25);
+//#region src/oclif/agent-mail-check.ts
+/**
+* One check for mail that arrived since this profile's previous check. It is
+* the receiver for runtimes that nothing can wake (poll receiving): the agent
+* runs it at the start of each turn and after it sends.
+*
+* It tails `GET /emails?since=<cursor>`, which returns mail newer than the
+* cursor oldest first, without mail marked fyi (acknowledgements) or in
+* threads this address muted. The first check starts before the address's
+* first email. The cursor is saved privately per profile, only after the
+* result was handed to `emit`, so a failed or interrupted check repeats mail
+* rather than losing it. Reads also show this address's receiver as live.
+*/
+const CURSOR_FILE = "mail-check.json";
+var MailCheckApiError = class extends Error {
+	constructor(payload) {
+		super("The mail check request failed.");
+		this.payload = payload;
 	}
-	if (!release) return false;
+};
+function readCursor(path) {
 	try {
-		const settingsPath = join(claudeDir, "settings.json");
-		for (let attempt = 0; attempt < 3; attempt++) {
-			let original = null;
-			let settings = {};
-			if (existsSync(settingsPath)) {
-				const stat = lstatSync(settingsPath);
-				if (!stat.isFile() || stat.size > 1048576) return false;
-				original = readFileSync(settingsPath, "utf8");
-				const parsed = JSON.parse(original);
-				if (!record$4(parsed)) return false;
-				settings = parsed;
-			}
-			const next = edit(settings);
-			if (next === null) return true;
-			const temporary = join(claudeDir, `.settings.json.${randomUUID()}.tmp`);
-			const fd = openSync(temporary, "wx", 384);
-			try {
-				writeFileSync(fd, `${JSON.stringify(next, null, 2)}\n`, "utf8");
-			} finally {
-				closeSync(fd);
-			}
-			try {
-				if ((existsSync(settingsPath) ? readFileSync(settingsPath, "utf8") : null) !== original) continue;
-				renameSync(temporary, settingsPath);
-				return true;
-			} finally {
-				if (existsSync(temporary)) unlinkSync(temporary);
-			}
+		const saved = readMailJson(path);
+		if (saved && typeof saved === "object" && !Array.isArray(saved) && saved.version === 1) {
+			const cursor = saved.cursor;
+			if (typeof cursor === "string" && cursor.length > 0) return cursor;
 		}
-		return false;
-	} finally {
-		release();
-	}
+	} catch {}
+	return null;
 }
-/** Add exact-session fail-open receiving hooks while preserving unrelated settings. */
-function installClaudeWakeHook(options) {
-	try {
-		const cliPath = realpathSync(options.cliPath);
-		const wrapperPath = realpathSync(join(dirname(cliPath), "claude-wake.mjs"));
-		const pendingPath = realpathSync(join(dirname(cliPath), "claude-pending-mail.mjs"));
-		const configDir = resolve(options.configDir);
-		const profileName = agentProfileName(options.profileName);
-		const agentAddress = mailAddress(options.agentAddress);
-		if (!SESSION_UUID$1.test(options.sessionId)) return "unavailable";
-		const sessionId = options.sessionId.toLowerCase();
-		return editClaudeSettings(resolve((options.env ?? process.env).CLAUDE_CONFIG_DIR || join(homedir(), ".claude")), (settings) => {
-			const hooks = settings.hooks ?? {};
-			if (!record$4(hooks)) throw new Error("Invalid hook settings");
-			for (const event of WAKE_EVENTS) if (!Array.isArray(hooks[event] ?? [])) throw new Error(`Invalid ${event} hooks`);
-			if (!Array.isArray(hooks[PENDING_EVENT] ?? [])) throw new Error(`Invalid ${PENDING_EVENT} hooks`);
-			const hook = {
-				type: "command",
-				command: process.execPath,
-				args: [
-					wrapperPath,
-					cliPath,
-					configDir,
-					profileName,
-					agentAddress,
-					sessionId,
-					HOOK_MARKER
-				],
-				asyncRewake: true,
-				timeout: 604800
-			};
-			const pendingHook = {
-				type: "command",
-				command: process.execPath,
-				args: [
-					pendingPath,
-					cliPath,
-					configDir,
-					profileName,
-					agentAddress,
-					sessionId,
-					PENDING_MARKER$1
-				],
-				timeout: 10
-			};
-			const isOwnPendingHook = (candidate) => record$4(candidate) && candidate.type === "command" && Array.isArray(candidate.args) && candidate.args.length === 7 && typeof candidate.args[0] === "string" && basename(candidate.args[0]) === "claude-pending-mail.mjs" && candidate.args[2] === configDir && candidate.args[5] === sessionId && candidate.args[6] === PENDING_MARKER$1;
-			const isOwnHook = (candidate) => {
-				if (!record$4(candidate) || !Array.isArray(candidate.args)) return false;
-				if (typeof candidate.args[0] !== "string" || basename(candidate.args[0]) !== "claude-wake.mjs" || candidate.args[2] !== configDir) return false;
-				if (candidate.args.length === 7 && candidate.args[5] === sessionId && candidate.args[6] === HOOK_MARKER) return true;
-				if (candidate.args.length !== 6 || candidate.args[5] !== HOOK_MARKER) return false;
-				try {
-					const state = readMailJson(join(agentProfileDirectory(configDir, agentProfileName(String(candidate.args[3]))), "setup.json"));
-					return record$4(state) && state.session === sessionId;
-				} catch {
-					return false;
-				}
-			};
-			const nextHooks = { ...hooks };
-			for (const event of WAKE_EVENTS) nextHooks[event] = [...(hooks[event] ?? []).flatMap((entry) => {
-				if (!record$4(entry) || !Array.isArray(entry.hooks)) return [entry];
-				const siblings = entry.hooks.filter((candidate) => !isOwnHook(candidate));
-				if (siblings.length === entry.hooks.length) return [entry];
-				return siblings.length ? [{
-					...entry,
-					hooks: siblings
-				}] : [];
-			}), event === "SessionStart" ? {
-				matcher: "resume",
-				hooks: [hook]
-			} : { hooks: [hook] }];
-			nextHooks[PENDING_EVENT] = [...(hooks[PENDING_EVENT] ?? []).flatMap((entry) => {
-				if (!record$4(entry) || !Array.isArray(entry.hooks)) return [entry];
-				const siblings = entry.hooks.filter((candidate) => !isOwnPendingHook(candidate));
-				if (siblings.length === entry.hooks.length) return [entry];
-				return siblings.length ? [{
-					...entry,
-					hooks: siblings
-				}] : [];
-			}), { hooks: [pendingHook] }];
-			return {
-				...settings,
-				hooks: nextHooks
-			};
-		}) ? "installed_unverified" : "unavailable";
-	} catch {
-		return "unavailable";
-	}
+/** Setup challenges and presence probes come from the control address. */
+function isControlMail(email, identity) {
+	return email.presence_control !== void 0 || email.sender.trim().toLowerCase() === identity.ownerAddress.trim().toLowerCase();
 }
-/** Remove only this profile's exact-session hooks after disconnection. */
-function uninstallClaudeWakeHook(options) {
+async function checkAgentMail(options) {
+	const { identity } = options;
+	const directory = agentProfileDirectory(options.configDir, identity.profileName);
+	privateMailDirectory(directory, true);
+	const release = acquireListenLock(directory, "mail-check");
 	try {
-		const configDir = resolve(options.configDir);
-		const profileName = agentProfileName(options.profileName);
-		const agentAddress = mailAddress(options.agentAddress);
-		if (!SESSION_UUID$1.test(options.sessionId)) return false;
-		const sessionId = options.sessionId.toLowerCase();
-		const claudeDir = resolve((options.env ?? process.env).CLAUDE_CONFIG_DIR || join(homedir(), ".claude"));
-		if (!existsSync(join(claudeDir, "settings.json"))) return true;
-		return editClaudeSettings(claudeDir, (settings) => {
-			const hooks = settings.hooks ?? {};
-			if (!record$4(hooks)) throw new Error("Invalid hook settings");
-			for (const event of WAKE_EVENTS) if (!Array.isArray(hooks[event] ?? [])) throw new Error(`Invalid ${event} hooks`);
-			if (!Array.isArray(hooks[PENDING_EVENT] ?? [])) throw new Error(`Invalid ${PENDING_EVENT} hooks`);
-			const legacySessionMatches = () => {
-				try {
-					const setup = readMailJson(join(agentProfileDirectory(configDir, profileName), "setup.json"));
-					return record$4(setup) && setup.session === sessionId;
-				} catch {
-					return false;
-				}
-			};
-			const isOwnHook = (candidate) => {
-				if (!record$4(candidate) || !Array.isArray(candidate.args)) return false;
-				const args = candidate.args;
-				return candidate.type === "command" && typeof candidate.command === "string" && candidate.asyncRewake === true && typeof args[0] === "string" && basename(args[0]) === "claude-wake.mjs" && typeof args[1] === "string" && args[2] === configDir && args[3] === profileName && args[4] === agentAddress && (args.length === 7 && args[5] === sessionId && args[6] === HOOK_MARKER || args.length === 6 && args[5] === HOOK_MARKER && legacySessionMatches());
-			};
-			const isOwnPendingHook = (candidate) => {
-				if (!record$4(candidate) || !Array.isArray(candidate.args)) return false;
-				const args = candidate.args;
-				return candidate.type === "command" && typeof candidate.command === "string" && typeof args[0] === "string" && basename(args[0]) === "claude-pending-mail.mjs" && args[2] === configDir && args[3] === profileName && args[4] === agentAddress && args[5] === sessionId && args[6] === PENDING_MARKER$1 && args.length === 7;
+		const path = join(directory, CURSOR_FILE);
+		const saved = readCursor(path);
+		let cursor = saved;
+		const emails = [];
+		let controlSkipped = 0;
+		let more = false;
+		const maxPages = options.maxPages ?? 5;
+		for (let page = 0; page < maxPages; page++) {
+			const query = {
+				since: cursor ?? "start",
+				limit: 100,
+				exclude_fyi: "true",
+				exclude_muted: "true"
 			};
-			let removed = false;
-			const nextHooks = { ...hooks };
-			for (const event of WAKE_EVENTS) nextHooks[event] = (hooks[event] ?? []).flatMap((entry) => {
-				if (!record$4(entry) || !Array.isArray(entry.hooks)) return [entry];
-				const siblings = entry.hooks.filter((candidate) => !isOwnHook(candidate));
-				if (siblings.length === entry.hooks.length) return [entry];
-				removed = true;
-				return siblings.length ? [{
-					...entry,
-					hooks: siblings
-				}] : [];
+			const result = await listEmails({
+				client: options.client.client,
+				query,
+				responseStyle: "fields"
 			});
-			nextHooks[PENDING_EVENT] = (hooks[PENDING_EVENT] ?? []).flatMap((entry) => {
-				if (!record$4(entry) || !Array.isArray(entry.hooks)) return [entry];
-				const siblings = entry.hooks.filter((candidate) => !isOwnPendingHook(candidate));
-				if (siblings.length === entry.hooks.length) return [entry];
-				removed = true;
-				return siblings.length ? [{
-					...entry,
-					hooks: siblings
-				}] : [];
+			if (result.error || !result.data) throw new MailCheckApiError(result.error);
+			const rows = result.data.data ?? [];
+			for (const row of rows) if (isControlMail(row, identity)) controlSkipped++;
+			else emails.push({
+				id: row.id,
+				received_at: row.received_at,
+				sender: row.sender,
+				thread_id: row.thread_id ?? null
 			});
-			return removed ? {
-				...settings,
-				hooks: nextHooks
-			} : null;
+			const next = result.data.meta?.cursor ?? null;
+			if (rows.length === 0 || !next) break;
+			cursor = next;
+			more = page === maxPages - 1;
+		}
+		const output = {
+			outcome: emails.length > 0 ? "mail" : "empty",
+			emails,
+			more,
+			control_skipped: controlSkipped,
+			read_command: `PRIMITIVE_AGENT_PROFILE=${identity.profileName} ${options.invocation ?? "primitive"} emails get --id <id> --brief`
+		};
+		options.emit(output);
+		if (cursor && cursor !== saved) writeMailJson(path, {
+			version: 1,
+			cursor
 		});
-	} catch {
-		return false;
+		return output;
+	} finally {
+		release();
 	}
 }
 //#endregion
-//#region src/oclif/agent-connect.ts
-const MAX_INVITATION_BYTES = 4096;
-const MAX_RESPONSE_BYTES$2 = 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.";
-/** Offline metadata only; a saved profile is not proof of current API or listener readiness. */
-function agentConnectionStatus(configDir, profileName) {
-	agentProfileName(profileName);
-	const profile = loadConnectedAgentProfile(configDir, profileName);
-	const setup = profile ? readMailJson(join(agentProfileDirectory(configDir, profileName), "setup.json")) : null;
-	const saved = setup && typeof setup === "object" && !Array.isArray(setup) ? setup : null;
-	const session = saved && typeof saved.session === "string" && SESSION_UUID$1.test(saved.session) ? saved.session : null;
-	const mode = saved && saved.receiverMode === "external" ? "external" : "native";
-	const receiving = profile && session && mode === "native" ? (() => {
-		const scope = notificationScope(profile.api_base_url, profile.api_key);
-		const listener = backgroundListenStatus({
-			configDir,
-			scope,
-			threadId: session
-		});
-		const mailOwner = readSharedMailOwner({ directory: join(configDir, "shared-mail", createHash("sha256").update(scope).digest("hex")) });
+//#region src/oclif/commands/agent-check-mail.ts
+/** npx runs the CLI from its cache; print follow-up commands the same way. */
+function invocation$2(entry) {
+	return entry && /[\\/]_npx[\\/]/.test(entry) ? "npx -y primitive@latest" : "primitive";
+}
+var AgentCheckMailCommand = class AgentCheckMailCommand extends Command {
+	static summary = "Check a connected agent's mail since its last check";
+	static description = `Print the mail that reached the selected connected agent profile since its previous check, oldest first, once, without waiting. This is how an agent connected with poll receiving (no local session ID or hooks, so nothing can wake it) receives mail: run it at the start of each turn and after sending, then read each email with \`primitive emails get --id <id> --brief\`.
+
+Acknowledgements marked fyi and mail in muted threads are left out. Setup and presence mail from the connection's control address is handled by the CLI and only counted. The position is saved privately with the profile and moves forward only after mail was read, so mail is reported again rather than lost when a check fails or is interrupted; deduplicate by email ID. The first check starts before the address's first email. \`more: true\` means more new mail remains: handle these and check again.
+
+Requires a connected agent profile selected with ${AGENT_PROFILE_ENV}. Output is one JSON document: \`outcome\` ("mail" | "empty"), \`emails\` (id, received_at, sender, thread_id; never subject or body), \`more\`, \`control_skipped\` and \`read_command\`.`;
+	static examples = [`${AGENT_PROFILE_ENV}=connection-0123456789ab <%= config.bin %> agent check-mail --json`];
+	static flags = { json: Flags.boolean({ description: "Print JSON (already the default)" }) };
+	async run() {
+		await this.parse(AgentCheckMailCommand);
+		if (!process.env["PRIMITIVE_AGENT_PROFILE"]?.trim()) this.error(`Select a connected agent profile with ${AGENT_PROFILE_ENV}=<profile>. The profile is printed by agent connect.`, { exit: 1 });
+		const { apiClient, auth, baseUrlOverridden } = await createAuthenticatedCliApiClient({ configDir: this.config.configDir });
+		if (!auth.connectedAgent) this.error(`Select a connected agent profile with ${AGENT_PROFILE_ENV}=<profile>.`, { exit: 1 });
+		try {
+			await checkAgentMail({
+				configDir: this.config.configDir,
+				identity: auth.connectedAgent,
+				client: apiClient,
+				invocation: invocation$2(process.argv[1]),
+				emit: (result) => this.log(JSON.stringify(result))
+			});
+		} catch (error) {
+			if (!(error instanceof MailCheckApiError)) throw error;
+			const payload = extractErrorPayload(error.payload);
+			writeErrorWithHints(payload);
+			surfaceUnauthorizedHint({
+				auth,
+				baseUrlOverridden,
+				configDir: this.config.configDir,
+				payload
+			});
+			process.exitCode = 1;
+		}
+	}
+};
+//#endregion
+//#region src/oclif/machine-files.ts
+/** Hand-edited files larger than this are reported, never rewritten. */
+const MAX_MANAGED_FILE_BYTES = 1048576;
+/** Backups kept per file; older Primitive backups of the same file are pruned. */
+const BACKUPS_KEPT = 10;
+const BACKUP_INFIX = ".primitive-bak-";
+/** A safe, user-facing reason a file was not changed. */
+var MachineFileError = class extends Error {};
+/**
+* Read a user-owned text file without following it anywhere surprising. A
+* symlink is followed to its real file so a later write updates the file the
+* user linked instead of replacing the link.
+*/
+function readManagedFile(path) {
+	let info;
+	try {
+		info = lstatSync(path);
+	} catch (error) {
+		if (error.code === "ENOENT") return {
+			state: "absent",
+			path,
+			target: path
+		};
 		return {
-			mode,
-			sessionId: session,
-			state: listener.healthy ? listener.phase === "receiving" ? "running" : "degraded" : listener.reason === "restarting" ? "degraded" : listener.reason === "absent" ? "unknown" : "down",
-			reason: listener.reason ?? listener.failureCode,
-			failureCode: listener.failureCode,
-			detail: listener.detail ?? null,
-			lastSuccessfulMailCheckAt: mailOwner?.lastMailCheckAt ?? null,
-			liveness: listener.healthy && listener.phase === "receiving" ? "live" : "unknown",
-			listener
+			state: "invalid",
+			path,
+			detail: `${path} cannot be read (${error.code ?? "error"}).`
 		};
-	})() : profile && session ? {
-		mode,
-		sessionId: session,
-		state: "unknown",
-		reason: "hook_liveness_unverified",
-		lastSuccessfulMailCheckAt: null,
-		liveness: "unknown",
-		hook: claudeWakeHookStatus({
-			configDir,
-			profileName,
-			agentAddress: profile.agent_address,
-			sessionId: session
-		})
-	} : {
-		mode: "unknown",
-		sessionId: null,
-		state: "unknown",
-		reason: "session_not_configured",
-		lastSuccessfulMailCheckAt: null,
-		liveness: "unknown"
+	}
+	let target = path;
+	if (info.isSymbolicLink()) try {
+		target = realpathSync(path);
+		info = statSync(target);
+	} catch {
+		return {
+			state: "invalid",
+			path,
+			detail: `${path} is a symlink to a missing file; it was left unchanged.`
+		};
+	}
+	if (!info.isFile()) return {
+		state: "invalid",
+		path,
+		detail: `${path} is not a regular file; it was left unchanged.`
 	};
-	return profile ? {
-		status: "configured",
-		identity: connectedAgentIdentity(profileName, profile),
-		receiving
-	} : {
-		status: "not_configured",
-		profileName
+	if (info.size > MAX_MANAGED_FILE_BYTES) return {
+		state: "invalid",
+		path,
+		detail: `${path} is larger than 1 MiB; it was left unchanged.`
 	};
-}
-function parseAgentInvitation(input) {
+	let raw;
 	try {
-		if (Buffer.byteLength(input) > MAX_INVITATION_BYTES) throw new Error();
-		const text = input.trim();
-		let token;
-		let base;
-		if (text.startsWith("{")) {
-			const value = JSON.parse(text);
-			if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error();
-			const row = value;
-			if (Object.keys(row).some((key) => key !== "token" && key !== "api_base_url")) throw new Error();
-			token = row.token;
-			base = row.api_base_url ?? "https://api.primitive.dev/v1";
-		} else {
-			const url = new URL(text);
-			if (url.username || url.password || url.search || url.pathname !== "/v1/agent-connections/setup") throw new Error();
-			const fragment = new URLSearchParams(url.hash.slice(1));
-			if (Array.from(fragment.keys()).length !== 1 || fragment.getAll("token").length !== 1) throw new Error();
-			token = fragment.get("token");
-			base = `${url.origin}/v1`;
-		}
-		if (typeof token !== "string" || token.length < 32 || token.length > 256 || /\s/.test(token) || Array.from(token).some((character) => character.charCodeAt(0) < 32 || character.charCodeAt(0) === 127)) throw new Error();
+		raw = readFileSync(target);
+	} catch (error) {
 		return {
-			token,
-			apiBaseUrl: connectedApiBaseUrl(base)
+			state: "invalid",
+			path,
+			detail: `${path} cannot be read (${error.code ?? "error"}).`
 		};
-	} catch {
-		throw new AgentConnectionSetupError("Pipe the private Primitive setup URL or a JSON object containing token and optional api_base_url to stdin. Invitation values are never accepted as command arguments.");
 	}
+	const text = raw.toString("utf8");
+	if (text.includes("\0") || !Buffer.from(text, "utf8").equals(raw)) return {
+		state: "invalid",
+		path,
+		detail: `${path} is not UTF-8 text; it was left unchanged.`
+	};
+	return {
+		state: "present",
+		path,
+		target,
+		text,
+		mode: info.mode & 511
+	};
 }
-async function readAgentInvitation(input, isTTY) {
-	if (isTTY) throw new AgentConnectionSetupError("Pipe the private setup invitation to stdin.");
-	const chunks = [];
-	let size = 0;
-	for await (const chunk of input) {
-		const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-		size += bytes.length;
-		if (size > MAX_INVITATION_BYTES) throw new AgentConnectionSetupError("Setup invitation exceeds the input limit.");
-		chunks.push(bytes);
-	}
-	return Buffer.concat(chunks).toString("utf8");
+function backupStamp$1(now) {
+	return now.toISOString().replace(/[-:]/g, "").replace(/\.\d+Z$/, "Z");
 }
-async function readClaimResponse(response) {
-	const reader = response.body?.getReader();
-	if (!reader) throw new Error();
-	const chunks = [];
-	let size = 0;
+function syncDirectory(directory) {
+	if (process.platform === "win32") return;
 	try {
-		for (;;) {
-			const part = await reader.read();
-			if (part.done) break;
-			size += part.value.byteLength;
-			if (size > MAX_RESPONSE_BYTES$2) throw new Error();
-			chunks.push(part.value);
+		const fd = openSync(directory, "r");
+		try {
+			fsyncSync(fd);
+		} finally {
+			closeSync(fd);
 		}
-		return JSON.parse(Buffer.concat(chunks).toString("utf8"));
-	} finally {
-		await reader.cancel().catch(() => void 0);
-	}
+	} catch {}
 }
-function profileFromClaim(value, invitation, invitationHash, now) {
-	const response = value;
-	const data = response?.data;
-	const connection = data?.connection;
-	if (response?.success !== true || !data || !connection || data.api_base_url !== invitation.apiBaseUrl || data.owner_address !== connection.owner_address || !["claimed", "connected"].includes(String(connection.status))) throw new Error();
-	let ownerMember;
+function pruneBackups(target) {
+	const directory = dirname(target);
+	const prefix = `${basename(target)}${BACKUP_INFIX}`;
 	try {
-		ownerMember = Object.hasOwn(data, "owner_member_address") ? parseOwnerMemberAddress(data.owner_member_address, mailAddress(data.owner_address), mailAddress(connection.address)) : void 0;
-	} catch {
-		ownerMember = void 0;
-	}
-	return parseConnectedAgentProfile({
-		version: 1,
-		auth_method: "agent_connection",
-		api_key: data.api_key,
-		api_base_url: data.api_base_url,
-		org_id: data.org_id,
-		agent_address: connection.address,
-		owner_address: data.owner_address,
-		...ownerMember === void 0 ? {} : { owner_member_address: ownerMember },
-		invitation_hash: invitationHash,
-		created_at: new Date(now()).toISOString(),
-		...data.presence_profile === void 0 ? {} : { presence_profile: data.presence_profile }
-	});
+		const backups = readdirSync(directory).filter((name) => name.startsWith(prefix)).sort();
+		for (const name of backups.slice(0, Math.max(0, backups.length - BACKUPS_KEPT))) unlinkSync(join(directory, name));
+	} catch {}
 }
-/** Claims once; saved identity is local configuration, not proof of email readiness. */
-async function connectAgent(params) {
-	const profileName = agentProfileName(params.profileName);
-	const invitation = parseAgentInvitation(params.invitation);
-	const invitationHash = createHash("sha256").update(invitation.apiBaseUrl).update("\0").update(invitation.token).digest("hex");
-	const directory = agentProfilesDirectory(params.configDir);
-	let release;
-	try {
-		privateMailDirectory(directory, true);
-		release = acquireListenLock(directory, "agent-connection-setup");
-	} catch {
-		throw new AgentConnectionSetupError("Agent setup is already running, or its private directory is unavailable. No invitation was submitted.");
-	}
-	try {
-		const existing = loadConnectedAgentProfile(params.configDir, profileName);
-		if (existing) {
-			if (existing.invitation_hash !== invitationHash) throw new AgentConnectionSetupError("This agent profile is already configured. Its identity and credentials were not changed. Use a separate profile for another invitation.");
-			return {
-				status: "already_configured",
-				identity: connectedAgentIdentity(profileName, existing)
-			};
-		}
-		privateMailDirectory(join(directory, "profiles"), true);
-		privateMailDirectory(agentProfileDirectory(params.configDir, profileName), 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,
-			status: "attempted"
-		});
+/** Copy the current file beside itself before any change. Returns the copy's path. */
+function backupManagedFile(target, mode, now) {
+	const base = `${target}${BACKUP_INFIX}${backupStamp$1(now)}`;
+	for (let attempt = 0; attempt < 100; attempt++) {
+		const candidate = attempt === 0 ? base : `${base}-${attempt}`;
 		try {
-			const response = await (params.fetch ?? fetch)(`${invitation.apiBaseUrl}/agent-connections/claim`, {
-				method: "POST",
-				redirect: "error",
-				signal: AbortSignal.timeout(25e3),
-				headers: {
-					"content-type": "application/json",
-					accept: "application/json"
+			copyFileSync(target, candidate, constants.COPYFILE_EXCL);
+			chmodSync(candidate, mode);
+			return candidate;
+		} catch (error) {
+			if (error.code !== "EEXIST") throw error;
+		}
+	}
+	throw new MachineFileError(`Could not create a backup of ${target}.`);
+}
+/**
+* Replace a file atomically (temporary file plus rename in the same
+* directory), after backing up the existing content. The write is refused when
+* the file changed since it was read, so a concurrent edit is never lost.
+*/
+function writeManagedFile(params) {
+	const { read } = params;
+	const target = read.target;
+	const expected = read.state === "present" ? read.text : null;
+	const directory = dirname(target);
+	mkdirSync(directory, {
+		recursive: true,
+		mode: 448
+	});
+	const current = () => {
+		try {
+			return readFileSync(target, "utf8");
+		} catch (error) {
+			if (error.code === "ENOENT") return null;
+			throw error;
+		}
+	};
+	if (current() !== expected) throw new MachineFileError(`${read.path} changed while it was being repaired; it was left unchanged.`);
+	const mode = read.state === "present" ? read.mode : params.newFileMode ?? 420;
+	const backup = read.state === "present" ? backupManagedFile(target, mode, (params.now ?? (() => /* @__PURE__ */ new Date()))()) : null;
+	const temporary = join(directory, `.${basename(target)}.${randomUUID()}.tmp`);
+	try {
+		const fd = openSync(temporary, "wx", mode);
+		try {
+			writeFileSync(fd, params.content, "utf8");
+			fsyncSync(fd);
+		} finally {
+			closeSync(fd);
+		}
+		chmodSync(temporary, mode);
+		if (current() !== expected) throw new MachineFileError(`${read.path} changed while it was being repaired; it was left unchanged.`);
+		renameSync(temporary, target);
+		syncDirectory(directory);
+	} finally {
+		if (existsSync(temporary)) unlinkSync(temporary);
+	}
+	if (backup) pruneBackups(target);
+	return { backup };
+}
+const START = /^<!-- primitive:managed-block v=(\d+) START -->\r?$/;
+const END = /^<!-- primitive:managed-block END -->\r?$/;
+/** Character offsets of the single managed block, or why the markers are unusable. */
+function locateBlock(text) {
+	const starts = [];
+	const ends = [];
+	let offset = 0;
+	for (const line of text.split("\n")) {
+		const start = START.exec(line);
+		if (start) starts.push({
+			offset,
+			version: Number(start[1])
+		});
+		else if (END.test(line)) ends.push({
+			offset,
+			length: line.endsWith("\r") ? line.length - 1 : line.length
+		});
+		else if (line.includes("primitive:managed-block")) return { malformed: "a primitive:managed-block marker line was edited; fix or remove it by hand" };
+		offset += line.length + 1;
+	}
+	if (starts.length === 0 && ends.length === 0) return null;
+	if (starts.length !== 1 || ends.length !== 1) return { malformed: `found ${starts.length} START and ${ends.length} END markers; expected one of each` };
+	const [start] = starts;
+	const [end] = ends;
+	if (!start || !end || end.offset < start.offset) return { malformed: "the END marker comes before the START marker" };
+	return {
+		start: start.offset,
+		end: end.offset + end.length,
+		version: start.version
+	};
+}
+/** The exact block for a body, using the file's own line ending. */
+function renderManagedBlock(body, eol = "\n") {
+	return [
+		`<!-- primitive:managed-block v=1 START -->`,
+		...body.replace(/\r\n/g, "\n").replace(/\n+$/, "").split("\n"),
+		"<!-- primitive:managed-block END -->"
+	].join(eol);
+}
+function lineEnding(text) {
+	return text.includes("\r\n") ? "\r\n" : "\n";
+}
+function inspectManagedBlock(text, body) {
+	const found = locateBlock(text);
+	if (found === null) return { state: "missing" };
+	if ("malformed" in found) return {
+		state: "malformed",
+		detail: found.malformed
+	};
+	return text.slice(found.start, found.end).replace(/\r\n/g, "\n") === renderManagedBlock(body) ? { state: "ok" } : {
+		state: "outdated",
+		version: found.version
+	};
+}
+/**
+* Replace only the managed block, or append it when absent. Text outside the
+* markers is preserved byte for byte. Throws for malformed markers.
+*/
+function upsertManagedBlock(text, body) {
+	const found = locateBlock(text);
+	if (found !== null && "malformed" in found) throw new MachineFileError(found.malformed);
+	const eol = lineEnding(text);
+	const block = renderManagedBlock(body, eol);
+	if (found) return `${text.slice(0, found.start)}${block}${text.slice(found.end)}`;
+	if (text.length === 0) return `${block}${eol}`;
+	return `${text}${text.endsWith(`${eol}${eol}`) ? "" : text.endsWith(eol) ? eol : `${eol}${eol}`}${block}${eol}`;
+}
+/** Indentation the file already uses, so a rewrite keeps its style. */
+function jsonIndentation(text) {
+	return /^[{[][^\n]*\n([ \t]+)\S/.exec(text)?.[1] ?? 2;
+}
+//#endregion
+//#region src/oclif/claude-machine-hooks.ts
+function record$4(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function realpathOrNull(path) {
+	try {
+		return realpathSync(path);
+	} catch {
+		return null;
+	}
+}
+/** Two paths name the same existing file. */
+function samePath(a, b) {
+	if (typeof a !== "string" || !a) return false;
+	if (a === b) return existsSync(a);
+	const left = realpathOrNull(a);
+	return left !== null && left === realpathOrNull(b);
+}
+function executable(path) {
+	try {
+		accessSync(path, constants.X_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
+/** The first PATH entry for a command, without running a shell. */
+function findOnPath(name, env) {
+	for (const directory of (env.PATH ?? "").split(delimiter)) {
+		if (!directory) continue;
+		const candidate = join(directory, name);
+		if (existsSync(candidate) && executable(candidate)) return candidate;
+	}
+	return null;
+}
+/**
+* Prefer a PATH link (for example a package manager's `bin/node`) over a
+* versioned install directory when both are the same binary, so a hook keeps
+* working after the versioned directory is replaced by an upgrade.
+*/
+function stableNodePath(env, execPath = process.execPath) {
+	const onPath = findOnPath("node", env);
+	if (onPath && onPath !== execPath && samePath(onPath, execPath)) return onPath;
+	return execPath;
+}
+/** Locate the running CLI. Null when its files are not where a package install puts them. */
+function currentCliLocation(entryArg, env, execPath = process.execPath) {
+	const entry = realpathOrNull(entryArg);
+	if (!entry) return null;
+	const wake = realpathOrNull(join(dirname(entry), "claude-wake.mjs"));
+	const pending = realpathOrNull(join(dirname(entry), "claude-pending-mail.mjs"));
+	if (!wake || !pending) return null;
+	return {
+		node: stableNodePath(env, execPath),
+		entry,
+		wake,
+		pending
+	};
+}
+/** Package-runner caches are cleaned up behind the user's back. */
+function ephemeralCliReason(entry) {
+	if (/[\\/]_npx[\\/]/.test(entry)) return "an npx cache";
+	if (/[\\/]dlx[-\\/]/.test(entry)) return "a pnpm dlx cache";
+	if (/[\\/]bunx-/.test(entry)) return "a bunx cache";
+	return null;
+}
+function claudeConfigDir(env, home) {
+	return resolve(env.CLAUDE_CONFIG_DIR || join(home, ".claude"));
+}
+function jsonErrorDetail(error) {
+	const message = error instanceof Error ? error.message : "";
+	const position = /position (\d+)/.exec(message)?.[1];
+	const line = /line (\d+)/.exec(message)?.[1];
+	return line ? ` near line ${line}` : position ? ` near character ${position}` : "";
+}
+/** Parse settings.json. Anything unexpected is reported, never repaired. */
+function readClaudeSettings(claudeDir) {
+	const path = join(claudeDir, "settings.json");
+	const read = readManagedFile(path);
+	if (read.state === "invalid") return {
+		ok: false,
+		detail: read.detail
+	};
+	if (read.state === "absent") return {
+		ok: true,
+		read,
+		settings: {}
+	};
+	let parsed;
+	try {
+		parsed = JSON.parse(read.text);
+	} catch (error) {
+		return {
+			ok: false,
+			detail: `${path} is not valid JSON${jsonErrorDetail(error)}. Fix it by hand; it was not modified.`
+		};
+	}
+	if (!record$4(parsed)) return {
+		ok: false,
+		detail: `${path} must contain a JSON object. Fix it by hand; it was not modified.`
+	};
+	if (parsed.hooks !== void 0 && !record$4(parsed.hooks)) return {
+		ok: false,
+		detail: `${path} has a "hooks" value that is not an object. Fix it by hand; it was not modified.`
+	};
+	return {
+		ok: true,
+		read,
+		settings: parsed
+	};
+}
+const LOCK_WAIT$1 = new Int32Array(new SharedArrayBuffer(4));
+/**
+* Write settings under the same lock every Primitive hook installer uses,
+* keeping the file's indentation, after a timestamped backup.
+*/
+function writeClaudeSettings(params) {
+	let release;
+	for (let attempt = 0; attempt < 80; attempt++) try {
+		release = acquireListenLock(params.claudeDir, "primitive-claude-settings");
+		break;
+	} catch {
+		Atomics.wait(LOCK_WAIT$1, 0, 0, 25);
+	}
+	if (!release) throw new MachineFileError("Another Primitive command is editing Claude settings; try again shortly.");
+	try {
+		const original = params.read.state === "present" ? params.read.text : null;
+		const indent = original === null ? 2 : jsonIndentation(original);
+		const trailing = original === null || original.endsWith("\n") ? "\n" : "";
+		return writeManagedFile({
+			read: params.read,
+			content: `${JSON.stringify(params.settings, null, indent)}${trailing}`,
+			now: params.now,
+			newFileMode: 384
+		});
+	} finally {
+		release();
+	}
+}
+const GLOBAL_HOOKS = {
+	"claude.hook.session_start": {
+		event: "SessionStart",
+		subcommand: "session-register",
+		timeout: 15
+	},
+	"claude.hook.session_end": {
+		event: "SessionEnd",
+		subcommand: "session-end",
+		timeout: 10
+	}
+};
+/** A hook this CLI installed for every Claude session, from any CLI path or version. */
+function isGlobalManaged(hook, spec) {
+	if (!record$4(hook) || hook.type !== "command" || !Array.isArray(hook.args)) return false;
+	const args = hook.args;
+	return args.length === 6 && typeof args[0] === "string" && args[1] === "agent" && args[2] === spec.subcommand && args[3] === "--runtime" && args[4] === "claude" && args[5] === "--hook";
+}
+function globalHookArgs(cli, spec) {
+	return [
+		cli.entry,
+		"agent",
+		spec.subcommand,
+		"--runtime",
+		"claude",
+		"--hook"
+	];
+}
+function globalHookCurrent(hook, cli) {
+	const args = hook.args;
+	return samePath(hook.command, cli.node) && samePath(args[0], cli.entry);
+}
+const WAKE_MARKER = "primitive-agent-wake-v1";
+const PENDING_MARKER$1 = "primitive-pending-mail-v1";
+const SESSION_EVENTS = [
+	"Stop",
+	"SessionStart",
+	"PostToolUse"
+];
+/** Which receive hook each event carries. */
+const SESSION_HOOK_KIND = {
+	Stop: "wake",
+	SessionStart: "wake",
+	PostToolUse: "pending"
+};
+/**
+* The one test of whether an event already carries a current receive hook
+* for this exact profile, address and session, run by the Node binary at
+* `node` (compared as files). `agent connect --status` and machine doctor
+* both use it, so they never disagree about a hook being present.
+*/
+function hasSessionReceiveHook(hooks, event, target, node) {
+	const entries = hooks[event];
+	if (!Array.isArray(entries)) return false;
+	const pending = SESSION_HOOK_KIND[event] === "pending";
+	const configDir = resolve(target.configDir);
+	const session = target.session.toLowerCase();
+	return entries.some((entry) => record$4(entry) && Array.isArray(entry.hooks) && entry.hooks.some((hook) => {
+		if (!record$4(hook) || hook.type !== "command") return false;
+		const args = hook.args;
+		return Array.isArray(args) && args.length === 7 && args.every((value) => typeof value === "string") && basename(args[0]) === (pending ? "claude-pending-mail.mjs" : "claude-wake.mjs") && resolve(args[2]) === configDir && args[3] === target.profile && args[4] === target.address && args[5].toLowerCase() === session && args[6] === (pending ? PENDING_MARKER$1 : WAKE_MARKER) && samePath(hook.command, node);
+	}));
+}
+/** A per-session receive hook written by `agent connect` or `agent enroll`, any version. */
+function parseSessionHook(hook) {
+	if (!record$4(hook) || hook.type !== "command" || !Array.isArray(hook.args)) return null;
+	const args = hook.args;
+	if (!args.every((value) => typeof value === "string")) return null;
+	const strings = args;
+	const script = basename(strings[0] ?? "");
+	if (script === "claude-pending-mail.mjs") return strings.length === 7 && strings[6] === PENDING_MARKER$1 ? {
+		kind: "pending",
+		configDir: strings[2] ?? "",
+		profile: strings[3] ?? null,
+		address: strings[4] ?? null,
+		session: strings[5] ?? null
+	} : null;
+	if (script !== "claude-wake.mjs") return null;
+	if (strings.length === 7 && strings[6] === WAKE_MARKER) return {
+		kind: "wake",
+		configDir: strings[2] ?? "",
+		profile: strings[3] ?? null,
+		address: strings[4] ?? null,
+		session: strings[5] ?? null
+	};
+	if (strings.length === 6 && strings[5] === WAKE_MARKER) return {
+		kind: "wake",
+		configDir: strings[2] ?? "",
+		profile: strings[3] ?? null,
+		address: strings[4] ?? null,
+		session: null
+	};
+	if (strings.length === 4 && strings[3] === WAKE_MARKER) return {
+		kind: "wake",
+		configDir: strings[2] ?? "",
+		profile: null,
+		address: null,
+		session: null
+	};
+	return null;
+}
+/** A saved connected profile still holds a credential. Unreadable counts as live. */
+function profileStillConnected(configDir, profile) {
+	try {
+		return loadConnectedAgentProfile(configDir, profile) !== null;
+	} catch {
+		return true;
+	}
+}
+function sessionHookPathsCurrent(hook, parsed, cli) {
+	const args = hook.args;
+	if (!cli) return existsSync(String(hook.command)) && existsSync(args[0] ?? "") && existsSync(args[1] ?? "");
+	return samePath(hook.command, cli.node) && samePath(args[0], parsed.kind === "wake" ? cli.wake : cli.pending) && samePath(args[1], cli.entry);
+}
+function judgeSessionHooks(hooks, cli, bound = []) {
+	const verdicts = /* @__PURE__ */ new Map();
+	const seen = /* @__PURE__ */ new Set();
+	for (const event of SESSION_EVENTS) {
+		const entries = hooks[event];
+		if (!Array.isArray(entries)) continue;
+		for (const entry of entries) {
+			if (!record$4(entry) || !Array.isArray(entry.hooks)) continue;
+			for (const hook of entry.hooks) {
+				const parsed = parseSessionHook(hook);
+				if (!parsed || !record$4(hook)) continue;
+				const pathsExist = existsSync(String(hook.command)) && existsSync(String(hook.args[0])) && existsSync(String(hook.args[1]));
+				if (!(parsed.profile ? existsSync(parsed.configDir) && profileStillConnected(parsed.configDir, parsed.profile) : existsSync(parsed.configDir) && pathsExist)) {
+					verdicts.set(hook, "stale");
+					continue;
+				}
+				const current = bound.find((item) => item.configDir === resolve(parsed.configDir) && item.profile === parsed.profile && item.session === parsed.session?.toLowerCase());
+				if (current && parsed.address !== current.address) {
+					verdicts.set(hook, "old_address");
+					continue;
+				}
+				const key = [
+					event,
+					parsed.kind,
+					resolve(parsed.configDir),
+					parsed.profile ?? "",
+					parsed.session?.toLowerCase() ?? ""
+				].join("\0");
+				if (seen.has(key)) {
+					verdicts.set(hook, "duplicate");
+					continue;
+				}
+				seen.add(key);
+				verdicts.set(hook, sessionHookPathsCurrent(hook, parsed, cli) ? "keep" : "outdated");
+			}
+		}
+	}
+	return verdicts;
+}
+function eventEntries(hooks, event) {
+	const entries = hooks[event];
+	if (entries === void 0) return [];
+	return Array.isArray(entries) ? entries : "invalid";
+}
+/**
+* Connected profiles whose setup binds an external (hook) receiver to a
+* Claude session that this machine has not recorded as ended.
+*/
+function boundSessionProfiles(configDir) {
+	const root = resolve(configDir);
+	let names;
+	try {
+		names = readdirSync(join(agentProfilesDirectory(root), "profiles")).sort();
+	} catch {
+		return [];
+	}
+	const bound = [];
+	for (const name of names) try {
+		agentProfileName(name);
+		const setup = readMailJson(join(agentProfileDirectory(root, name), "setup.json"));
+		if (setup?.receiverMode !== "external" || typeof setup.session !== "string" || !SESSION_UUID$1.test(setup.session)) continue;
+		const session = setup.session.toLowerCase();
+		if (typeof readMailJson(join(root, "machine", "sessions", `${session}.json`))?.endedAt === "string") continue;
+		const profile = loadConnectedAgentProfile(root, name);
+		if (profile) bound.push({
+			configDir: root,
+			profile: name,
+			address: profile.agent_address,
+			session
+		});
+	} catch {}
+	return bound;
+}
+/** Receive hooks each bound profile should have and does not. */
+function missingSessionHooks(hooks, bound, node) {
+	return bound.flatMap((item) => SESSION_EVENTS.filter((event) => !hasSessionReceiveHook(hooks, event, item, node)).map((event) => ({
+		event,
+		bound: item
+	})));
+}
+/** The exact entry `agent connect` and `session-register` install. */
+function sessionHookEntry(event, item, cli) {
+	const pending = SESSION_HOOK_KIND[event] === "pending";
+	const hook = {
+		type: "command",
+		command: cli.node,
+		args: [
+			pending ? cli.pending : cli.wake,
+			cli.entry,
+			item.configDir,
+			item.profile,
+			item.address,
+			item.session,
+			pending ? PENDING_MARKER$1 : WAKE_MARKER
+		],
+		...pending ? { timeout: 10 } : {
+			asyncRewake: true,
+			timeout: 604800
+		}
+	};
+	return event === "SessionStart" ? {
+		matcher: "resume",
+		hooks: [hook]
+	} : { hooks: [hook] };
+}
+/** Inspect every Primitive-owned Claude hook without changing anything. */
+function inspectClaudeHooks(settings, context) {
+	const hooks = record$4(settings.hooks) ? settings.hooks : {};
+	const canFix = context.cli !== null && context.blocked === null;
+	const blockedNote = context.blocked ? ` ${context.blocked}` : "";
+	const findings = {};
+	for (const [id, spec] of Object.entries(GLOBAL_HOOKS)) {
+		const entries = eventEntries(hooks, spec.event);
+		if (entries === "invalid") {
+			findings[id] = {
+				status: "fail",
+				detail: `hooks.${spec.event} is not a list. Fix settings.json by hand; it was not modified.`,
+				fixable: false
+			};
+			continue;
+		}
+		const managed = entries.flatMap((entry) => record$4(entry) && Array.isArray(entry.hooks) ? entry.hooks.filter((hook) => isGlobalManaged(hook, spec)) : []);
+		const [first] = managed;
+		if (!first) findings[id] = {
+			status: "fail",
+			detail: `No ${spec.event} hook runs \`primitive agent ${spec.subcommand}\`.${blockedNote}`,
+			fixable: canFix
+		};
+		else if (managed.length > 1) findings[id] = {
+			status: "fail",
+			detail: `${managed.length} ${spec.event} hooks run \`primitive agent ${spec.subcommand}\`; expected exactly one.${blockedNote}`,
+			fixable: canFix
+		};
+		else if (!context.cli || !globalHookCurrent(first, context.cli)) findings[id] = {
+			status: "fail",
+			detail: `The ${spec.event} hook runs ${String(first.args[0])}, which ${existsSync(String(first.args[0])) ? "is not this CLI" : "no longer exists"}.${blockedNote}`,
+			fixable: canFix
+		};
+		else findings[id] = {
+			status: "ok",
+			detail: `${spec.event} runs \`primitive agent ${spec.subcommand}\` from ${context.cli.entry}.`,
+			fixable: false
+		};
+	}
+	const invalid = SESSION_EVENTS.find((event) => eventEntries(hooks, event) === "invalid");
+	if (invalid) {
+		findings["claude.hook.stop"] = {
+			status: "fail",
+			detail: `hooks.${invalid} is not a list. Fix settings.json by hand; it was not modified.`,
+			fixable: false
+		};
+		return findings;
+	}
+	const bound = context.bound ?? [];
+	const counts = {
+		keep: 0,
+		stale: 0,
+		duplicate: 0,
+		outdated: 0,
+		old_address: 0
+	};
+	for (const verdict of judgeSessionHooks(hooks, context.cli, bound).values()) counts[verdict]++;
+	const missing = missingSessionHooks(hooks, bound, context.cli?.node ?? process.execPath).length;
+	const problems = [
+		missing ? `${missing} missing for connected sessions` : "",
+		counts.old_address ? `${counts.old_address} naming an old agent address` : "",
+		counts.stale ? `${counts.stale} for disconnected or removed sessions` : "",
+		counts.duplicate ? `${counts.duplicate} duplicates` : "",
+		counts.outdated ? `${counts.outdated} pointing at an old CLI path` : ""
+	].filter(Boolean);
+	findings["claude.hook.stop"] = problems.length ? {
+		status: "fail",
+		detail: `Per-session receive hooks need cleanup: ${problems.join(", ")}.${blockedNote}`,
+		fixable: canFix || counts.outdated === 0 && missing === 0 && context.blocked === null
+	} : {
+		status: "ok",
+		detail: counts.keep ? `${counts.keep} per-session receive hooks, each present once and current.` : "No per-session receive hooks; each registered session adds its own exact-session hooks.",
+		fixable: false
+	};
+	return findings;
+}
+function rewriteEntries(entries, transform) {
+	let changed = false;
+	return {
+		entries: entries.flatMap((entry) => {
+			if (!record$4(entry) || !Array.isArray(entry.hooks)) return [entry];
+			let touched = false;
+			const kept = entry.hooks.flatMap((hook) => {
+				const replacement = transform(hook);
+				if (replacement === hook) return [hook];
+				touched = true;
+				return replacement === void 0 ? [] : [replacement];
+			});
+			if (!touched) return [entry];
+			changed = true;
+			return kept.length ? [{
+				...entry,
+				hooks: kept
+			}] : [];
+		}),
+		changed
+	};
+}
+/**
+* Apply fixes for the requested checks to a copy of the settings. Only
+* Primitive-owned hooks are added, rewritten or removed; every other key,
+* entry and sibling hook is carried over unchanged.
+*/
+function repairClaudeHooks(settings, context, checks) {
+	const changed = /* @__PURE__ */ new Set();
+	const hooks = record$4(settings.hooks) ? { ...settings.hooks } : {};
+	const cli = context.blocked === null ? context.cli : null;
+	for (const [id, spec] of Object.entries(GLOBAL_HOOKS)) {
+		if (!checks.has(id) || !cli) continue;
+		const entries = eventEntries(hooks, spec.event);
+		if (entries === "invalid") continue;
+		let placed = false;
+		const result = rewriteEntries(entries, (hook) => {
+			if (!isGlobalManaged(hook, spec)) return hook;
+			if (placed) return void 0;
+			placed = true;
+			if (globalHookCurrent(hook, cli)) return hook;
+			return {
+				...hook,
+				command: cli.node,
+				args: globalHookArgs(cli, spec)
+			};
+		});
+		let next = result.entries;
+		if (!placed) next = [...next, { hooks: [{
+			type: "command",
+			command: cli.node,
+			args: globalHookArgs(cli, spec),
+			timeout: spec.timeout
+		}] }];
+		if (result.changed || !placed) {
+			hooks[spec.event] = next;
+			changed.add(id);
+		}
+	}
+	if (checks.has("claude.hook.stop") && context.blocked === null) {
+		if (!SESSION_EVENTS.some((event) => eventEntries(hooks, event) === "invalid")) {
+			const bound = context.bound ?? [];
+			const verdicts = judgeSessionHooks(hooks, context.cli, bound);
+			for (const event of SESSION_EVENTS) {
+				const entries = eventEntries(hooks, event);
+				if (entries === "invalid" || entries.length === 0) continue;
+				const result = rewriteEntries(entries, (hook) => {
+					const verdict = verdicts.get(hook);
+					if (verdict === "stale" || verdict === "duplicate" || verdict === "old_address") return void 0;
+					if (verdict !== "outdated" || !cli || !record$4(hook)) return hook;
+					const parsed = parseSessionHook(hook);
+					const args = [...hook.args];
+					args[0] = parsed?.kind === "pending" ? cli.pending : cli.wake;
+					args[1] = cli.entry;
+					return {
+						...hook,
+						command: cli.node,
+						args
+					};
+				});
+				if (result.changed) {
+					hooks[event] = result.entries;
+					changed.add("claude.hook.stop");
+				}
+			}
+			if (cli) for (const missing of missingSessionHooks(hooks, bound, cli.node)) {
+				const entries = eventEntries(hooks, missing.event);
+				if (entries === "invalid") continue;
+				hooks[missing.event] = [...entries, sessionHookEntry(missing.event, missing.bound, cli)];
+				changed.add("claude.hook.stop");
+			}
+		}
+	}
+	if (!changed.size) return {
+		settings,
+		changed
+	};
+	return {
+		settings: {
+			...settings,
+			hooks
+		},
+		changed
+	};
+}
+//#endregion
+//#region src/oclif/claude-wake-install.ts
+const HOOK_MARKER = "primitive-agent-wake-v1";
+const WAKE_EVENTS = ["Stop", "SessionStart"];
+const PENDING_MARKER = "primitive-pending-mail-v1";
+const PENDING_EVENT = "PostToolUse";
+const LOCK_WAIT = new Int32Array(new SharedArrayBuffer(4));
+function record$3(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function claudeWakeHookStatus(options) {
+	const unavailable = {
+		installed: false,
+		lastFiredAt: null,
+		liveness: "unknown"
+	};
+	try {
+		const configDir = resolve(options.configDir);
+		const profileName = agentProfileName(options.profileName);
+		const agentAddress = mailAddress(options.agentAddress);
+		if (!SESSION_UUID$1.test(options.sessionId)) return unavailable;
+		const sessionId = options.sessionId.toLowerCase();
+		const read = readManagedFile(join(resolve(options.env?.CLAUDE_CONFIG_DIR || join(homedir(), ".claude")), "settings.json"));
+		if (read.state !== "present") return unavailable;
+		const settings = JSON.parse(read.text);
+		if (!record$3(settings) || !record$3(settings.hooks)) return unavailable;
+		const hooks = settings.hooks;
+		const target = {
+			configDir,
+			profile: profileName,
+			address: agentAddress,
+			session: sessionId
+		};
+		const installed = [
+			"Stop",
+			"SessionStart",
+			"PostToolUse"
+		].every((event) => hasSessionReceiveHook(hooks, event, target, process.execPath));
+		let lastFiredAt = null;
+		const fired = readMailJson(join(agentProfileDirectory(configDir, profileName), `pending-mail-${sessionId}.fired.json`));
+		if (record$3(fired) && fired.version === 1 && typeof fired.at === "string" && Number.isFinite(Date.parse(fired.at))) lastFiredAt = fired.at;
+		return {
+			installed,
+			lastFiredAt,
+			liveness: "unknown"
+		};
+	} catch {
+		return unavailable;
+	}
+}
+/**
+* Apply one edit to Claude's settings under the shared lock, backing up the
+* previous file. Exported for tests.
+*/
+function editClaudeSettings(claudeDir, edit) {
+	mkdirSync(claudeDir, {
+		recursive: true,
+		mode: 448
+	});
+	let release;
+	for (let attempt = 0; attempt < 40; attempt++) try {
+		release = acquireListenLock(claudeDir, "primitive-claude-settings");
+		break;
+	} catch {
+		Atomics.wait(LOCK_WAIT, 0, 0, 25);
+	}
+	if (!release) return false;
+	try {
+		const settingsPath = join(claudeDir, "settings.json");
+		for (let attempt = 0; attempt < 3; attempt++) {
+			const read = readManagedFile(settingsPath);
+			if (read.state === "invalid") return false;
+			let settings = {};
+			if (read.state === "present") {
+				const parsed = JSON.parse(read.text);
+				if (!record$3(parsed)) return false;
+				settings = parsed;
+			}
+			const next = edit(settings);
+			if (next === null) return true;
+			const content = `${JSON.stringify(next, null, 2)}\n`;
+			if (read.state === "present" && content === read.text) return true;
+			try {
+				writeManagedFile({
+					read,
+					content,
+					newFileMode: 384
+				});
+				return true;
+			} catch (error) {
+				if (!(error instanceof MachineFileError)) throw error;
+			}
+		}
+		return false;
+	} finally {
+		release();
+	}
+}
+/** Add exact-session fail-open receiving hooks while preserving unrelated settings. */
+function installClaudeWakeHook(options) {
+	try {
+		const cliPath = realpathSync(options.cliPath);
+		const wrapperPath = realpathSync(join(dirname(cliPath), "claude-wake.mjs"));
+		const pendingPath = realpathSync(join(dirname(cliPath), "claude-pending-mail.mjs"));
+		const configDir = resolve(options.configDir);
+		const profileName = agentProfileName(options.profileName);
+		const agentAddress = mailAddress(options.agentAddress);
+		if (!SESSION_UUID$1.test(options.sessionId)) return "unavailable";
+		const sessionId = options.sessionId.toLowerCase();
+		return editClaudeSettings(resolve((options.env ?? process.env).CLAUDE_CONFIG_DIR || join(homedir(), ".claude")), (settings) => {
+			const hooks = settings.hooks ?? {};
+			if (!record$3(hooks)) throw new Error("Invalid hook settings");
+			for (const event of WAKE_EVENTS) if (!Array.isArray(hooks[event] ?? [])) throw new Error(`Invalid ${event} hooks`);
+			if (!Array.isArray(hooks[PENDING_EVENT] ?? [])) throw new Error(`Invalid ${PENDING_EVENT} hooks`);
+			const hook = {
+				type: "command",
+				command: process.execPath,
+				args: [
+					wrapperPath,
+					cliPath,
+					configDir,
+					profileName,
+					agentAddress,
+					sessionId,
+					HOOK_MARKER
+				],
+				asyncRewake: true,
+				timeout: 604800
+			};
+			const pendingHook = {
+				type: "command",
+				command: process.execPath,
+				args: [
+					pendingPath,
+					cliPath,
+					configDir,
+					profileName,
+					agentAddress,
+					sessionId,
+					PENDING_MARKER
+				],
+				timeout: 10
+			};
+			const isOwnPendingHook = (candidate) => record$3(candidate) && candidate.type === "command" && Array.isArray(candidate.args) && candidate.args.length === 7 && typeof candidate.args[0] === "string" && basename(candidate.args[0]) === "claude-pending-mail.mjs" && candidate.args[2] === configDir && candidate.args[3] === profileName && candidate.args[5] === sessionId && candidate.args[6] === PENDING_MARKER;
+			const isOwnHook = (candidate) => {
+				if (!record$3(candidate) || !Array.isArray(candidate.args)) return false;
+				if (typeof candidate.args[0] !== "string" || basename(candidate.args[0]) !== "claude-wake.mjs" || candidate.args[2] !== configDir || candidate.args[3] !== profileName) return false;
+				if (candidate.args.length === 7 && candidate.args[5] === sessionId && candidate.args[6] === HOOK_MARKER) return true;
+				if (candidate.args.length !== 6 || candidate.args[5] !== HOOK_MARKER) return false;
+				try {
+					const state = readMailJson(join(agentProfileDirectory(configDir, profileName), "setup.json"));
+					return record$3(state) && state.session === sessionId;
+				} catch {
+					return false;
+				}
+			};
+			const nextHooks = { ...hooks };
+			for (const event of WAKE_EVENTS) nextHooks[event] = [...(hooks[event] ?? []).flatMap((entry) => {
+				if (!record$3(entry) || !Array.isArray(entry.hooks)) return [entry];
+				const siblings = entry.hooks.filter((candidate) => !isOwnHook(candidate));
+				if (siblings.length === entry.hooks.length) return [entry];
+				return siblings.length ? [{
+					...entry,
+					hooks: siblings
+				}] : [];
+			}), event === "SessionStart" ? {
+				matcher: "resume",
+				hooks: [hook]
+			} : { hooks: [hook] }];
+			nextHooks[PENDING_EVENT] = [...(hooks[PENDING_EVENT] ?? []).flatMap((entry) => {
+				if (!record$3(entry) || !Array.isArray(entry.hooks)) return [entry];
+				const siblings = entry.hooks.filter((candidate) => !isOwnPendingHook(candidate));
+				if (siblings.length === entry.hooks.length) return [entry];
+				return siblings.length ? [{
+					...entry,
+					hooks: siblings
+				}] : [];
+			}), { hooks: [pendingHook] }];
+			return {
+				...settings,
+				hooks: nextHooks
+			};
+		}) ? "installed_unverified" : "unavailable";
+	} catch {
+		return "unavailable";
+	}
+}
+/** Remove only this profile's exact-session hooks after disconnection. */
+function uninstallClaudeWakeHook(options) {
+	try {
+		const configDir = resolve(options.configDir);
+		const profileName = agentProfileName(options.profileName);
+		const agentAddress = mailAddress(options.agentAddress);
+		if (!SESSION_UUID$1.test(options.sessionId)) return false;
+		const sessionId = options.sessionId.toLowerCase();
+		const claudeDir = resolve((options.env ?? process.env).CLAUDE_CONFIG_DIR || join(homedir(), ".claude"));
+		if (!existsSync(join(claudeDir, "settings.json"))) return true;
+		return editClaudeSettings(claudeDir, (settings) => {
+			const hooks = settings.hooks ?? {};
+			if (!record$3(hooks)) throw new Error("Invalid hook settings");
+			for (const event of WAKE_EVENTS) if (!Array.isArray(hooks[event] ?? [])) throw new Error(`Invalid ${event} hooks`);
+			if (!Array.isArray(hooks[PENDING_EVENT] ?? [])) throw new Error(`Invalid ${PENDING_EVENT} hooks`);
+			const legacySessionMatches = () => {
+				try {
+					const setup = readMailJson(join(agentProfileDirectory(configDir, profileName), "setup.json"));
+					return record$3(setup) && setup.session === sessionId;
+				} catch {
+					return false;
+				}
+			};
+			const isOwnHook = (candidate) => {
+				if (!record$3(candidate) || !Array.isArray(candidate.args)) return false;
+				const args = candidate.args;
+				return candidate.type === "command" && typeof candidate.command === "string" && candidate.asyncRewake === true && typeof args[0] === "string" && basename(args[0]) === "claude-wake.mjs" && typeof args[1] === "string" && args[2] === configDir && args[3] === profileName && args[4] === agentAddress && (args.length === 7 && args[5] === sessionId && args[6] === HOOK_MARKER || args.length === 6 && args[5] === HOOK_MARKER && legacySessionMatches());
+			};
+			const isOwnPendingHook = (candidate) => {
+				if (!record$3(candidate) || !Array.isArray(candidate.args)) return false;
+				const args = candidate.args;
+				return candidate.type === "command" && typeof candidate.command === "string" && typeof args[0] === "string" && basename(args[0]) === "claude-pending-mail.mjs" && args[2] === configDir && args[3] === profileName && args[4] === agentAddress && args[5] === sessionId && args[6] === PENDING_MARKER && args.length === 7;
+			};
+			let removed = false;
+			const nextHooks = { ...hooks };
+			for (const event of WAKE_EVENTS) nextHooks[event] = (hooks[event] ?? []).flatMap((entry) => {
+				if (!record$3(entry) || !Array.isArray(entry.hooks)) return [entry];
+				const siblings = entry.hooks.filter((candidate) => !isOwnHook(candidate));
+				if (siblings.length === entry.hooks.length) return [entry];
+				removed = true;
+				return siblings.length ? [{
+					...entry,
+					hooks: siblings
+				}] : [];
+			});
+			nextHooks[PENDING_EVENT] = (hooks[PENDING_EVENT] ?? []).flatMap((entry) => {
+				if (!record$3(entry) || !Array.isArray(entry.hooks)) return [entry];
+				const siblings = entry.hooks.filter((candidate) => !isOwnPendingHook(candidate));
+				if (siblings.length === entry.hooks.length) return [entry];
+				removed = true;
+				return siblings.length ? [{
+					...entry,
+					hooks: siblings
+				}] : [];
+			});
+			return removed ? {
+				...settings,
+				hooks: nextHooks
+			} : null;
+		});
+	} catch {
+		return false;
+	}
+}
+//#endregion
+//#region src/oclif/agent-connect.ts
+const MAX_INVITATION_BYTES = 4096;
+const MAX_RESPONSE_BYTES$2 = 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.";
+/** Offline metadata only; a saved profile is not proof of current API or listener readiness. */
+function agentConnectionStatus(configDir, profileName, env = process.env) {
+	agentProfileName(profileName);
+	const profile = loadConnectedAgentProfile(configDir, profileName);
+	const setup = profile ? readMailJson(join(agentProfileDirectory(configDir, profileName), "setup.json")) : null;
+	const saved = setup && typeof setup === "object" && !Array.isArray(setup) ? setup : null;
+	const session = saved && typeof saved.session === "string" && SESSION_UUID$1.test(saved.session) ? saved.session : null;
+	const mode = saved?.receiverMode === "external" || saved?.receiverMode === "poll" ? saved.receiverMode : "native";
+	const receiving = profile && saved && mode === "poll" ? {
+		mode,
+		sessionId: session,
+		state: "poll",
+		reason: "agent_checks_mail",
+		lastSuccessfulMailCheckAt: null,
+		liveness: "unknown"
+	} : profile && session && mode === "native" ? (() => {
+		const scope = notificationScope(profile.api_base_url, profile.api_key);
+		const listener = backgroundListenStatus({
+			configDir,
+			scope,
+			threadId: session
+		});
+		const mailOwner = readSharedMailOwner({ directory: join(configDir, "shared-mail", createHash("sha256").update(scope).digest("hex")) });
+		return {
+			mode,
+			sessionId: session,
+			state: listener.healthy ? listener.phase === "receiving" ? "running" : "degraded" : listener.reason === "restarting" ? "degraded" : listener.reason === "absent" ? "unknown" : "down",
+			reason: listener.reason ?? listener.failureCode,
+			failureCode: listener.failureCode,
+			detail: listener.detail ?? null,
+			lastSuccessfulMailCheckAt: mailOwner?.lastMailCheckAt ?? null,
+			liveness: listener.healthy && listener.phase === "receiving" ? "live" : "unknown",
+			listener
+		};
+	})() : profile && session ? (() => {
+		const hook = claudeWakeHookStatus({
+			configDir,
+			profileName,
+			agentAddress: profile.agent_address,
+			sessionId: session,
+			env
+		});
+		return {
+			mode,
+			sessionId: session,
+			state: hook.installed ? "unknown" : "down",
+			reason: hook.installed ? "hook_liveness_unverified" : "hook_missing",
+			detail: hook.installed ? null : "The receive hook for this session is missing, so mail will not wake this session. Run `primitive machine doctor --fix` to reinstall it.",
+			lastSuccessfulMailCheckAt: null,
+			liveness: "unknown",
+			hook
+		};
+	})() : {
+		mode: "unknown",
+		sessionId: null,
+		state: "unknown",
+		reason: "session_not_configured",
+		lastSuccessfulMailCheckAt: null,
+		liveness: "unknown"
+	};
+	return profile ? {
+		status: "configured",
+		identity: connectedAgentIdentity(profileName, profile),
+		receiving
+	} : {
+		status: "not_configured",
+		profileName
+	};
+}
+function parseAgentInvitation(input) {
+	try {
+		if (Buffer.byteLength(input) > MAX_INVITATION_BYTES) throw new Error();
+		const text = input.trim();
+		let token;
+		let base;
+		if (text.startsWith("{")) {
+			const value = JSON.parse(text);
+			if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error();
+			const row = value;
+			if (Object.keys(row).some((key) => key !== "token" && key !== "api_base_url")) throw new Error();
+			token = row.token;
+			base = row.api_base_url ?? "https://api.primitive.dev/v1";
+		} else {
+			const url = new URL(text);
+			if (url.username || url.password || url.search || url.pathname !== "/v1/agent-connections/setup") throw new Error();
+			const fragment = new URLSearchParams(url.hash.slice(1));
+			if (Array.from(fragment.keys()).length !== 1 || fragment.getAll("token").length !== 1) throw new Error();
+			token = fragment.get("token");
+			base = `${url.origin}/v1`;
+		}
+		if (typeof token !== "string" || token.length < 32 || token.length > 256 || /\s/.test(token) || Array.from(token).some((character) => character.charCodeAt(0) < 32 || character.charCodeAt(0) === 127)) throw new Error();
+		return {
+			token,
+			apiBaseUrl: connectedApiBaseUrl(base)
+		};
+	} catch {
+		throw new AgentConnectionSetupError("Pipe the private Primitive setup URL or a JSON object containing token and optional api_base_url to stdin. Invitation values are never accepted as command arguments.");
+	}
+}
+async function readAgentInvitation(input, isTTY) {
+	if (isTTY) throw new AgentConnectionSetupError("Pipe the private setup invitation to stdin.");
+	const chunks = [];
+	let size = 0;
+	for await (const chunk of input) {
+		const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+		size += bytes.length;
+		if (size > MAX_INVITATION_BYTES) throw new AgentConnectionSetupError("Setup invitation exceeds the input limit.");
+		chunks.push(bytes);
+	}
+	return Buffer.concat(chunks).toString("utf8");
+}
+async function readClaimResponse(response) {
+	const reader = response.body?.getReader();
+	if (!reader) throw new Error();
+	const chunks = [];
+	let size = 0;
+	try {
+		for (;;) {
+			const part = await reader.read();
+			if (part.done) break;
+			size += part.value.byteLength;
+			if (size > MAX_RESPONSE_BYTES$2) throw new Error();
+			chunks.push(part.value);
+		}
+		return JSON.parse(Buffer.concat(chunks).toString("utf8"));
+	} finally {
+		await reader.cancel().catch(() => void 0);
+	}
+}
+function profileFromClaim(value, invitation, invitationHash, now) {
+	const response = value;
+	const data = response?.data;
+	const connection = data?.connection;
+	if (response?.success !== true || !data || !connection || data.api_base_url !== invitation.apiBaseUrl || data.owner_address !== connection.owner_address || !["claimed", "connected"].includes(String(connection.status))) throw new Error();
+	let ownerMember;
+	try {
+		ownerMember = Object.hasOwn(data, "owner_member_address") ? parseOwnerMemberAddress(data.owner_member_address, mailAddress(data.owner_address), mailAddress(connection.address)) : void 0;
+	} catch {
+		ownerMember = void 0;
+	}
+	return parseConnectedAgentProfile({
+		version: 1,
+		auth_method: "agent_connection",
+		api_key: data.api_key,
+		api_base_url: data.api_base_url,
+		org_id: data.org_id,
+		agent_address: connection.address,
+		owner_address: data.owner_address,
+		...ownerMember === void 0 ? {} : { owner_member_address: ownerMember },
+		invitation_hash: invitationHash,
+		created_at: new Date(now()).toISOString(),
+		...data.presence_profile === void 0 ? {} : { presence_profile: data.presence_profile }
+	});
+}
+/** Claims once; saved identity is local configuration, not proof of email readiness. */
+async function connectAgent(params) {
+	const profileName = agentProfileName(params.profileName);
+	const invitation = parseAgentInvitation(params.invitation);
+	const invitationHash = createHash("sha256").update(invitation.apiBaseUrl).update("\0").update(invitation.token).digest("hex");
+	const directory = agentProfilesDirectory(params.configDir);
+	let release;
+	try {
+		privateMailDirectory(directory, true);
+		release = acquireListenLock(directory, "agent-connection-setup");
+	} catch {
+		throw new AgentConnectionSetupError("Agent setup is already running, or its private directory is unavailable. No invitation was submitted.");
+	}
+	try {
+		const existing = loadConnectedAgentProfile(params.configDir, profileName);
+		if (existing) {
+			if (existing.invitation_hash !== invitationHash) throw new AgentConnectionSetupError("This agent profile is already configured. Its identity and credentials were not changed. Use a separate profile for another invitation.");
+			return {
+				status: "already_configured",
+				identity: connectedAgentIdentity(profileName, existing)
+			};
+		}
+		privateMailDirectory(join(directory, "profiles"), true);
+		privateMailDirectory(agentProfileDirectory(params.configDir, profileName), 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,
+			status: "attempted"
+		});
+		try {
+			const response = await (params.fetch ?? fetch)(`${invitation.apiBaseUrl}/agent-connections/claim`, {
+				method: "POST",
+				redirect: "error",
+				signal: AbortSignal.timeout(25e3),
+				headers: {
+					"content-type": "application/json",
+					accept: "application/json"
 				},
 				body: JSON.stringify({
 					token: invitation.token,
@@ -35885,7 +36839,7 @@ function matchesContactSelector(input, sender) {
 }
 //#endregion
 //#region src/oclif/contact-policy.ts
-function record$3(value) {
+function record$2(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("Invalid contact policy.");
 	return value;
 }
@@ -35894,11 +36848,11 @@ function fingerprint(value) {
 	return value;
 }
 function document(value, organization) {
-	const row = record$3(value);
+	const row = record$2(value);
 	if (!Array.isArray(row.rules) || row.rules.length > 100 || !(typeof row.allow_contact_requests === "boolean" || !organization && row.allow_contact_requests === null)) throw new Error("Invalid contact policy document.");
 	const seen = /* @__PURE__ */ new Set();
 	const rules = row.rules.map((value) => {
-		const rule = record$3(value);
+		const rule = record$2(value);
 		if (typeof rule.pattern !== "string" || rule.effect !== "allow" && rule.effect !== "silence") throw new Error("Invalid contact policy rule.");
 		const pattern = canonicalContactSelector({
 			kind: "pattern",
@@ -35939,7 +36893,7 @@ function document(value, organization) {
 	};
 }
 function parseAgentContactPolicy(value, recipient) {
-	const row = record$3(value);
+	const row = record$2(value);
 	if (row.agent_address !== recipient || typeof row.allow_contact_requests !== "boolean") throw new Error("Contact policy recipient mismatch.");
 	const org = document(row.org_policy, true);
 	const agent = document(row.agent_policy, false);
@@ -36225,6 +37179,11 @@ function createNotificationContactPolicy(options) {
 const SUBJECT = "Connect your agent to Primitive";
 const MARKER = /\bprimitive-connection:([a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}):([1-9]\d*)\b/g;
 const fail = (message) => new AgentConnectionSetupError(message);
+const RECEIVER_MODES = [
+	"native",
+	"external",
+	"poll"
+];
 const RECEIPT_STATUSES = new Set([
 	"queued",
 	"submitted_to_agent",
@@ -36333,7 +37292,7 @@ function parseState(value) {
 		"receipt"
 	];
 	const row = mailObject(value, value && typeof value === "object" && Object.hasOwn(value, "receiverMode") ? [...keys, "receiverMode"] : keys);
-	if (row.version !== 1 || row.receiverMode !== void 0 && !["native", "external"].includes(String(row.receiverMode)) || typeof row.contactRequests !== "boolean" || ![
+	if (row.version !== 1 || row.receiverMode !== void 0 && !RECEIVER_MODES.includes(row.receiverMode) || typeof row.contactRequests !== "boolean" || ![
 		"waiting",
 		"sending",
 		"sent"
@@ -36348,7 +37307,7 @@ function parseState(value) {
 	if (!/^[a-f0-9]{64}$/.test(invitationHash)) throw fail("Saved setup identity is invalid.");
 	const state = {
 		version: 1,
-		session: mailId(row.session),
+		session: row.session === null && row.receiverMode === "poll" ? null : mailId(row.session),
 		receiverMode: row.receiverMode ?? "native",
 		invitationHash,
 		since: mailTime(row.since),
@@ -36569,7 +37528,7 @@ function defaults$1() {
 */
 function refuseSetupConflicts(state, params) {
 	const conflicts = [
-		...state.session !== params.session ? [`--session (this profile is bound to session ${state.session})`] : [],
+		...(params.session === void 0 ? state.receiverMode !== "poll" : state.session !== params.session) ? [state.session ? `--session (this profile is bound to session ${state.session})` : "--session (this profile's setup binds no session)"] : [],
 		...params.receiverMode !== void 0 && state.receiverMode !== params.receiverMode ? [`--receiver ${params.receiverMode} (saved: ${state.receiverMode})`] : [],
 		...params.contactRequests !== void 0 && state.contactRequests !== params.contactRequests ? [state.contactRequests ? "contact requests off (saved setup has --contact-requests)" : "--contact-requests (saved setup did not enable it)"] : []
 	];
@@ -36578,7 +37537,7 @@ function refuseSetupConflicts(state, params) {
 /** One resumable operation owns setup plumbing; it never stores or replays the invitation. */
 async function setupAgent(params) {
 	const profileName = agentProfileName(params.profileName);
-	if (!SESSION_UUID$1.test(params.session)) throw fail("--session requires the exact loaded session UUID.");
+	if (params.session !== void 0 && !SESSION_UUID$1.test(params.session)) throw fail("--session requires the exact loaded session UUID.");
 	if (params.resume ? params.invitation !== void 0 : params.invitation === void 0) throw fail("Use an invitation on stdin for setup, or --resume without an invitation.");
 	const timeoutMs = params.timeoutMs ?? 3e4;
 	if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 0 || timeoutMs > 12e4) throw fail("Setup timeout must be between zero and two minutes.");
@@ -36595,7 +37554,9 @@ async function setupAgent(params) {
 		saved = value === null ? null : parseState(value);
 	} catch {}
 	if (saved) refuseSetupConflicts(saved, params);
-	if ((params.receiverMode ?? (params.resume ? saved?.receiverMode : void 0) ?? "native") === "native") try {
+	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 {
 		await dependencies.preflight(params.session);
 	} catch {
 		throw fail("This exact session is not available for native receiving. No invitation was claimed. Open a supported session and retry setup.");
@@ -36616,7 +37577,7 @@ async function setupAgent(params) {
 			if (!state) {
 				state = {
 					version: 1,
-					session: params.session,
+					session: params.session ?? null,
 					receiverMode: params.receiverMode ?? "native",
 					invitationHash: hash,
 					since: (/* @__PURE__ */ new Date(dependencies.now() - 15 * 6e4)).toISOString(),
@@ -36666,7 +37627,7 @@ async function setupAgent(params) {
 		].includes(state.receipt?.status ?? "") ? "reply_failed" : ["unknown", "wait_timeout"].includes(state.receipt?.status ?? "") ? "delivery_unknown" : "reply_submitted" : state?.phase === "sending" ? "send_unknown" : "challenge_pending";
 		const result = (receiving, ownerNotifications) => ({
 			identity: context.identity,
-			sessionId: params.session,
+			sessionId: params.session ?? state?.session ?? null,
 			verification: {
 				state: confirmed && submittedState() === "reply_submitted" ? "verified" : submittedState(),
 				...confirmed ? { verifiedAt: confirmed.verifiedAt } : {},
@@ -36677,7 +37638,7 @@ async function setupAgent(params) {
 			},
 			receiving: { state: receiving },
 			...ownerNotifications ? { ownerNotifications } : {},
-			resumeCommand: `primitive agent connect --profile ${profileName} --session ${params.session}${state?.receiverMode === "external" ? " --receiver external" : ""} --resume${state?.contactRequests ? " --contact-requests" : ""} --json`,
+			resumeCommand: `primitive agent connect --profile ${profileName}${state?.session ? ` --session ${state.session}` : ""}${state?.receiverMode === "external" || state?.receiverMode === "poll" ? ` --receiver ${state.receiverMode}` : ""} --resume${state?.contactRequests ? " --contact-requests" : ""} --json`,
 			guidance: confirmed ? "Primitive verified this connection. Receiving health is reported separately. Keep this profile for all mail commands." : submittedState() === "reply_submitted" ? "The verification reply was submitted and Primitive has not confirmed it yet. Verification usually completes within seconds; check it later with GET /agent-connections/me. Receiving health is reported separately. Keep this profile for all mail commands." : "Reply submission is not proof of delivery or app verification. Receiving health is reported separately. Keep this profile for all mail commands."
 		});
 		const key = `connection-verification-${state.invitationHash}`;
@@ -36711,14 +37672,14 @@ async function setupAgent(params) {
 		}
 		const ownerNotifications = await dependencies.enableOwner(context);
 		let healthy = false;
-		if (state.receiverMode !== "external") try {
-			healthy = await dependencies.startListener(profileName, params.session, state.contactRequests, params.configDir);
+		if ((state.receiverMode ?? "native") === "native" && state.session) try {
+			healthy = await dependencies.startListener(profileName, state.session, state.contactRequests, params.configDir);
 		} catch {}
 		if (verificationTimeoutMs > 0 && submittedState() === "reply_submitted") {
 			const check = await awaitVerification(context, dependencies, verificationTimeoutMs);
 			if (check.state === "verified") confirmed = { verifiedAt: check.verifiedAt };
 		}
-		return result(state.receiverMode === "external" ? "external_setup_required" : healthy ? "healthy" : "not_ready", ownerNotifications);
+		return result(state.receiverMode === "external" ? "external_setup_required" : state.receiverMode === "poll" ? "poll" : healthy ? "healthy" : "not_ready", ownerNotifications);
 	} finally {
 		release();
 	}
@@ -36814,7 +37775,8 @@ const AGENT_CONNECT_CAPABILITIES = [
 	"claude_external_hooks",
 	"bundled_skill_install",
 	"agent_info_seed",
-	"resume"
+	"resume",
+	"poll_receiver"
 ];
 const AGENT_INFO_NOTE = "AGENT_INFO";
 const MAX_NAME_LENGTH = 80;
@@ -36837,7 +37799,7 @@ function savedSetup(configDir, profileName) {
 		if (!saved || typeof saved !== "object" || Array.isArray(saved)) return null;
 		const row = saved;
 		return {
-			receiverMode: row.receiverMode === "external" ? "external" : "native",
+			receiverMode: row.receiverMode === "external" || row.receiverMode === "poll" ? row.receiverMode : "native",
 			contactRequests: row.contactRequests === true
 		};
 	} catch {
@@ -36861,6 +37823,20 @@ function clearPendingAgentInfo(path) {
 function defaultAgentProfileName(session) {
 	return `session-${session.toLowerCase()}`;
 }
+/**
+* The profile for a setup that binds no session. It is derived from the
+* invitation, so running the same invitation again finds the same profile and
+* its saved claim instead of claiming twice. A one-way hash prefix reveals
+* nothing usable about the invitation.
+*/
+function invitationProfileName(invitation) {
+	const parsed = parseAgentInvitation(invitation);
+	return `connection-${createHash("sha256").update(parsed.apiBaseUrl).update("\0").update(parsed.token).digest("hex").slice(0, 12)}`;
+}
+/** The command that checks a poll-receiving profile for new mail. */
+function pollCheckCommand(invocation, profileName) {
+	return `PRIMITIVE_AGENT_PROFILE=${profileName} ${invocation} agent check-mail --json`;
+}
 /** A short private role note; never a transcript or secret. */
 function agentInfoValue(name, info) {
 	const clean = (value, max, label) => {
@@ -36948,11 +37924,15 @@ async function runAgentConnect(options) {
 		...defaults(options),
 		...Object.fromEntries(Object.entries(options.dependencies ?? {}).filter(([, value]) => value !== void 0))
 	};
-	if (!SESSION_UUID$1.test(options.session)) throw new AgentConnectionSetupError("--session requires the exact loaded session UUID.");
-	const runtime = detectAgentRuntime(options.session, env);
-	const profileName = agentProfileName(options.profileName ?? defaultAgentProfileName(options.session));
-	const receiver = options.receiver ?? (options.resume ? savedSetup(options.configDir, profileName)?.receiverMode ?? null : null) ?? (runtime === "claude" ? "external" : "native");
-	if (receiver === "external" && env.CLAUDE_CODE_SESSION_ID?.trim().toLowerCase() !== options.session.toLowerCase()) throw new AgentConnectionSetupError("External receiving requires this exact Claude session ID. No invitation was claimed.");
+	const session = options.session?.trim() ? options.session : void 0;
+	if (session !== void 0 && !SESSION_UUID$1.test(session)) throw new AgentConnectionSetupError("--session requires the exact loaded session UUID.");
+	if (session === void 0 && options.receiver && options.receiver !== "poll") throw new AgentConnectionSetupError(`--receiver ${options.receiver} requires the exact loaded session UUID. Without one, use --receiver poll. No invitation was claimed.`);
+	if (session === void 0 && options.resume && !options.profileName) throw new AgentConnectionSetupError("Pass --profile to resume a setup that binds no session.");
+	const runtime = session ? detectAgentRuntime(session, env) : null;
+	const invitation = options.resume || session || options.profileName ? void 0 : await options.readInvitation();
+	const profileName = agentProfileName(options.profileName ?? (session ? defaultAgentProfileName(session) : invitationProfileName(invitation ?? "")));
+	const receiver = options.receiver ?? (options.resume ? savedSetup(options.configDir, profileName)?.receiverMode ?? null : null) ?? (!session ? "poll" : runtime === "claude" ? "external" : "native");
+	if (receiver === "external" && env.CLAUDE_CODE_SESSION_ID?.trim().toLowerCase() !== session?.toLowerCase()) throw new AgentConnectionSetupError("External receiving requires this exact Claude session ID. No invitation was claimed.");
 	const agentInfo = agentInfoValue(options.name, options.info);
 	const skipped = [];
 	let skill;
@@ -36989,11 +37969,11 @@ async function runAgentConnect(options) {
 	const result = await dependencies.setupAgent({
 		configDir: options.configDir,
 		profileName,
-		session: options.session,
+		...session ? { session } : {},
 		receiverMode: receiver,
 		resume: options.resume,
 		contactRequests: options.contactRequests,
-		...options.resume ? {} : { invitation: await options.readInvitation() }
+		...options.resume ? {} : { invitation: invitation ?? await options.readInvitation() }
 	});
 	const verified = verificationReplySubmitted(result.verification.state);
 	const ownerMemberAddress = await dependencies.refreshOwnerMemberAddress(result.identity.profileName);
@@ -37007,7 +37987,7 @@ async function runAgentConnect(options) {
 		configDir: options.configDir,
 		profileName: result.identity.profileName,
 		agentAddress: result.identity.agentAddress,
-		sessionId: options.session,
+		sessionId: session ?? "",
 		env
 	});
 	else skipped.push({
@@ -37053,22 +38033,27 @@ async function runAgentConnect(options) {
 			reason: "already_present"
 		});
 	}
+	const invocation = options.invocation ?? "primitive";
 	const receiving = receiver === "external" ? {
 		...result.receiving,
 		mode: "external",
 		hook: externalHook
+	} : receiver === "poll" ? {
+		...result.receiving,
+		mode: "poll",
+		checkCommand: pollCheckCommand(invocation, result.identity.profileName)
 	} : {
 		...result.receiving,
 		mode: "native",
 		mailCheck: mailCheck?.state ?? "not_started",
 		lastSuccessfulMailCheckAt: mailCheck?.lastSuccessfulMailCheckAt ?? null
 	};
-	const receiverReady = receiver === "external" ? externalHook === "installed_unverified" : result.receiving.state === "healthy";
+	const receiverReady = receiver === "external" ? externalHook === "installed_unverified" : receiver === "poll" || result.receiving.state === "healthy";
 	const resumeCommand = [
-		options.invocation ?? "primitive",
+		invocation,
 		"agent connect",
 		`--profile ${result.identity.profileName}`,
-		`--session ${options.session}`,
+		...session ? [`--session ${session}`] : [],
 		`--receiver ${receiver}`,
 		"--resume",
 		...options.contactRequests ?? savedSetup(options.configDir, profileName)?.contactRequests ? ["--contact-requests"] : [],
@@ -37083,7 +38068,7 @@ async function runAgentConnect(options) {
 		ownerAddress: result.identity.ownerAddress,
 		ownerMemberAddress,
 		profile: result.identity.profileName,
-		sessionId: options.session,
+		sessionId: session ?? null,
 		runtime,
 		cli: {
 			version: options.cliVersion,
@@ -37105,15 +38090,16 @@ async function runAgentConnect(options) {
 //#endregion
 //#region src/oclif/commands/agent-connect.ts
 /** npx runs the CLI from its cache; resume through npx too so the command works without a global install. */
-function invocation(entry) {
+function invocation$1(entry) {
 	return entry && /[\\/]_npx[\\/]/.test(entry) ? "npx -y primitive@latest" : "primitive";
 }
 var AgentConnectCommand = class AgentConnectCommand extends Command {
-	static description = "Connect this coding session to Primitive in one call. With --session, the command checks this CLI's capabilities, installs or refreshes the matching primitive-connect skill for the detected runtime (Claude Code or Codex) from files bundled in this CLI, claims the owner's private setup invitation from piped stdin, answers one authenticated setup challenge, enables owner notifications, starts receiving, seeds a private AGENT_INFO note from --name and --info when absent, and prints one JSON result. The receiver defaults to external hooks in Claude Code and the native background listener elsewhere. Native receiving starts or reuses a supervised background listener and waits briefly for its first successful mail check; external receiving installs the exact Claude session's fail-open Stop hook and resume SessionStart hook after the verification reply; a real idle mail event must still verify wake. The profile defaults to session-<session>. --resume continues saved progress without reading stdin or replaying a claim or uncertain verification send. After the reply is submitted it waits up to a minute for the server to confirm the connection and reports verification.state verified, or reply_submitted while confirmation is still pending. Verification is separate from receiver health. Both official production (https://api.primitive.dev/v1) and staging (https://api.primitive-staging-1.com/v1) invitations pin their API origin. Never pass an invitation as a command argument. Select the saved identity with PRIMITIVE_AGENT_PROFILE. Use --profile with --status --json to inspect saved identity and local receiver health offline.";
+	static description = "Connect this coding session to Primitive in one call. With --session, the command checks this CLI's capabilities, installs or refreshes the matching primitive-connect skill for the detected runtime (Claude Code or Codex) from files bundled in this CLI, claims the owner's private setup invitation from piped stdin, answers one authenticated setup challenge, enables owner notifications, starts receiving, seeds a private AGENT_INFO note from --name and --info when absent, and prints one JSON result. The receiver defaults to external hooks in Claude Code and the native background listener elsewhere. Without a session (no --session, or an empty one) the receiver is poll: for runtimes with no local session ID or hooks, such as a cloud-hosted conversation whose commands run in a separate sandbox, the invitation is claimed and verified the same way, nothing is installed, and the result's receiving.checkCommand is the command the agent runs to check for new mail at the start of each turn and after it sends. Native receiving starts or reuses a supervised background listener and waits briefly for its first successful mail check; external receiving installs the exact Claude session's fail-open Stop hook and resume SessionStart hook after the verification reply; a real idle mail event must still verify wake. The profile defaults to session-<session>, or to connection-<invitation hash prefix> without a session. --resume continues saved progress without reading stdin or replaying a claim or uncertain verification send. After the reply is submitted it waits up to a minute for the server to confirm the connection and reports verification.state verified, or reply_submitted while confirmation is still pending. Verification is separate from receiver health. Both official production (https://api.primitive.dev/v1) and staging (https://api.primitive-staging-1.com/v1) invitations pin their API origin. Never pass an invitation as a command argument. Select the saved identity with PRIMITIVE_AGENT_PROFILE. Use --profile with --status --json to inspect saved identity and local receiver health offline.";
 	static summary = "Connect and verify an agent address";
 	static examples = [
 		"<%= config.bin %> agent connect --session \"$CODEX_THREAD_ID\" --name Research --info \"Reviews pull requests\" --json < private-invitation.txt",
 		"<%= config.bin %> agent connect --session \"$CLAUDE_CODE_SESSION_ID\" --contact-requests --json < private-invitation.txt",
+		"<%= config.bin %> agent connect --receiver poll --name Research --json < private-invitation.txt",
 		"<%= config.bin %> agent connect --profile work --session 11111111-1111-4111-8111-111111111111 --contact-requests --json < private-invitation.txt",
 		"<%= config.bin %> agent connect --profile work --session 11111111-1111-4111-8111-111111111111 --contact-requests --resume --json",
 		"<%= config.bin %> agent connect --profile work --session 11111111-1111-4111-8111-111111111111 --receiver external --contact-requests --json < private-invitation.txt",
@@ -37122,33 +38108,31 @@ var AgentConnectCommand = class AgentConnectCommand extends Command {
 		"PRIMITIVE_AGENT_PROFILE=work <%= config.bin %> whoami --json"
 	];
 	static flags = {
-		profile: Flags.string({ description: "Local agent profile name; defaults to session-<session> with --session. Existing OAuth login is preserved" }),
+		profile: Flags.string({ description: "Local agent profile name; defaults to session-<session> with --session, or connection-<invitation hash prefix> for poll receiving. Existing OAuth login is preserved" }),
 		session: Flags.string({
-			description: "Exact current session UUID; verify email and configure receiving after claiming",
+			description: "Exact current session UUID; verify email and configure receiving after claiming. Omit it (or pass it empty) when the runtime exposes none, which selects poll receiving",
 			exclusive: ["status"]
 		}),
 		receiver: Flags.string({
-			description: "Native starts a supported session receiver; external installs the exact Claude session's fail-open Stop hook and resume SessionStart hook. Defaults to external in Claude Code and native elsewhere",
-			options: ["native", "external"],
-			dependsOn: ["session"]
+			description: "Native starts a supported session receiver; external installs the exact Claude session's fail-open Stop hook and resume SessionStart hook; poll installs nothing and the agent checks for mail itself with `agent check-mail`. Defaults to external in Claude Code, native elsewhere, and poll without a session",
+			options: [...RECEIVER_MODES],
+			exclusive: ["status"]
 		}),
 		resume: Flags.boolean({
 			description: "Resume this session's saved setup without reading stdin, claiming again, or resending verification",
-			dependsOn: ["session"],
 			exclusive: ["status"]
 		}),
 		"contact-requests": Flags.boolean({
 			description: "Receive owner-enabled first contact requests in this session; grants no task authority",
-			dependsOn: ["session"],
 			exclusive: ["status"]
 		}),
 		name: Flags.string({
 			description: "Short agent name for a private AGENT_INFO note, written only when the note is absent",
-			dependsOn: ["session"]
+			exclusive: ["status"]
 		}),
 		info: Flags.string({
 			description: "Short role and capability description for a private AGENT_INFO note, written only when the note is absent",
-			dependsOn: ["session"]
+			exclusive: ["status"]
 		}),
 		skill: Flags.boolean({
 			description: "Install or refresh the primitive-connect skill bundled with this CLI for the detected runtime",
@@ -37157,13 +38141,14 @@ var AgentConnectCommand = class AgentConnectCommand extends Command {
 		}),
 		project: Flags.boolean({
 			description: "Install the skill into this project (.claude/skills or .agents/skills) instead of the user skills folder",
-			dependsOn: ["session"]
+			exclusive: ["status"]
 		}),
 		status: Flags.boolean({ description: "Read saved identity and local receiver health offline without reading stdin" }),
 		json: Flags.boolean({ description: "Print setup status and identity metadata, never the credential" })
 	};
 	async run() {
 		const { flags } = await this.parse(AgentConnectCommand);
+		let pollProfile;
 		try {
 			if (flags.status) {
 				if (!flags.profile) throw new AgentConnectionSetupError("Pass --profile with --status.");
@@ -37177,15 +38162,24 @@ var AgentConnectCommand = class AgentConnectCommand extends Command {
 				}
 				return;
 			}
-			if (flags.session) {
+			const session = flags.session?.trim() || void 0;
+			if (!(flags.session === void 0 && flags.profile !== void 0 && flags.receiver === void 0 && !flags.resume && !flags["contact-requests"] && flags.name === void 0 && flags.info === void 0)) {
+				if (!session && (flags.receiver === "native" || flags.receiver === "external")) throw new AgentConnectionSetupError(`--receiver ${flags.receiver} requires the exact loaded session UUID. Without one, use --receiver poll. No invitation was claimed.`);
+				let readInvitation = () => readAgentInvitation(process.stdin, process.stdin.isTTY);
+				if (!session && !flags.resume) if (flags.profile) pollProfile = flags.profile;
+				else {
+					const text = await readInvitation();
+					pollProfile = invitationProfileName(text);
+					readInvitation = async () => text;
+				}
 				const output = await runAgentConnect({
 					configDir: this.config.configDir,
 					packageRoot: this.config.root,
 					cliVersion: this.config.version,
 					cliPath: process.argv[1] ?? "",
-					invocation: invocation(process.argv[1]),
-					session: flags.session,
-					profileName: flags.profile,
+					invocation: invocation$1(process.argv[1]),
+					session,
+					profileName: flags.profile ?? pollProfile,
 					receiver: flags.receiver,
 					resume: flags.resume,
 					contactRequests: flags["contact-requests"],
@@ -37193,21 +38187,23 @@ var AgentConnectCommand = class AgentConnectCommand extends Command {
 					info: flags.info,
 					skill: flags.skill,
 					project: flags.project,
-					readInvitation: () => readAgentInvitation(process.stdin, process.stdin.isTTY)
+					readInvitation
 				});
 				const external = output.receiving.mode === "external";
+				const poll = output.receiving.mode === "poll";
 				if (flags.json) this.log(JSON.stringify(output));
 				else {
 					this.log(`Agent ${output.address}: verification ${output.verification.state}; receiving ${output.receiving.state}; skill ${output.skill.state}.`);
 					this.log(`Select it with ${output.selectProfile}.`);
 					if (output.ownerNotifications === "silenced") this.log("Owner notifications remain silenced by the existing preference or policy.");
 					if (external && verificationReplySubmitted(output.verification.state)) this.log(output.externalHook === "installed_unverified" ? "External receive hook installed. Idle wake still needs a live mail check." : "External receive hook is unavailable. Pairing may complete, but this session will not wake automatically.");
+					if (poll && "checkCommand" in output.receiving) this.log(`Nothing wakes this session for new mail. Check it at the start of each turn and after sending with: ${output.receiving.checkCommand}`);
 					if (output.status !== "connected") this.log(`Resume: ${output.resumeCommand}`);
 				}
-				if (external && output.externalHook !== "installed_unverified" || !external && output.receiving.state !== "healthy" || !verificationReplySubmitted(output.verification.state)) process.exitCode = 2;
+				if (external && output.externalHook !== "installed_unverified" || !external && !poll && output.receiving.state !== "healthy" || !verificationReplySubmitted(output.verification.state)) process.exitCode = 2;
 				return;
 			}
-			if (!flags.profile) throw new AgentConnectionSetupError("Pass --session to connect this session, or --profile for a claim-only or status check.");
+			if (!flags.profile) throw new AgentConnectionSetupError("Pass --profile for claim-only.");
 			const claimed = await connectAgent({
 				configDir: this.config.configDir,
 				profileName: flags.profile,
@@ -37224,7 +38220,7 @@ var AgentConnectCommand = class AgentConnectCommand extends Command {
 				this.log(result.ownerReportGuidance);
 			}
 		} catch (error) {
-			throw new Errors.CLIError(error instanceof AgentConnectionSetupError ? error.message : flags.session ? `Setup paused. Preserve the private profile and run ${invocation(process.argv[1])} agent connect --profile ${flags.profile ?? defaultAgentProfileName(flags.session)} --session ${flags.session}${flags.receiver ? ` --receiver ${flags.receiver}` : ""} --resume --json. Do not manually resend verification or reclaim the invitation.` : "Agent setup did not complete. Preserve the private profile and request a fresh owner invitation if a claim may have been submitted.", { exit: 1 });
+			throw new Errors.CLIError(error instanceof AgentConnectionSetupError ? error.message : flags.session?.trim() ? `Setup paused. Preserve the private profile and run ${invocation$1(process.argv[1])} agent connect --profile ${flags.profile ?? defaultAgentProfileName(flags.session.trim())} --session ${flags.session.trim()}${flags.receiver ? ` --receiver ${flags.receiver}` : ""} --resume --json. Do not manually resend verification or reclaim the invitation.` : pollProfile ? `Setup paused. Preserve the private profile and run ${invocation$1(process.argv[1])} agent connect --profile ${pollProfile} --receiver poll --resume --json. Do not manually resend verification or reclaim the invitation.` : "Agent setup did not complete. Preserve the private profile and request a fresh owner invitation if a claim may have been submitted.", { exit: 1 });
 		}
 	}
 };
@@ -37413,6 +38409,7 @@ function boundSession(directory, profile) {
 	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$1.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();
 }
@@ -37580,7 +38577,7 @@ function savedEnrollment(value) {
 		"ownerAddress"
 	];
 	if (row?.version === 2) keys.push("createRequestId", "continueAttempted");
-	if (!row || Object.keys(row).length !== keys.length || keys.some((key) => !Object.hasOwn(row, key)) || row.version !== 1 && row.version !== 2 || row.version === 2 && (typeof row.createRequestId !== "string" || !SESSION_UUID$1.test(row.createRequestId) || typeof row.continueAttempted !== "boolean") || typeof row.session !== "string" || !SESSION_UUID$1.test(row.session) || row.profile !== `session-${row.session}` || typeof row.name !== "string" || !validName(row.name) || !(typeof row.address === "string" && validAddress(row.address) || row.version === 2 && row.address === null && row.phase === "create_attempted") || typeof row.orgId !== "string" || !row.orgId || typeof row.grantId !== "string" || !row.grantId || typeof row.apiBaseUrl !== "string" || !["native", "external"].includes(String(row.receiverMode)) || typeof row.contactRequests !== "boolean" || typeof row.startedAt !== "string" || !Number.isFinite(Date.parse(row.startedAt)) || !["create_attempted", "setup_attempted"].includes(String(row.phase)) || row.phase === "create_attempted" && (row.invitationHash !== null || row.ownerAddress !== null) || row.phase === "setup_attempted" && (typeof row.address !== "string" || typeof row.invitationHash !== "string" || !/^[a-f0-9]{64}$/.test(row.invitationHash) || typeof row.ownerAddress !== "string" || !row.ownerAddress.includes("@"))) throw refuse("Saved enrollment state is invalid. Preserve its private files.");
+	if (!row || Object.keys(row).length !== keys.length || keys.some((key) => !Object.hasOwn(row, key)) || row.version !== 1 && row.version !== 2 || row.version === 2 && (typeof row.createRequestId !== "string" || !SESSION_UUID$1.test(row.createRequestId) || typeof row.continueAttempted !== "boolean") || typeof row.session !== "string" || !SESSION_UUID$1.test(row.session) || row.profile !== `session-${row.session}` || typeof row.name !== "string" || !validName(row.name) || !(typeof row.address === "string" && validAddress(row.address) || row.version === 2 && row.address === null && row.phase === "create_attempted") || typeof row.orgId !== "string" || !row.orgId || typeof row.grantId !== "string" || !row.grantId || typeof row.apiBaseUrl !== "string" || !RECEIVER_MODES.includes(row.receiverMode) || typeof row.contactRequests !== "boolean" || typeof row.startedAt !== "string" || !Number.isFinite(Date.parse(row.startedAt)) || !["create_attempted", "setup_attempted"].includes(String(row.phase)) || row.phase === "create_attempted" && (row.invitationHash !== null || row.ownerAddress !== null) || row.phase === "setup_attempted" && (typeof row.address !== "string" || typeof row.invitationHash !== "string" || !/^[a-f0-9]{64}$/.test(row.invitationHash) || typeof row.ownerAddress !== "string" || !row.ownerAddress.includes("@"))) throw refuse("Saved enrollment state is invalid. Preserve its private files.");
 	connectedApiBaseUrl(row.apiBaseUrl);
 	if (row.ownerAddress !== null) try {
 		if (mailAddress(row.ownerAddress) !== row.ownerAddress) throw new Error();
@@ -37606,6 +38603,7 @@ function resolvedEnrollment(state) {
 	};
 }
 async function preflight(session, receiver, env) {
+	if (receiver === "poll") return;
 	if (receiver === "external") {
 		if (env.CLAUDE_CODE_SESSION_ID !== session) throw refuse("External receiving requires this exact Claude session ID. No address was created.");
 		return;
@@ -38036,6 +39034,10 @@ async function enrollAgent(params) {
 }
 //#endregion
 //#region src/oclif/commands/agent-enroll.ts
+/** npx runs the CLI from its cache; print follow-up commands the same way. */
+function invocation(entry) {
+	return entry && /[\\/]_npx[\\/]/.test(entry) ? "npx -y primitive@latest" : "primitive";
+}
 var AgentEnrollCommand = class AgentEnrollCommand extends Command {
 	static summary = "Give this coding session an address in your organization";
 	static description = "On this trusted machine, use the saved member OAuth login to create one address for the exact loaded session, claim its one-use invitation privately, answer the email challenge, and poll the owner's connection list for confirmed pairing. Native receiving starts when supported. With --receiver external in the exact Claude session, install a fail-open Stop hook and resume SessionStart hook in that runtime's settings after the verification reply; idle wake remains unverified until tested with real mail. With --contact-requests, the login conditionally enables first-contact intake for this exact address after verification, preserving existing policy rules. An explicit disable or uncertain policy update is reported separately without losing pairing or receiver setup. The server allocates a readable address. An uncertain creation resumes the same saved request; recovered results do not include another invitation. Use --continue-setup once to explicitly continue a recovered pending connection. An uncertain continuation or claim is held for owner recovery, never repeated automatically. Requires a verified Primitive-managed domain. This command does not accept API keys, a connection profile, or an invitation argument.";
@@ -38048,8 +39050,8 @@ var AgentEnrollCommand = class AgentEnrollCommand extends Command {
 		name: Flags.string({ description: "Short agent display name; defaults to Coding agent" }),
 		"continue-setup": Flags.boolean({ description: "Explicitly issue one invitation only if the recovered agent is still pending; never reconnect a claimed agent" }),
 		receiver: Flags.string({
-			options: ["native", "external"],
-			description: "Native session receiver, or external runtime event hook"
+			options: [...RECEIVER_MODES],
+			description: "Native session receiver, external runtime event hook, or poll: nothing is installed and the agent checks for mail itself with `agent check-mail`"
 		}),
 		"contact-requests": Flags.boolean({ description: "Enable this agent's first-contact policy with the saved member login, then receive relevant requests" }),
 		json: Flags.boolean({ description: "Print status without credentials or invitation" })
@@ -38072,7 +39074,15 @@ var AgentEnrollCommand = class AgentEnrollCommand extends Command {
 				agentAddress: result.identity.agentAddress,
 				sessionId: flags.session
 			}) : null;
-			const output = {
+			const output = result.receiving.state === "poll" ? {
+				...result,
+				receiving: {
+					...result.receiving,
+					mode: "poll",
+					checkCommand: pollCheckCommand(invocation(process.argv[1]), result.identity.profileName)
+				},
+				externalHook
+			} : {
 				...result,
 				externalHook
 			};
@@ -38086,9 +39096,10 @@ var AgentEnrollCommand = class AgentEnrollCommand extends Command {
 				if (externalHook === "installed_unverified") this.log("External receive hook installed for this runtime. Idle wake still needs a live mail check.");
 				else if (externalHook === "unavailable") this.log("Could not install the external receive hook. Pairing is confirmed, but later mail will not wake this session automatically.");
 				if (result.connection.status !== "connected") this.log("Pairing is not yet confirmed. Rerun this command with the same options to resume the saved session; do not create another address.");
+				else if ("checkCommand" in output.receiving) this.log(`Nothing wakes this session for new mail. Check it at the start of each turn and after sending with: ${output.receiving.checkCommand}`);
 				else if (result.receiving.state !== "healthy") this.log("Pairing is confirmed; receiving needs separate setup or recovery.");
 			}
-			if (externalHook === "unavailable" || flags["contact-requests"] && result.contactRequestPolicy !== "enabled" || result.connection.status !== "connected" || flags.receiver !== "external" && result.receiving.state !== "healthy") process.exitCode = 2;
+			if (externalHook === "unavailable" || flags["contact-requests"] && result.contactRequestPolicy !== "enabled" || result.connection.status !== "connected" || flags.receiver !== "external" && flags.receiver !== "poll" && result.receiving.state !== "healthy") process.exitCode = 2;
 		} catch (error) {
 			throw new Errors.CLIError(error instanceof AgentConnectionSetupError ? error.message : "Enrollment paused. Preserve this session's private profile and inspect the pending agent in the app before retrying. No second address was requested automatically.", { exit: 1 });
 		}
@@ -38482,6 +39493,33 @@ function enrollmentAddress(configDir, profileName) {
 		};
 	}
 }
+/**
+* Saved profiles, other than the session's own, whose setup says they were
+* connected for this exact session. Sorted for a stable choice.
+*/
+function profilesBoundToSession(configDir, sessionId, ownProfile, mode) {
+	let names;
+	try {
+		names = readdirSync(join(agentProfilesDirectory(configDir), "profiles"));
+	} catch {
+		return [];
+	}
+	const bound = [];
+	for (const name of names.sort()) {
+		if (name === ownProfile) continue;
+		try {
+			const setup = readMailJson(join(agentProfileDirectory(configDir, name), "setup.json"));
+			const saved = setup?.receiverMode === void 0 ? "native" : setup.receiverMode;
+			if (typeof setup?.session !== "string" || setup.session.toLowerCase() !== sessionId || saved !== mode) continue;
+			const profile = loadConnectedAgentProfile(configDir, name);
+			if (profile) bound.push({
+				name,
+				profile
+			});
+		} catch {}
+	}
+	return bound;
+}
 /** `agent disconnect` already confirmed revocation of this profile's credential. */
 function disconnectConfirmedLocally(configDir, profileName) {
 	try {
@@ -38618,7 +39656,34 @@ async function registerSession(options) {
 		detail: "The session ID is not a UUID. Nothing was changed."
 	};
 	const sessionId = session.toLowerCase();
-	const profileName = `session-${sessionId}`;
+	const ownProfile = `session-${sessionId}`;
+	let profileName = ownProfile;
+	try {
+		const saved = readSessionRecord(options.configDir, sessionId);
+		if (saved?.createdBy === "existing" && saved.profile !== ownProfile) profileName = agentProfileName(saved.profile);
+		else if (!saved && !loadConnectedAgentProfile(options.configDir, ownProfile) && !enrollmentAddress(options.configDir, ownProfile).exists) {
+			let offline = false;
+			for (const candidate of profilesBoundToSession(options.configDir, sessionId, ownProfile, runtime === "codex" ? "native" : "external")) {
+				const state = await deps.connectionState(candidate.profile);
+				if (state === "connected") {
+					profileName = candidate.name;
+					offline = false;
+					break;
+				}
+				if (state === "unavailable") offline = true;
+			}
+			if (offline) return {
+				...base,
+				session: sessionId,
+				receiving: RECEIVING[runtime],
+				status: "offline",
+				detail: "A saved profile is connected for this session, but its status could not be checked right now. No new address was created."
+			};
+		}
+	} catch {
+		profileName = ownProfile;
+	}
+	const reused = profileName !== ownProfile;
 	const known = {
 		...base,
 		session: sessionId,
@@ -38651,7 +39716,7 @@ async function registerSession(options) {
 		let record = readSessionRecord(options.configDir, sessionId);
 		if (record?.endedAt) return await ended(record);
 		const finishAgentInfo = async () => {
-			if (record?.agentInfo) return;
+			if (reused || record?.agentInfo) return;
 			const seeded = await deps.seedAgentInfo(options.configDir, profileName, agentInfoForSession(runtime, cwd));
 			if (seeded !== "created" && seeded !== "already_present") return;
 			record = await updateSessionRecord(options.configDir, sessionId, (current) => current ? {
@@ -40386,10 +41451,10 @@ function contactRequestSessionKey(context, env = process.env) {
 		}
 		if (typeof raw !== "object" || Array.isArray(raw)) throw sessionRequired();
 		const setup = raw;
-		const session = mailId(setup.session);
 		const receiverMode = setup.receiverMode ?? "native";
+		const poll = receiverMode === "poll" && setup.session === null;
 		const receipt = setup.receipt;
-		if (setup.version !== 1 || setup.invitationHash !== profile.invitation_hash || setup.phase !== "sent" || !["native", "external"].includes(String(receiverMode)) || !receipt || typeof receipt !== "object" || Array.isArray(receipt) || ![
+		if (setup.version !== 1 || setup.invitationHash !== profile.invitation_hash || setup.phase !== "sent" || !(poll || ["native", "external"].includes(String(receiverMode))) || !receipt || typeof receipt !== "object" || Array.isArray(receipt) || ![
 			"queued",
 			"submitted_to_agent",
 			"delivered",
@@ -40397,6 +41462,8 @@ function contactRequestSessionKey(context, env = process.env) {
 			"scheduled"
 		].includes(String(receipt.status))) throw sessionRequired();
 		mailId(receipt.id);
+		if (poll) return null;
+		const session = mailId(setup.session);
 		const key = `${receiverMode === "external" ? "claude" : "codex"}:${session}`;
 		if (hasRuntime && runtime !== key || !hasRuntime && receiverMode !== "external") throw sessionRequired();
 		return key;
@@ -45882,7 +46949,7 @@ const PRIMITIVE_TEAM_AUTHOR = {
 	url: "https://primitive.dev"
 };
 const SDK_VERSION_RANGE = "^1.34.0";
-const CLI_VERSION_RANGE = "^1.39.0";
+const CLI_VERSION_RANGE = "^1.41.0";
 const ESBUILD_VERSION_RANGE = "^0.27.0";
 function renderHandler() {
 	return `// env.PRIMITIVE_API_KEY, env.PRIMITIVE_WEBHOOK_SECRET, and
@@ -50327,6 +51394,22 @@ const RESUME_LOCK_RETRY_STEP_MS = 250;
 function isListenLockContention(error) {
 	return error instanceof ListenStateError && error.message.startsWith("Another listener is using this subscription");
 }
+const CLAUDE_NOTIFY_SESSION_GUIDANCE = "This is a Claude Code session. Claude Code sessions receive mail through hooks, not --notify-session. Run `primitive agent connect --status --profile <profile>` to check the hook, or `primitive machine doctor --fix` to install it.";
+/**
+* The session is a Claude Code session rather than a Codex thread: it is the
+* current Claude session, or this machine registered it as one.
+*/
+function claudeCodeSession(sessionId, env, configDir) {
+	const id = sessionId.toLowerCase();
+	if (env.CODEX_THREAD_ID?.toLowerCase() === id) return false;
+	if (env.CLAUDE_CODE_SESSION_ID?.toLowerCase() === id) return true;
+	try {
+		const saved = readMailJson(join(configDir, "machine", "sessions", `${id}.json`));
+		return saved?.session === id && saved.runtime === "claude";
+	} catch {
+		return false;
+	}
+}
 var ListenCommand = class ListenCommand extends Command {
 	static summary = "Receive webhook events locally without a public endpoint";
 	static description = "Subscribe once and reconnect using the same durable server queue. Connected-agent credentials automatically receive only their assigned address. Use --notify-session with an exact loaded session UUID and --contacts for saved contact preferences and eligible same-org network peers, or approved --sender addresses, for external mail events at tool-output authority, never synthetic user messages. Explicit silence still wins. Use a short --exec hook to durably accept an event, --forward-to for a local webhook, or newline-delimited JSON on stdout. Add --background to keep native receiving independent of the calling terminal process; --status reports receiver health and receipts, add --email-id for one email's routing evidence, and --stop stops that receiver. Status is JSON and stdout events are JSONL by default; --json is accepted explicitly without changing delivery mode. Notifications require an existing native local-session socket; the CLI subscribes only to the exact already-loaded thread and never launches a terminal or creates a session. Verified presence controls are handled without model turns and do not consume --once or --number. Claude hook capability: primitive-hook-profile-bound-v2.";
@@ -50538,6 +51621,7 @@ var ListenCommand = class ListenCommand extends Command {
 		}
 		if (flags.wake && !hookSessionId) throw new Errors.CLIError("--wake requires --hook-session with an exact session_id.");
 		if (flags["notify-session"] !== void 0 && !SESSION_UUID$1.test(flags["notify-session"])) throw new Errors.CLIError("--notify-session requires an exact session UUID.");
+		if (flags["notify-session"] && !flags.status && !flags.stop && claudeCodeSession(flags["notify-session"], hookSessionId ? {} : process.env, this.config.configDir)) throw new Errors.CLIError(CLAUDE_NOTIFY_SESSION_GUIDANCE);
 		if (flags["notify-session"] && flags.transport === "poll") throw new Errors.CLIError("--notify-session requires --transport websocket.");
 		if (flags["notify-session"] && flags.subscription !== void 0) throw new Errors.CLIError("--notify-session uses the shared saved subscription; omit --subscription.");
 		if (flags.subscription?.trim().startsWith("local-mail-")) throw new Errors.CLIError("Subscription names beginning local-mail- are reserved for shared mail receiving.");
@@ -51811,426 +52895,83 @@ async function runSignupInteractiveWithCredentialLock(params) {
 		const verificationCode = await promptRequiredFn(`Verification code (${start.verification_code_length} digits): `);
 		if (verificationCode.toLowerCase() === "resend") {
 			const resend = await resendVerificationCode({
-				apiBaseUrl,
-				apiClient,
-				configDir,
-				deps,
-				start
-			});
-			start = resend.pending;
-			if (resend.resent) process$1.stderr.write(`Sent a new ${start.verification_code_length}-digit verification code. It expires in ${formatSignupSeconds(start.expires_in)}.\n`);
-			continue;
-		}
-		try {
-			await runSignupConfirmWithCredentialLock({
-				code: verificationCode,
-				configDir,
-				deps,
-				email: start.email,
-				flags: {
-					"api-base-url": flags["api-base-url"],
-					force: true
-				},
-				skipExistingCredentialCheck: true
-			});
-			return;
-		} catch (error) {
-			if (error instanceof Errors.CLIError && error.message.startsWith("Invalid verification code.")) {
-				process$1.stderr.write("Invalid verification code. Try again or type `resend`.\n");
-				continue;
-			}
-			throw error;
-		}
-	}
-}
-function commonStartFlags() {
-	return {
-		"accept-terms": Flags.boolean({ description: "Confirm acceptance of Primitive's Terms of Service and Privacy Policy" }),
-		"api-base-url": Flags.string({
-			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
-			env: "PRIMITIVE_API_BASE_URL",
-			hidden: true
-		}),
-		"device-name": Flags.string({ description: "Device name used for the created CLI OAuth session" }),
-		force: Flags.boolean({
-			char: "f",
-			description: "Replace saved credentials or pending signup state when needed"
-		}),
-		"signup-code": Flags.string({
-			description: "Optional signup code. Omit if you do not have one.",
-			env: "PRIMITIVE_SIGNUP_CODE"
-		})
-	};
-}
-var SignupCommand = class SignupCommand extends Command {
-	static args = { email: Args.string({
-		description: "Email address to sign up",
-		required: false
-	}) };
-	static description = "Start a Primitive account signup, send an email verification code, and save a pending signup token locally.";
-	static summary = "Start account signup";
-	static examples = [
-		"<%= config.bin %> signup user@example.com",
-		"<%= config.bin %> signup user@example.com --accept-terms",
-		"<%= config.bin %> signup user@example.com --signup-code invite-code --accept-terms",
-		"<%= config.bin %> signup confirm user@example.com 123456"
-	];
-	static flags = commonStartFlags();
-	async run() {
-		const { args, flags } = await this.parse(SignupCommand);
-		let releaseCredentialsLock;
-		try {
-			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
-		} catch (error) {
-			throw cliError$2(error instanceof Error ? error.message : String(error));
-		}
-		try {
-			await runSignupStartWithCredentialLock({
-				configDir: this.config.configDir,
-				email: args.email,
-				flags
-			});
-		} finally {
-			releaseCredentialsLock();
-		}
-	}
-};
-function resolveVerificationCode(input) {
-	const sources = [
-		input.positional !== void 0 ? "positional" : null,
-		input.fromStdin === true ? "--code-from-stdin" : null,
-		input.fromFile !== void 0 ? "--code-from-file" : null,
-		input.fromEnv !== void 0 ? "--code-from-env" : null
-	].filter((v) => v !== null);
-	if (sources.length === 0) return {
-		kind: "error",
-		message: "Pass the verification code as a positional argument or via one of --code-from-stdin, --code-from-file, or --code-from-env."
-	};
-	if (sources.length > 1) return {
-		kind: "error",
-		message: `Pass exactly one source for the verification code; got ${sources.join(", ")}.`
-	};
-	if (input.positional !== void 0) return {
-		kind: "ok",
-		code: input.positional
-	};
-	if (input.fromEnv !== void 0) {
-		const value = (input.env ?? process$1.env)[input.fromEnv];
-		if (value === void 0) return {
-			kind: "error",
-			message: `--code-from-env ${input.fromEnv}: environment variable is not set.`
-		};
-		return {
-			kind: "ok",
-			code: stripTrailingNewline(value)
-		};
-	}
-	if (input.fromFile !== void 0) {
-		const readFile = input.readFile ?? defaultReadCodeFile;
-		try {
-			return {
-				kind: "ok",
-				code: stripTrailingNewline(readFile(input.fromFile))
-			};
-		} catch (error) {
-			const detail = error instanceof Error ? error.message : String(error);
-			return {
-				kind: "error",
-				message: `--code-from-file ${input.fromFile}: could not read file: ${detail}`
-			};
-		}
-	}
-	const readStdin = input.readStdin ?? defaultReadCodeStdin;
-	try {
-		return {
-			kind: "ok",
-			code: stripTrailingNewline(readStdin())
-		};
-	} catch (error) {
-		return {
-			kind: "error",
-			message: `--code-from-stdin: ${error instanceof Error ? error.message : String(error)}`
-		};
-	}
-}
-function stripTrailingNewline(value) {
-	return value.replace(/\r?\n$/, "");
-}
-function defaultReadCodeFile(path) {
-	return readFileSync(path, "utf8");
-}
-function defaultReadCodeStdin() {
-	if (process$1.stdin.isTTY) throw new Error("stdin is a TTY; pipe the code into this command or use --code-from-file / --code-from-env instead.");
-	return readFileSync(0, "utf8");
-}
-var SignupConfirmCommand = class SignupConfirmCommand extends Command {
-	static args = {
-		email: Args.string({
-			description: "Email address used to start signup",
-			required: true
-		}),
-		code: Args.string({
-			description: "Verification code from the signup email. Optional when one of --code-from-stdin / --code-from-file / --code-from-env is passed; exactly one source must be set.",
-			required: false
-		})
-	};
-	static description = "Confirm a pending Primitive signup, create an OAuth session, and save CLI credentials locally.";
-	static summary = "Confirm account signup";
-	static examples = [
-		"<%= config.bin %> signup confirm user@example.com 123456",
-		"<%= config.bin %> signup confirm user@example.com 123456 --org-id 00000000-0000-4000-8000-000000000000",
-		"read -rs CODE && CODE=\"$CODE\" <%= config.bin %> signup confirm user@example.com --code-from-env CODE && unset CODE",
-		"read -rs CODE && printf '%s' \"$CODE\" | <%= config.bin %> signup confirm user@example.com --code-from-stdin && unset CODE",
-		"<%= config.bin %> signup confirm user@example.com --code-from-file /run/user/$(id -u)/verification-code"
-	];
-	static flags = {
-		"api-base-url": Flags.string({
-			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
-			env: "PRIMITIVE_API_BASE_URL",
-			hidden: true
-		}),
-		"code-from-stdin": Flags.boolean({ description: "Read the verification code from stdin instead of the positional argument. Use when an agent is constructing the command for the user to run, so the code never enters the agent's prompt context." }),
-		"code-from-file": Flags.string({ description: "Read the verification code from a UTF-8 file at this path. Trailing newlines are stripped." }),
-		"code-from-env": Flags.string({ description: "Read the verification code from this environment variable. Pair with `read -rs CODE && CODE=\"$CODE\" primitive signup confirm <email> --code-from-env CODE && unset CODE` so the value never appears on the command line or in shell history. Plain `read` creates a shell-local variable that child processes cannot see; the inline `CODE=\"$CODE\"` exports it for just the one command." }),
-		force: Flags.boolean({
-			char: "f",
-			description: "Replace saved credentials after verification"
-		}),
-		"org-id": Flags.string({ description: "Workspace id to target when the email belongs to multiple workspaces" })
-	};
-	async run() {
-		const { args, flags } = await this.parse(SignupConfirmCommand);
-		const resolvedCode = resolveVerificationCode({
-			positional: args.code,
-			fromStdin: flags["code-from-stdin"] === true,
-			fromFile: flags["code-from-file"],
-			fromEnv: flags["code-from-env"]
-		});
-		if (resolvedCode.kind === "error") throw cliError$2(resolvedCode.message);
-		let releaseCredentialsLock;
-		try {
-			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
-		} catch (error) {
-			throw cliError$2(error instanceof Error ? error.message : String(error));
-		}
-		try {
-			await runSignupConfirmWithCredentialLock({
-				code: resolvedCode.code,
-				configDir: this.config.configDir,
-				email: args.email,
-				flags
-			});
-		} finally {
-			releaseCredentialsLock();
-		}
-	}
-};
-var SignupResendCommand = class SignupResendCommand extends Command {
-	static args = { email: Args.string({
-		description: "Email address used to start signup. Defaults to the saved pending signup.",
-		required: false
-	}) };
-	static description = "Resend the verification code for a pending signup.";
-	static summary = "Resend signup verification code";
-	static examples = ["<%= config.bin %> signup resend", "<%= config.bin %> signup resend user@example.com"];
-	static flags = { "api-base-url": Flags.string({
-		description: "Override the primary API base URL. Internal testing only; not documented to customers.",
-		env: "PRIMITIVE_API_BASE_URL",
-		hidden: true
-	}) };
-	async run() {
-		const { args, flags } = await this.parse(SignupResendCommand);
-		let releaseCredentialsLock;
-		try {
-			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
-		} catch (error) {
-			throw cliError$2(error instanceof Error ? error.message : String(error));
-		}
-		try {
-			await runSignupResendWithCredentialLock({
-				configDir: this.config.configDir,
-				email: args.email,
-				flags
-			});
-		} finally {
-			releaseCredentialsLock();
-		}
-	}
-};
-var SignupStatusCommand = class SignupStatusCommand extends Command {
-	static args = { email: Args.string({
-		description: "Email address expected in the pending signup",
-		required: false
-	}) };
-	static description = "Inspect the locally saved pending Primitive signup state.";
-	static summary = "Show pending signup status";
-	static examples = [
-		"<%= config.bin %> signup status",
-		"<%= config.bin %> signup status user@example.com",
-		"<%= config.bin %> signup status --json"
-	];
-	static flags = {
-		"api-base-url": Flags.string({
-			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
-			env: "PRIMITIVE_API_BASE_URL",
-			hidden: true
-		}),
-		json: Flags.boolean({ description: "Print pending signup status as JSON" })
-	};
-	async run() {
-		const { args, flags } = await this.parse(SignupStatusCommand);
-		runSignupStatus({
-			configDir: this.config.configDir,
-			email: args.email,
-			flags
-		});
-	}
-};
-var SignupInteractiveCommand = class SignupInteractiveCommand extends Command {
-	static description = "Run the full signup flow in one interactive terminal session.";
-	static summary = "Run interactive account signup";
-	static examples = ["<%= config.bin %> signup interactive"];
-	static flags = commonStartFlags();
-	async run() {
-		const { flags } = await this.parse(SignupInteractiveCommand);
-		let releaseCredentialsLock;
-		try {
-			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
-		} catch (error) {
-			throw cliError$2(error instanceof Error ? error.message : String(error));
-		}
-		try {
-			await runSignupInteractiveWithCredentialLock({
-				configDir: this.config.configDir,
-				flags
-			});
-		} finally {
-			releaseCredentialsLock();
-		}
-	}
-};
-//#endregion
-//#region src/oclif/commands/logout.ts
-function cliError$1(message) {
-	return new Errors.CLIError(message, { exit: 1 });
-}
-function unwrapData(value) {
-	return value?.data ?? null;
-}
-function isSavedOAuthSessionExpiredError(error) {
-	return error instanceof Error && error.message === "Saved Primitive CLI OAuth session expired or was revoked. Run `primitive signin` to authenticate again.";
-}
-async function runLogoutWithCredentialLock(params) {
-	requireDefaultLoginProfile();
-	const deps = {
-		cliLogout,
-		createAuthenticatedCliApiClient,
-		...params.deps
-	};
-	let credentials;
-	try {
-		credentials = loadCliCredentials(params.configDir);
-	} catch (error) {
-		deleteCliCredentials(params.configDir);
-		const detail = error instanceof Error ? error.message : String(error);
-		process.stderr.write(`Removed unreadable Primitive CLI credentials. Backing OAuth grant was not revoked: ${detail}\n`);
-		process.exitCode = 1;
-		return;
-	}
-	if (!credentials) throw cliError$1("Not logged in. Run `primitive signin` to create saved CLI credentials.");
-	let authenticated;
-	try {
-		authenticated = await deps.createAuthenticatedCliApiClient({
-			apiBaseUrl: params.flags["api-base-url"],
-			configDir: params.configDir,
-			credentialsLockHeld: true
-		});
-	} catch (error) {
-		if (isSavedOAuthSessionExpiredError(error) && loadCliCredentials(params.configDir) === null) {
-			process.stderr.write("Logged out (OAuth session was already expired or revoked on the server).\n");
-			return;
+				apiBaseUrl,
+				apiClient,
+				configDir,
+				deps,
+				start
+			});
+			start = resend.pending;
+			if (resend.resent) process$1.stderr.write(`Sent a new ${start.verification_code_length}-digit verification code. It expires in ${formatSignupSeconds(start.expires_in)}.\n`);
+			continue;
 		}
-		throw error;
-	}
-	const freshCredentials = authenticated.auth.credentials ?? credentials;
-	const result = await deps.cliLogout({
-		body: { key_id: freshCredentials.oauth_grant_id },
-		client: authenticated.apiClient.client,
-		responseStyle: "fields"
-	});
-	if (result.error) {
-		const payload = extractErrorPayload(result.error);
-		const code = extractErrorCode(payload);
-		if (code === API_ERROR_CODES.unauthorized || code === API_ERROR_CODES.notFound) {
-			deleteCliCredentials(params.configDir);
-			writeErrorWithHints(payload);
-			process.stderr.write("Removed saved Primitive CLI credentials because the backing OAuth grant is already unavailable.\n");
-			process.exitCode = 1;
+		try {
+			await runSignupConfirmWithCredentialLock({
+				code: verificationCode,
+				configDir,
+				deps,
+				email: start.email,
+				flags: {
+					"api-base-url": flags["api-base-url"],
+					force: true
+				},
+				skipExistingCredentialCheck: true
+			});
 			return;
+		} catch (error) {
+			if (error instanceof Errors.CLIError && error.message.startsWith("Invalid verification code.")) {
+				process$1.stderr.write("Invalid verification code. Try again or type `resend`.\n");
+				continue;
+			}
+			throw error;
 		}
-		writeErrorWithHints(payload);
-		throw cliError$1("Could not revoke the saved Primitive CLI OAuth grant.");
-	}
-	const logout = unwrapData(result.data);
-	deleteCliCredentials(params.configDir);
-	const grantId = logout?.oauth_grant_id ?? freshCredentials.oauth_grant_id;
-	process.stderr.write(`Logged out and revoked OAuth grant ${grantId}.\n`);
-}
-function runForceLogout(params) {
-	requireDefaultLoginProfile();
-	const localCredentialsPath = credentialsPath(params.configDir);
-	const pendingPath = pendingSignupPath(params.configDir);
-	const lockPath = credentialsLockPath(params.configDir);
-	const removed = [
-		existsSync(localCredentialsPath) ? "local Primitive CLI credentials" : null,
-		existsSync(chatStatePath(params.configDir)) ? "local chat reply state" : null,
-		existsSync(pendingPath) ? "pending email-code auth state" : null,
-		existsSync(lockPath) ? "credential lock" : null
-	].filter((value) => value !== null);
-	deleteCliCredentials(params.configDir);
-	deletePendingAgentSignup(params.configDir);
-	deleteCliCredentialsLock(params.configDir);
-	if (removed.length === 0) {
-		process.stderr.write("No local Primitive CLI auth state was present. Backing OAuth grant was not revoked.\n");
-		return;
 	}
-	process.stderr.write(`Removed ${formatList(removed)}. Backing OAuth grant was not revoked.\n`);
-}
-function formatList(values) {
-	if (values.length <= 1) return values[0] ?? "";
-	if (values.length === 2) return `${values[0]} and ${values[1]}`;
-	return `${values.slice(0, -1).join(", ")}, and ${values.at(-1)}`;
 }
-var LogoutCommand = class LogoutCommand extends Command {
-	static description = "Log out by revoking the saved Primitive CLI OAuth grant and deleting local credentials. Use --force to remove local credentials, pending email-code auth state, and stale credential locks without contacting Primitive.";
-	static summary = "Log out and revoke the saved CLI OAuth grant";
-	static examples = ["<%= config.bin %> logout", "<%= config.bin %> logout --force"];
-	static flags = {
+function commonStartFlags() {
+	return {
+		"accept-terms": Flags.boolean({ description: "Confirm acceptance of Primitive's Terms of Service and Privacy Policy" }),
 		"api-base-url": Flags.string({
 			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
 			env: "PRIMITIVE_API_BASE_URL",
 			hidden: true
 		}),
+		"device-name": Flags.string({ description: "Device name used for the created CLI OAuth session" }),
 		force: Flags.boolean({
 			char: "f",
-			description: "Remove local CLI credentials, pending email-code auth state, and any credential lock without revoking the server OAuth grant"
+			description: "Replace saved credentials or pending signup state when needed"
+		}),
+		"signup-code": Flags.string({
+			description: "Optional signup code. Omit if you do not have one.",
+			env: "PRIMITIVE_SIGNUP_CODE"
 		})
 	};
+}
+var SignupCommand = class SignupCommand extends Command {
+	static args = { email: Args.string({
+		description: "Email address to sign up",
+		required: false
+	}) };
+	static description = "Start a Primitive account signup, send an email verification code, and save a pending signup token locally.";
+	static summary = "Start account signup";
+	static examples = [
+		"<%= config.bin %> signup user@example.com",
+		"<%= config.bin %> signup user@example.com --accept-terms",
+		"<%= config.bin %> signup user@example.com --signup-code invite-code --accept-terms",
+		"<%= config.bin %> signup confirm user@example.com 123456"
+	];
+	static flags = commonStartFlags();
 	async run() {
-		const { flags } = await this.parse(LogoutCommand);
-		if (flags.force) {
-			runForceLogout({ configDir: this.config.configDir });
-			return;
-		}
+		const { args, flags } = await this.parse(SignupCommand);
 		let releaseCredentialsLock;
 		try {
 			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
 		} catch (error) {
-			throw cliError$1(error instanceof Error ? error.message : String(error));
+			throw cliError$2(error instanceof Error ? error.message : String(error));
 		}
 		try {
-			await runLogoutWithCredentialLock({
+			await runSignupStartWithCredentialLock({
 				configDir: this.config.configDir,
+				email: args.email,
 				flags
 			});
 		} finally {
@@ -52238,667 +52979,349 @@ var LogoutCommand = class LogoutCommand extends Command {
 		}
 	}
 };
-//#endregion
-//#region src/oclif/machine-files.ts
-/** Hand-edited files larger than this are reported, never rewritten. */
-const MAX_MANAGED_FILE_BYTES = 1048576;
-/** Backups kept per file; older Primitive backups of the same file are pruned. */
-const BACKUPS_KEPT = 10;
-const BACKUP_INFIX = ".primitive-bak-";
-/** A safe, user-facing reason a file was not changed. */
-var MachineFileError = class extends Error {};
-/**
-* Read a user-owned text file without following it anywhere surprising. A
-* symlink is followed to its real file so a later write updates the file the
-* user linked instead of replacing the link.
-*/
-function readManagedFile(path) {
-	let info;
-	try {
-		info = lstatSync(path);
-	} catch (error) {
-		if (error.code === "ENOENT") return {
-			state: "absent",
-			path,
-			target: path
-		};
-		return {
-			state: "invalid",
-			path,
-			detail: `${path} cannot be read (${error.code ?? "error"}).`
-		};
-	}
-	let target = path;
-	if (info.isSymbolicLink()) try {
-		target = realpathSync(path);
-		info = statSync(target);
-	} catch {
-		return {
-			state: "invalid",
-			path,
-			detail: `${path} is a symlink to a missing file; it was left unchanged.`
-		};
-	}
-	if (!info.isFile()) return {
-		state: "invalid",
-		path,
-		detail: `${path} is not a regular file; it was left unchanged.`
+function resolveVerificationCode(input) {
+	const sources = [
+		input.positional !== void 0 ? "positional" : null,
+		input.fromStdin === true ? "--code-from-stdin" : null,
+		input.fromFile !== void 0 ? "--code-from-file" : null,
+		input.fromEnv !== void 0 ? "--code-from-env" : null
+	].filter((v) => v !== null);
+	if (sources.length === 0) return {
+		kind: "error",
+		message: "Pass the verification code as a positional argument or via one of --code-from-stdin, --code-from-file, or --code-from-env."
 	};
-	if (info.size > MAX_MANAGED_FILE_BYTES) return {
-		state: "invalid",
-		path,
-		detail: `${path} is larger than 1 MiB; it was left unchanged.`
+	if (sources.length > 1) return {
+		kind: "error",
+		message: `Pass exactly one source for the verification code; got ${sources.join(", ")}.`
 	};
-	let raw;
-	try {
-		raw = readFileSync(target);
-	} catch (error) {
+	if (input.positional !== void 0) return {
+		kind: "ok",
+		code: input.positional
+	};
+	if (input.fromEnv !== void 0) {
+		const value = (input.env ?? process$1.env)[input.fromEnv];
+		if (value === void 0) return {
+			kind: "error",
+			message: `--code-from-env ${input.fromEnv}: environment variable is not set.`
+		};
 		return {
-			state: "invalid",
-			path,
-			detail: `${path} cannot be read (${error.code ?? "error"}).`
+			kind: "ok",
+			code: stripTrailingNewline(value)
 		};
 	}
-	const text = raw.toString("utf8");
-	if (text.includes("\0") || !Buffer.from(text, "utf8").equals(raw)) return {
-		state: "invalid",
-		path,
-		detail: `${path} is not UTF-8 text; it was left unchanged.`
-	};
-	return {
-		state: "present",
-		path,
-		target,
-		text,
-		mode: info.mode & 511
-	};
-}
-function backupStamp$1(now) {
-	return now.toISOString().replace(/[-:]/g, "").replace(/\.\d+Z$/, "Z");
-}
-function syncDirectory(directory) {
-	if (process.platform === "win32") return;
-	try {
-		const fd = openSync(directory, "r");
-		try {
-			fsyncSync(fd);
-		} finally {
-			closeSync(fd);
-		}
-	} catch {}
-}
-function pruneBackups(target) {
-	const directory = dirname(target);
-	const prefix = `${basename(target)}${BACKUP_INFIX}`;
-	try {
-		const backups = readdirSync(directory).filter((name) => name.startsWith(prefix)).sort();
-		for (const name of backups.slice(0, Math.max(0, backups.length - BACKUPS_KEPT))) unlinkSync(join(directory, name));
-	} catch {}
-}
-/** Copy the current file beside itself before any change. Returns the copy's path. */
-function backupManagedFile(target, mode, now) {
-	const base = `${target}${BACKUP_INFIX}${backupStamp$1(now)}`;
-	for (let attempt = 0; attempt < 100; attempt++) {
-		const candidate = attempt === 0 ? base : `${base}-${attempt}`;
-		try {
-			copyFileSync(target, candidate, constants.COPYFILE_EXCL);
-			chmodSync(candidate, mode);
-			return candidate;
-		} catch (error) {
-			if (error.code !== "EEXIST") throw error;
-		}
-	}
-	throw new MachineFileError(`Could not create a backup of ${target}.`);
-}
-/**
-* Replace a file atomically (temporary file plus rename in the same
-* directory), after backing up the existing content. The write is refused when
-* the file changed since it was read, so a concurrent edit is never lost.
-*/
-function writeManagedFile(params) {
-	const { read } = params;
-	const target = read.target;
-	const expected = read.state === "present" ? read.text : null;
-	const directory = dirname(target);
-	mkdirSync(directory, {
-		recursive: true,
-		mode: 448
-	});
-	const current = () => {
+	if (input.fromFile !== void 0) {
+		const readFile = input.readFile ?? defaultReadCodeFile;
 		try {
-			return readFileSync(target, "utf8");
+			return {
+				kind: "ok",
+				code: stripTrailingNewline(readFile(input.fromFile))
+			};
 		} catch (error) {
-			if (error.code === "ENOENT") return null;
-			throw error;
-		}
-	};
-	if (current() !== expected) throw new MachineFileError(`${read.path} changed while it was being repaired; it was left unchanged.`);
-	const mode = read.state === "present" ? read.mode : params.newFileMode ?? 420;
-	const backup = read.state === "present" ? backupManagedFile(target, mode, (params.now ?? (() => /* @__PURE__ */ new Date()))()) : null;
-	const temporary = join(directory, `.${basename(target)}.${randomUUID()}.tmp`);
-	try {
-		const fd = openSync(temporary, "wx", mode);
-		try {
-			writeFileSync(fd, params.content, "utf8");
-			fsyncSync(fd);
-		} finally {
-			closeSync(fd);
+			const detail = error instanceof Error ? error.message : String(error);
+			return {
+				kind: "error",
+				message: `--code-from-file ${input.fromFile}: could not read file: ${detail}`
+			};
 		}
-		chmodSync(temporary, mode);
-		if (current() !== expected) throw new MachineFileError(`${read.path} changed while it was being repaired; it was left unchanged.`);
-		renameSync(temporary, target);
-		syncDirectory(directory);
-	} finally {
-		if (existsSync(temporary)) unlinkSync(temporary);
-	}
-	if (backup) pruneBackups(target);
-	return { backup };
-}
-const START = /^<!-- primitive:managed-block v=(\d+) START -->\r?$/;
-const END = /^<!-- primitive:managed-block END -->\r?$/;
-/** Character offsets of the single managed block, or why the markers are unusable. */
-function locateBlock(text) {
-	const starts = [];
-	const ends = [];
-	let offset = 0;
-	for (const line of text.split("\n")) {
-		const start = START.exec(line);
-		if (start) starts.push({
-			offset,
-			version: Number(start[1])
-		});
-		else if (END.test(line)) ends.push({
-			offset,
-			length: line.endsWith("\r") ? line.length - 1 : line.length
-		});
-		else if (line.includes("primitive:managed-block")) return { malformed: "a primitive:managed-block marker line was edited; fix or remove it by hand" };
-		offset += line.length + 1;
-	}
-	if (starts.length === 0 && ends.length === 0) return null;
-	if (starts.length !== 1 || ends.length !== 1) return { malformed: `found ${starts.length} START and ${ends.length} END markers; expected one of each` };
-	const [start] = starts;
-	const [end] = ends;
-	if (!start || !end || end.offset < start.offset) return { malformed: "the END marker comes before the START marker" };
-	return {
-		start: start.offset,
-		end: end.offset + end.length,
-		version: start.version
-	};
-}
-/** The exact block for a body, using the file's own line ending. */
-function renderManagedBlock(body, eol = "\n") {
-	return [
-		`<!-- primitive:managed-block v=1 START -->`,
-		...body.replace(/\r\n/g, "\n").replace(/\n+$/, "").split("\n"),
-		"<!-- primitive:managed-block END -->"
-	].join(eol);
-}
-function lineEnding(text) {
-	return text.includes("\r\n") ? "\r\n" : "\n";
-}
-function inspectManagedBlock(text, body) {
-	const found = locateBlock(text);
-	if (found === null) return { state: "missing" };
-	if ("malformed" in found) return {
-		state: "malformed",
-		detail: found.malformed
-	};
-	return text.slice(found.start, found.end).replace(/\r\n/g, "\n") === renderManagedBlock(body) ? { state: "ok" } : {
-		state: "outdated",
-		version: found.version
-	};
-}
-/**
-* Replace only the managed block, or append it when absent. Text outside the
-* markers is preserved byte for byte. Throws for malformed markers.
-*/
-function upsertManagedBlock(text, body) {
-	const found = locateBlock(text);
-	if (found !== null && "malformed" in found) throw new MachineFileError(found.malformed);
-	const eol = lineEnding(text);
-	const block = renderManagedBlock(body, eol);
-	if (found) return `${text.slice(0, found.start)}${block}${text.slice(found.end)}`;
-	if (text.length === 0) return `${block}${eol}`;
-	return `${text}${text.endsWith(`${eol}${eol}`) ? "" : text.endsWith(eol) ? eol : `${eol}${eol}`}${block}${eol}`;
-}
-/** Indentation the file already uses, so a rewrite keeps its style. */
-function jsonIndentation(text) {
-	return /^[{[][^\n]*\n([ \t]+)\S/.exec(text)?.[1] ?? 2;
-}
-//#endregion
-//#region src/oclif/claude-machine-hooks.ts
-function record$2(value) {
-	return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function realpathOrNull(path) {
-	try {
-		return realpathSync(path);
-	} catch {
-		return null;
 	}
-}
-/** Two paths name the same existing file. */
-function samePath(a, b) {
-	if (typeof a !== "string" || !a) return false;
-	if (a === b) return existsSync(a);
-	const left = realpathOrNull(a);
-	return left !== null && left === realpathOrNull(b);
-}
-function executable(path) {
+	const readStdin = input.readStdin ?? defaultReadCodeStdin;
 	try {
-		accessSync(path, constants.X_OK);
-		return true;
-	} catch {
-		return false;
-	}
-}
-/** The first PATH entry for a command, without running a shell. */
-function findOnPath(name, env) {
-	for (const directory of (env.PATH ?? "").split(delimiter)) {
-		if (!directory) continue;
-		const candidate = join(directory, name);
-		if (existsSync(candidate) && executable(candidate)) return candidate;
+		return {
+			kind: "ok",
+			code: stripTrailingNewline(readStdin())
+		};
+	} catch (error) {
+		return {
+			kind: "error",
+			message: `--code-from-stdin: ${error instanceof Error ? error.message : String(error)}`
+		};
 	}
-	return null;
-}
-/**
-* Prefer a PATH link (for example a package manager's `bin/node`) over a
-* versioned install directory when both are the same binary, so a hook keeps
-* working after the versioned directory is replaced by an upgrade.
-*/
-function stableNodePath(env, execPath = process.execPath) {
-	const onPath = findOnPath("node", env);
-	if (onPath && onPath !== execPath && samePath(onPath, execPath)) return onPath;
-	return execPath;
-}
-/** Locate the running CLI. Null when its files are not where a package install puts them. */
-function currentCliLocation(entryArg, env, execPath = process.execPath) {
-	const entry = realpathOrNull(entryArg);
-	if (!entry) return null;
-	const wake = realpathOrNull(join(dirname(entry), "claude-wake.mjs"));
-	const pending = realpathOrNull(join(dirname(entry), "claude-pending-mail.mjs"));
-	if (!wake || !pending) return null;
-	return {
-		node: stableNodePath(env, execPath),
-		entry,
-		wake,
-		pending
-	};
 }
-/** Package-runner caches are cleaned up behind the user's back. */
-function ephemeralCliReason(entry) {
-	if (/[\\/]_npx[\\/]/.test(entry)) return "an npx cache";
-	if (/[\\/]dlx[-\\/]/.test(entry)) return "a pnpm dlx cache";
-	if (/[\\/]bunx-/.test(entry)) return "a bunx cache";
-	return null;
+function stripTrailingNewline(value) {
+	return value.replace(/\r?\n$/, "");
 }
-function claudeConfigDir(env, home) {
-	return resolve(env.CLAUDE_CONFIG_DIR || join(home, ".claude"));
+function defaultReadCodeFile(path) {
+	return readFileSync(path, "utf8");
 }
-function jsonErrorDetail(error) {
-	const message = error instanceof Error ? error.message : "";
-	const position = /position (\d+)/.exec(message)?.[1];
-	const line = /line (\d+)/.exec(message)?.[1];
-	return line ? ` near line ${line}` : position ? ` near character ${position}` : "";
+function defaultReadCodeStdin() {
+	if (process$1.stdin.isTTY) throw new Error("stdin is a TTY; pipe the code into this command or use --code-from-file / --code-from-env instead.");
+	return readFileSync(0, "utf8");
 }
-/** Parse settings.json. Anything unexpected is reported, never repaired. */
-function readClaudeSettings(claudeDir) {
-	const path = join(claudeDir, "settings.json");
-	const read = readManagedFile(path);
-	if (read.state === "invalid") return {
-		ok: false,
-		detail: read.detail
-	};
-	if (read.state === "absent") return {
-		ok: true,
-		read,
-		settings: {}
-	};
-	let parsed;
-	try {
-		parsed = JSON.parse(read.text);
-	} catch (error) {
-		return {
-			ok: false,
-			detail: `${path} is not valid JSON${jsonErrorDetail(error)}. Fix it by hand; it was not modified.`
-		};
-	}
-	if (!record$2(parsed)) return {
-		ok: false,
-		detail: `${path} must contain a JSON object. Fix it by hand; it was not modified.`
-	};
-	if (parsed.hooks !== void 0 && !record$2(parsed.hooks)) return {
-		ok: false,
-		detail: `${path} has a "hooks" value that is not an object. Fix it by hand; it was not modified.`
+var SignupConfirmCommand = class SignupConfirmCommand extends Command {
+	static args = {
+		email: Args.string({
+			description: "Email address used to start signup",
+			required: true
+		}),
+		code: Args.string({
+			description: "Verification code from the signup email. Optional when one of --code-from-stdin / --code-from-file / --code-from-env is passed; exactly one source must be set.",
+			required: false
+		})
 	};
-	return {
-		ok: true,
-		read,
-		settings: parsed
+	static description = "Confirm a pending Primitive signup, create an OAuth session, and save CLI credentials locally.";
+	static summary = "Confirm account signup";
+	static examples = [
+		"<%= config.bin %> signup confirm user@example.com 123456",
+		"<%= config.bin %> signup confirm user@example.com 123456 --org-id 00000000-0000-4000-8000-000000000000",
+		"read -rs CODE && CODE=\"$CODE\" <%= config.bin %> signup confirm user@example.com --code-from-env CODE && unset CODE",
+		"read -rs CODE && printf '%s' \"$CODE\" | <%= config.bin %> signup confirm user@example.com --code-from-stdin && unset CODE",
+		"<%= config.bin %> signup confirm user@example.com --code-from-file /run/user/$(id -u)/verification-code"
+	];
+	static flags = {
+		"api-base-url": Flags.string({
+			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+			env: "PRIMITIVE_API_BASE_URL",
+			hidden: true
+		}),
+		"code-from-stdin": Flags.boolean({ description: "Read the verification code from stdin instead of the positional argument. Use when an agent is constructing the command for the user to run, so the code never enters the agent's prompt context." }),
+		"code-from-file": Flags.string({ description: "Read the verification code from a UTF-8 file at this path. Trailing newlines are stripped." }),
+		"code-from-env": Flags.string({ description: "Read the verification code from this environment variable. Pair with `read -rs CODE && CODE=\"$CODE\" primitive signup confirm <email> --code-from-env CODE && unset CODE` so the value never appears on the command line or in shell history. Plain `read` creates a shell-local variable that child processes cannot see; the inline `CODE=\"$CODE\"` exports it for just the one command." }),
+		force: Flags.boolean({
+			char: "f",
+			description: "Replace saved credentials after verification"
+		}),
+		"org-id": Flags.string({ description: "Workspace id to target when the email belongs to multiple workspaces" })
 	};
-}
-const LOCK_WAIT = new Int32Array(new SharedArrayBuffer(4));
-/**
-* Write settings under the same lock every Primitive hook installer uses,
-* keeping the file's indentation, after a timestamped backup.
-*/
-function writeClaudeSettings(params) {
-	let release;
-	for (let attempt = 0; attempt < 80; attempt++) try {
-		release = acquireListenLock(params.claudeDir, "primitive-claude-settings");
-		break;
-	} catch {
-		Atomics.wait(LOCK_WAIT, 0, 0, 25);
+	async run() {
+		const { args, flags } = await this.parse(SignupConfirmCommand);
+		const resolvedCode = resolveVerificationCode({
+			positional: args.code,
+			fromStdin: flags["code-from-stdin"] === true,
+			fromFile: flags["code-from-file"],
+			fromEnv: flags["code-from-env"]
+		});
+		if (resolvedCode.kind === "error") throw cliError$2(resolvedCode.message);
+		let releaseCredentialsLock;
+		try {
+			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
+		} catch (error) {
+			throw cliError$2(error instanceof Error ? error.message : String(error));
+		}
+		try {
+			await runSignupConfirmWithCredentialLock({
+				code: resolvedCode.code,
+				configDir: this.config.configDir,
+				email: args.email,
+				flags
+			});
+		} finally {
+			releaseCredentialsLock();
+		}
 	}
-	if (!release) throw new MachineFileError("Another Primitive command is editing Claude settings; try again shortly.");
-	try {
-		const original = params.read.state === "present" ? params.read.text : null;
-		const indent = original === null ? 2 : jsonIndentation(original);
-		const trailing = original === null || original.endsWith("\n") ? "\n" : "";
-		return writeManagedFile({
-			read: params.read,
-			content: `${JSON.stringify(params.settings, null, indent)}${trailing}`,
-			now: params.now,
-			newFileMode: 384
+};
+var SignupResendCommand = class SignupResendCommand extends Command {
+	static args = { email: Args.string({
+		description: "Email address used to start signup. Defaults to the saved pending signup.",
+		required: false
+	}) };
+	static description = "Resend the verification code for a pending signup.";
+	static summary = "Resend signup verification code";
+	static examples = ["<%= config.bin %> signup resend", "<%= config.bin %> signup resend user@example.com"];
+	static flags = { "api-base-url": Flags.string({
+		description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+		env: "PRIMITIVE_API_BASE_URL",
+		hidden: true
+	}) };
+	async run() {
+		const { args, flags } = await this.parse(SignupResendCommand);
+		let releaseCredentialsLock;
+		try {
+			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
+		} catch (error) {
+			throw cliError$2(error instanceof Error ? error.message : String(error));
+		}
+		try {
+			await runSignupResendWithCredentialLock({
+				configDir: this.config.configDir,
+				email: args.email,
+				flags
+			});
+		} finally {
+			releaseCredentialsLock();
+		}
+	}
+};
+var SignupStatusCommand = class SignupStatusCommand extends Command {
+	static args = { email: Args.string({
+		description: "Email address expected in the pending signup",
+		required: false
+	}) };
+	static description = "Inspect the locally saved pending Primitive signup state.";
+	static summary = "Show pending signup status";
+	static examples = [
+		"<%= config.bin %> signup status",
+		"<%= config.bin %> signup status user@example.com",
+		"<%= config.bin %> signup status --json"
+	];
+	static flags = {
+		"api-base-url": Flags.string({
+			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+			env: "PRIMITIVE_API_BASE_URL",
+			hidden: true
+		}),
+		json: Flags.boolean({ description: "Print pending signup status as JSON" })
+	};
+	async run() {
+		const { args, flags } = await this.parse(SignupStatusCommand);
+		runSignupStatus({
+			configDir: this.config.configDir,
+			email: args.email,
+			flags
 		});
-	} finally {
-		release();
 	}
-}
-const GLOBAL_HOOKS = {
-	"claude.hook.session_start": {
-		event: "SessionStart",
-		subcommand: "session-register",
-		timeout: 15
-	},
-	"claude.hook.session_end": {
-		event: "SessionEnd",
-		subcommand: "session-end",
-		timeout: 10
+};
+var SignupInteractiveCommand = class SignupInteractiveCommand extends Command {
+	static description = "Run the full signup flow in one interactive terminal session.";
+	static summary = "Run interactive account signup";
+	static examples = ["<%= config.bin %> signup interactive"];
+	static flags = commonStartFlags();
+	async run() {
+		const { flags } = await this.parse(SignupInteractiveCommand);
+		let releaseCredentialsLock;
+		try {
+			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
+		} catch (error) {
+			throw cliError$2(error instanceof Error ? error.message : String(error));
+		}
+		try {
+			await runSignupInteractiveWithCredentialLock({
+				configDir: this.config.configDir,
+				flags
+			});
+		} finally {
+			releaseCredentialsLock();
+		}
 	}
 };
-/** A hook this CLI installed for every Claude session, from any CLI path or version. */
-function isGlobalManaged(hook, spec) {
-	if (!record$2(hook) || hook.type !== "command" || !Array.isArray(hook.args)) return false;
-	const args = hook.args;
-	return args.length === 6 && typeof args[0] === "string" && args[1] === "agent" && args[2] === spec.subcommand && args[3] === "--runtime" && args[4] === "claude" && args[5] === "--hook";
+//#endregion
+//#region src/oclif/commands/logout.ts
+function cliError$1(message) {
+	return new Errors.CLIError(message, { exit: 1 });
 }
-function globalHookArgs(cli, spec) {
-	return [
-		cli.entry,
-		"agent",
-		spec.subcommand,
-		"--runtime",
-		"claude",
-		"--hook"
-	];
+function unwrapData(value) {
+	return value?.data ?? null;
 }
-function globalHookCurrent(hook, cli) {
-	const args = hook.args;
-	return samePath(hook.command, cli.node) && samePath(args[0], cli.entry);
+function isSavedOAuthSessionExpiredError(error) {
+	return error instanceof Error && error.message === "Saved Primitive CLI OAuth session expired or was revoked. Run `primitive signin` to authenticate again.";
 }
-const WAKE_MARKER = "primitive-agent-wake-v1";
-const PENDING_MARKER = "primitive-pending-mail-v1";
-const SESSION_EVENTS = [
-	"Stop",
-	"SessionStart",
-	"PostToolUse"
-];
-/** A per-session receive hook written by `agent connect` or `agent enroll`, any version. */
-function parseSessionHook(hook) {
-	if (!record$2(hook) || hook.type !== "command" || !Array.isArray(hook.args)) return null;
-	const args = hook.args;
-	if (!args.every((value) => typeof value === "string")) return null;
-	const strings = args;
-	const script = basename(strings[0] ?? "");
-	if (script === "claude-pending-mail.mjs") return strings.length === 7 && strings[6] === PENDING_MARKER ? {
-		kind: "pending",
-		configDir: strings[2] ?? "",
-		profile: strings[3] ?? null,
-		session: strings[5] ?? null
-	} : null;
-	if (script !== "claude-wake.mjs") return null;
-	if (strings.length === 7 && strings[6] === WAKE_MARKER) return {
-		kind: "wake",
-		configDir: strings[2] ?? "",
-		profile: strings[3] ?? null,
-		session: strings[5] ?? null
-	};
-	if (strings.length === 6 && strings[5] === WAKE_MARKER) return {
-		kind: "wake",
-		configDir: strings[2] ?? "",
-		profile: strings[3] ?? null,
-		session: null
-	};
-	if (strings.length === 4 && strings[3] === WAKE_MARKER) return {
-		kind: "wake",
-		configDir: strings[2] ?? "",
-		profile: null,
-		session: null
+async function runLogoutWithCredentialLock(params) {
+	requireDefaultLoginProfile();
+	const deps = {
+		cliLogout,
+		createAuthenticatedCliApiClient,
+		...params.deps
 	};
-	return null;
-}
-/** A saved connected profile still holds a credential. Unreadable counts as live. */
-function profileStillConnected(configDir, profile) {
+	let credentials;
 	try {
-		return loadConnectedAgentProfile(configDir, profile) !== null;
-	} catch {
-		return true;
+		credentials = loadCliCredentials(params.configDir);
+	} catch (error) {
+		deleteCliCredentials(params.configDir);
+		const detail = error instanceof Error ? error.message : String(error);
+		process.stderr.write(`Removed unreadable Primitive CLI credentials. Backing OAuth grant was not revoked: ${detail}\n`);
+		process.exitCode = 1;
+		return;
 	}
-}
-function sessionHookPathsCurrent(hook, parsed, cli) {
-	const args = hook.args;
-	if (!cli) return existsSync(String(hook.command)) && existsSync(args[0] ?? "") && existsSync(args[1] ?? "");
-	return samePath(hook.command, cli.node) && samePath(args[0], parsed.kind === "wake" ? cli.wake : cli.pending) && samePath(args[1], cli.entry);
-}
-function judgeSessionHooks(hooks, cli) {
-	const verdicts = /* @__PURE__ */ new Map();
-	const seen = /* @__PURE__ */ new Set();
-	for (const event of SESSION_EVENTS) {
-		const entries = hooks[event];
-		if (!Array.isArray(entries)) continue;
-		for (const entry of entries) {
-			if (!record$2(entry) || !Array.isArray(entry.hooks)) continue;
-			for (const hook of entry.hooks) {
-				const parsed = parseSessionHook(hook);
-				if (!parsed || !record$2(hook)) continue;
-				const pathsExist = existsSync(String(hook.command)) && existsSync(String(hook.args[0])) && existsSync(String(hook.args[1]));
-				if (!(parsed.profile ? existsSync(parsed.configDir) && profileStillConnected(parsed.configDir, parsed.profile) : existsSync(parsed.configDir) && pathsExist)) {
-					verdicts.set(hook, "stale");
-					continue;
-				}
-				const key = [
-					event,
-					parsed.kind,
-					resolve(parsed.configDir),
-					parsed.profile ?? "",
-					parsed.session?.toLowerCase() ?? ""
-				].join("\0");
-				if (seen.has(key)) {
-					verdicts.set(hook, "duplicate");
-					continue;
-				}
-				seen.add(key);
-				verdicts.set(hook, sessionHookPathsCurrent(hook, parsed, cli) ? "keep" : "outdated");
-			}
+	if (!credentials) throw cliError$1("Not logged in. Run `primitive signin` to create saved CLI credentials.");
+	let authenticated;
+	try {
+		authenticated = await deps.createAuthenticatedCliApiClient({
+			apiBaseUrl: params.flags["api-base-url"],
+			configDir: params.configDir,
+			credentialsLockHeld: true
+		});
+	} catch (error) {
+		if (isSavedOAuthSessionExpiredError(error) && loadCliCredentials(params.configDir) === null) {
+			process.stderr.write("Logged out (OAuth session was already expired or revoked on the server).\n");
+			return;
 		}
+		throw error;
 	}
-	return verdicts;
-}
-function eventEntries(hooks, event) {
-	const entries = hooks[event];
-	if (entries === void 0) return [];
-	return Array.isArray(entries) ? entries : "invalid";
-}
-/** Inspect every Primitive-owned Claude hook without changing anything. */
-function inspectClaudeHooks(settings, context) {
-	const hooks = record$2(settings.hooks) ? settings.hooks : {};
-	const canFix = context.cli !== null && context.blocked === null;
-	const blockedNote = context.blocked ? ` ${context.blocked}` : "";
-	const findings = {};
-	for (const [id, spec] of Object.entries(GLOBAL_HOOKS)) {
-		const entries = eventEntries(hooks, spec.event);
-		if (entries === "invalid") {
-			findings[id] = {
-				status: "fail",
-				detail: `hooks.${spec.event} is not a list. Fix settings.json by hand; it was not modified.`,
-				fixable: false
-			};
-			continue;
+	const freshCredentials = authenticated.auth.credentials ?? credentials;
+	const result = await deps.cliLogout({
+		body: { key_id: freshCredentials.oauth_grant_id },
+		client: authenticated.apiClient.client,
+		responseStyle: "fields"
+	});
+	if (result.error) {
+		const payload = extractErrorPayload(result.error);
+		const code = extractErrorCode(payload);
+		if (code === API_ERROR_CODES.unauthorized || code === API_ERROR_CODES.notFound) {
+			deleteCliCredentials(params.configDir);
+			writeErrorWithHints(payload);
+			process.stderr.write("Removed saved Primitive CLI credentials because the backing OAuth grant is already unavailable.\n");
+			process.exitCode = 1;
+			return;
 		}
-		const managed = entries.flatMap((entry) => record$2(entry) && Array.isArray(entry.hooks) ? entry.hooks.filter((hook) => isGlobalManaged(hook, spec)) : []);
-		const [first] = managed;
-		if (!first) findings[id] = {
-			status: "fail",
-			detail: `No ${spec.event} hook runs \`primitive agent ${spec.subcommand}\`.${blockedNote}`,
-			fixable: canFix
-		};
-		else if (managed.length > 1) findings[id] = {
-			status: "fail",
-			detail: `${managed.length} ${spec.event} hooks run \`primitive agent ${spec.subcommand}\`; expected exactly one.${blockedNote}`,
-			fixable: canFix
-		};
-		else if (!context.cli || !globalHookCurrent(first, context.cli)) findings[id] = {
-			status: "fail",
-			detail: `The ${spec.event} hook runs ${String(first.args[0])}, which ${existsSync(String(first.args[0])) ? "is not this CLI" : "no longer exists"}.${blockedNote}`,
-			fixable: canFix
-		};
-		else findings[id] = {
-			status: "ok",
-			detail: `${spec.event} runs \`primitive agent ${spec.subcommand}\` from ${context.cli.entry}.`,
-			fixable: false
-		};
+		writeErrorWithHints(payload);
+		throw cliError$1("Could not revoke the saved Primitive CLI OAuth grant.");
 	}
-	const invalid = SESSION_EVENTS.find((event) => eventEntries(hooks, event) === "invalid");
-	if (invalid) {
-		findings["claude.hook.stop"] = {
-			status: "fail",
-			detail: `hooks.${invalid} is not a list. Fix settings.json by hand; it was not modified.`,
-			fixable: false
-		};
-		return findings;
+	const logout = unwrapData(result.data);
+	deleteCliCredentials(params.configDir);
+	const grantId = logout?.oauth_grant_id ?? freshCredentials.oauth_grant_id;
+	process.stderr.write(`Logged out and revoked OAuth grant ${grantId}.\n`);
+}
+function runForceLogout(params) {
+	requireDefaultLoginProfile();
+	const localCredentialsPath = credentialsPath(params.configDir);
+	const pendingPath = pendingSignupPath(params.configDir);
+	const lockPath = credentialsLockPath(params.configDir);
+	const removed = [
+		existsSync(localCredentialsPath) ? "local Primitive CLI credentials" : null,
+		existsSync(chatStatePath(params.configDir)) ? "local chat reply state" : null,
+		existsSync(pendingPath) ? "pending email-code auth state" : null,
+		existsSync(lockPath) ? "credential lock" : null
+	].filter((value) => value !== null);
+	deleteCliCredentials(params.configDir);
+	deletePendingAgentSignup(params.configDir);
+	deleteCliCredentialsLock(params.configDir);
+	if (removed.length === 0) {
+		process.stderr.write("No local Primitive CLI auth state was present. Backing OAuth grant was not revoked.\n");
+		return;
 	}
-	const counts = {
-		keep: 0,
-		stale: 0,
-		duplicate: 0,
-		outdated: 0
-	};
-	for (const verdict of judgeSessionHooks(hooks, context.cli).values()) counts[verdict]++;
-	const problems = [
-		counts.stale ? `${counts.stale} for disconnected or removed sessions` : "",
-		counts.duplicate ? `${counts.duplicate} duplicates` : "",
-		counts.outdated ? `${counts.outdated} pointing at an old CLI path` : ""
-	].filter(Boolean);
-	findings["claude.hook.stop"] = problems.length ? {
-		status: "fail",
-		detail: `Per-session receive hooks need cleanup: ${problems.join(", ")}.${blockedNote}`,
-		fixable: canFix || counts.outdated === 0 && context.blocked === null
-	} : {
-		status: "ok",
-		detail: counts.keep ? `${counts.keep} per-session receive hooks, each present once and current.` : "No per-session receive hooks; each registered session adds its own exact-session hooks.",
-		fixable: false
-	};
-	return findings;
+	process.stderr.write(`Removed ${formatList(removed)}. Backing OAuth grant was not revoked.\n`);
 }
-function rewriteEntries(entries, transform) {
-	let changed = false;
-	return {
-		entries: entries.flatMap((entry) => {
-			if (!record$2(entry) || !Array.isArray(entry.hooks)) return [entry];
-			let touched = false;
-			const kept = entry.hooks.flatMap((hook) => {
-				const replacement = transform(hook);
-				if (replacement === hook) return [hook];
-				touched = true;
-				return replacement === void 0 ? [] : [replacement];
-			});
-			if (!touched) return [entry];
-			changed = true;
-			return kept.length ? [{
-				...entry,
-				hooks: kept
-			}] : [];
+function formatList(values) {
+	if (values.length <= 1) return values[0] ?? "";
+	if (values.length === 2) return `${values[0]} and ${values[1]}`;
+	return `${values.slice(0, -1).join(", ")}, and ${values.at(-1)}`;
+}
+var LogoutCommand = class LogoutCommand extends Command {
+	static description = "Log out by revoking the saved Primitive CLI OAuth grant and deleting local credentials. Use --force to remove local credentials, pending email-code auth state, and stale credential locks without contacting Primitive.";
+	static summary = "Log out and revoke the saved CLI OAuth grant";
+	static examples = ["<%= config.bin %> logout", "<%= config.bin %> logout --force"];
+	static flags = {
+		"api-base-url": Flags.string({
+			description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+			env: "PRIMITIVE_API_BASE_URL",
+			hidden: true
 		}),
-		changed
+		force: Flags.boolean({
+			char: "f",
+			description: "Remove local CLI credentials, pending email-code auth state, and any credential lock without revoking the server OAuth grant"
+		})
 	};
-}
-/**
-* Apply fixes for the requested checks to a copy of the settings. Only
-* Primitive-owned hooks are added, rewritten or removed; every other key,
-* entry and sibling hook is carried over unchanged.
-*/
-function repairClaudeHooks(settings, context, checks) {
-	const changed = /* @__PURE__ */ new Set();
-	const hooks = record$2(settings.hooks) ? { ...settings.hooks } : {};
-	const cli = context.blocked === null ? context.cli : null;
-	for (const [id, spec] of Object.entries(GLOBAL_HOOKS)) {
-		if (!checks.has(id) || !cli) continue;
-		const entries = eventEntries(hooks, spec.event);
-		if (entries === "invalid") continue;
-		let placed = false;
-		const result = rewriteEntries(entries, (hook) => {
-			if (!isGlobalManaged(hook, spec)) return hook;
-			if (placed) return void 0;
-			placed = true;
-			if (globalHookCurrent(hook, cli)) return hook;
-			return {
-				...hook,
-				command: cli.node,
-				args: globalHookArgs(cli, spec)
-			};
-		});
-		let next = result.entries;
-		if (!placed) next = [...next, { hooks: [{
-			type: "command",
-			command: cli.node,
-			args: globalHookArgs(cli, spec),
-			timeout: spec.timeout
-		}] }];
-		if (result.changed || !placed) {
-			hooks[spec.event] = next;
-			changed.add(id);
+	async run() {
+		const { flags } = await this.parse(LogoutCommand);
+		if (flags.force) {
+			runForceLogout({ configDir: this.config.configDir });
+			return;
 		}
-	}
-	if (checks.has("claude.hook.stop") && context.blocked === null) {
-		if (!SESSION_EVENTS.some((event) => eventEntries(hooks, event) === "invalid")) {
-			const verdicts = judgeSessionHooks(hooks, context.cli);
-			for (const event of SESSION_EVENTS) {
-				const entries = eventEntries(hooks, event);
-				if (entries === "invalid" || entries.length === 0) continue;
-				const result = rewriteEntries(entries, (hook) => {
-					const verdict = verdicts.get(hook);
-					if (verdict === "stale" || verdict === "duplicate") return void 0;
-					if (verdict !== "outdated" || !cli || !record$2(hook)) return hook;
-					const parsed = parseSessionHook(hook);
-					const args = [...hook.args];
-					args[0] = parsed?.kind === "pending" ? cli.pending : cli.wake;
-					args[1] = cli.entry;
-					return {
-						...hook,
-						command: cli.node,
-						args
-					};
-				});
-				if (result.changed) {
-					hooks[event] = result.entries;
-					changed.add("claude.hook.stop");
-				}
-			}
+		let releaseCredentialsLock;
+		try {
+			releaseCredentialsLock = acquireCliCredentialsLock(this.config.configDir);
+		} catch (error) {
+			throw cliError$1(error instanceof Error ? error.message : String(error));
+		}
+		try {
+			await runLogoutWithCredentialLock({
+				configDir: this.config.configDir,
+				flags
+			});
+		} finally {
+			releaseCredentialsLock();
 		}
 	}
-	if (!changed.size) return {
-		settings,
-		changed
-	};
-	return {
-		settings: {
-			...settings,
-			hooks
-		},
-		changed
-	};
-}
+};
 //#endregion
 //#region src/oclif/codex-machine-hooks.ts
 function record$1(value) {
@@ -53496,7 +53919,10 @@ async function runMachineDoctor(options) {
 	let settingsRead = readClaudeSettings(paths.claudeDir);
 	const hookContext = {
 		cli,
-		blocked: hookBlocked
+		blocked: hookBlocked,
+		get bound() {
+			return boundSessionProfiles(options.configDir);
+		}
 	};
 	const hookCheck = (id) => ({
 		inspect: () => {
@@ -60422,6 +60848,7 @@ const COMMANDS = {
 	completion: CompletionCommand,
 	"agent:upgrade": AgentUpgradeCommand,
 	"agent:connect": AgentConnectCommand,
+	"agent:check-mail": AgentCheckMailCommand,
 	"agent:disconnect": AgentDisconnectCommand,
 	"agent:enroll": AgentEnrollCommand,
 	"agent:session-register": AgentSessionRegisterCommand,