@capxul/sdk 3.2.0 → 4.0.0

package/dist/{create-capxul-client-BCq08ppe.mjs → create-capxul-client-DyCEJZtD.mjs}

@@ -1,5 +1,5 @@
-import { $ as CHAIN_UPSTREAMS, A as toBudgetId, B as toOrgId, C as ZERO_BYTES32, E as toAddress, F as toEmail, G as toRoleKey, H as toPayrollGroupId, J as CAPXUL_ERROR_CODES, M as toCountryCode, N as toCurrencyCode, Q as isCapxulError, S as WEI_RE, T as toAccountId, U as toPayrollRunId, V as toPartyId, X as EXPECTED_OPERATION_OUTCOMES, Y as CapxulError, Z as Errors, _ as deriveCapxulSafeAddress, at as failureFingerprint, b as EVM_ADDRESS_RE$1, ct as revertSummaryText, et as FAILURE_MODES$1, it as decodeChainCause, j as toChainId, k as toAuthUserId, lt as containsSensitiveMaterial, n as InMemoryAuthCacheAdapter, nt as chainCauseProperties, ot as isChainUpstream, p as orgRoleKeyForLabel, r as BrowserAuthCacheAdapter, rt as chainEvidenceLabel, st as isFailureMode, tt as boundedResponseHeaders, ut as redactSecrets, v as APP_ID_RE, x as SUPPORTED_CURRENCY_CODES, y as BYTES32_RE } from "./clock-CWpcQlLy.mjs";
-import { Context, Data, Deferred, Duration, Effect, Exit, Fiber, Layer, Queue, Ref, Result, Schema, SchemaGetter, Scope } from "effect";
+import { $ as CapxulError, A as toAuthUserId, C as WEI_RE, D as toAddress, E as toAccountId, G as toPayrollRunId, H as toOrgId, I as toEmail, M as toChainId, N as toCountryCode, P as toCurrencyCode, Q as CAPXUL_ERROR_CODES, S as SUPPORTED_CURRENCY_CODES, U as toPartyId, W as toPayrollGroupId, _ as deriveCapxulSafeAddress, at as boundedResponseHeaders, b as BYTES32_RE, ct as decodeChainCause, dt as isFailureMode, et as EXPECTED_OPERATION_OUTCOMES, ft as revertSummaryText, it as FAILURE_MODES$1, j as toBudgetId, lt as failureFingerprint, mt as redactSecrets, n as InMemoryAuthCacheAdapter, nt as isCapxulError, ot as chainCauseProperties, p as orgRoleKeyForLabel, pt as containsSensitiveMaterial, q as toRoleKey, r as BrowserAuthCacheAdapter, rt as CHAIN_UPSTREAMS, st as chainEvidenceLabel, tt as Errors, ut as isChainUpstream, v as validateHandle, w as ZERO_BYTES32, x as EVM_ADDRESS_RE$1, y as APP_ID_RE } from "./clock-C2AUlq1V.mjs";
+import { Context, Data, Deferred, Duration, Effect, Exit, Fiber, Layer, Queue, Ref, Result, Schema, SchemaGetter, SchemaParser, Scope } from "effect";
 import { formatUnits, keccak256, parseUnits, recoverAddress, toBytes } from "viem";
 import { makeFunctionReference } from "convex/server";
 //#region src/domain/identity/model.ts
@@ -494,7 +494,6 @@ const CAPXUL_OPERATIONS = {
 		current: "holdings.current",
 		primary: "holdings.primary"
 	},
-	handles: { resolve: "handles.resolve" },
 	identity: {
 		accountAt: "identity.AccountAt",
 		accountClaimed: "identity.AccountClaimed",
@@ -530,7 +529,7 @@ const CAPXUL_OPERATIONS = {
 		signOut: "identity.SignOut",
 		signOutFailed: "identity.SignOutFailed",
 		update: "identity.update",
-		usernameAvailable: "identity.usernameAvailable",
+		handleAvailable: "identity.handleAvailable",
 		verified: "identity.Verified",
 		verifyFailed: "identity.VerifyFailed",
 		verifyOtp: "identity.VerifyOtp"
@@ -546,10 +545,12 @@ const CAPXUL_OPERATIONS = {
 		get: "me.get"
 	},
 	moneyExecution: {
+		abandonPaymentExecution: "moneyExecution.abandonPaymentExecution",
 		prepareOrganizationPaymentExecution: "moneyExecution.prepareOrganizationPaymentExecution",
 		preparePaymentExecution: "moneyExecution.preparePaymentExecution",
 		preparePaymentLifecycleExecution: "moneyExecution.preparePaymentLifecycleExecution",
 		preparePermissionExecution: "moneyExecution.preparePermissionExecution",
+		recoverSubmissionClaims: "moneyExecution.recoverSubmissionClaims",
 		submit: "moneyExecution.submit",
 		submitPaymentCommandExecution: "moneyExecution.submitPaymentCommandExecution",
 		submitPaymentExecution: "moneyExecution.submitPaymentExecution",
@@ -568,9 +569,14 @@ const CAPXUL_OPERATIONS = {
 		quote: "offramp.quote",
 		status: "offramp.status"
 	},
-	onboarding: { completePerson: "onboarding.completePerson" },
+	onboarding: {
+		completeOrganization: "onboarding.completeOrganization",
+		completePerson: "onboarding.completePerson"
+	},
 	org: {
+		acceptInvitations: "org.acceptInvitations",
 		account: { get: "org.account.get" },
+		activateMember: "org.activateMember",
 		auditLog: "org.auditLog",
 		confirmBootstrap: "org.confirmBootstrap",
 		createOrg: "org.createOrg",
@@ -581,6 +587,7 @@ const CAPXUL_OPERATIONS = {
 		getProofReceipt: "org.getProofReceipt",
 		invite: "org.invite",
 		inviteMember: "org.inviteMember",
+		list: "org.list",
 		load: "org.load",
 		me: "org.me",
 		members: "org.members",
@@ -673,11 +680,7 @@ const CAPXUL_OPERATIONS = {
 		render: "paymentDocuments.render",
 		verify: "paymentDocuments.verify"
 	},
-	payees: {
-		create: "payees.create",
-		get: "payees.get",
-		resolve: "payees.resolve"
-	},
+	recipient: { resolve: "recipient.resolve" },
 	payroll: {
 		authorizeRun: "payroll.authorizeRun",
 		groups: {
@@ -759,12 +762,6 @@ const CAPXUL_OPERATIONS = {
 		ping: "system.ping",
 		runtimeChain: "system.runtimeChain"
 	},
-	targets: { resolve: {
-		email: "targets.resolve.email",
-		handle: "targets.resolve.handle",
-		organization: "targets.resolve.organization",
-		payee: "targets.resolve.payee"
-	} },
 	testUsdc: { mint: "TestUSDC.mint" },
 	_internal: {
 		accounts: { fund: "_internal.accounts.fund" },
@@ -1192,32 +1189,116 @@ const OrgInviteExpiredProps = Schema.Struct({
 	role: OptionalString,
 	status: OptionalString
 });
+const RecipientLocatorKindSchema = Schema.Literals([
+	"handle",
+	"email",
+	"address",
+	"party"
+]);
+const RecipientResolutionStatusSchema = Schema.Literals([
+	"known_party",
+	"new_email",
+	"external_address"
+]);
+const RecipientPartyKindSchema = Schema.Literals([
+	"person",
+	"organization",
+	"unresolved"
+]);
+const RecipientTelemetryProps = {
+	recipient_locator_kind: Schema.optional(RecipientLocatorKindSchema),
+	recipient_resolution_status: Schema.optional(RecipientResolutionStatusSchema),
+	recipient_party_id: OptionalString,
+	recipient_party_kind: Schema.optional(RecipientPartyKindSchema),
+	recipient_is_capxul_account: Schema.optional(Schema.Boolean),
+	recipient_handle: OptionalString,
+	recipient_address: OptionalAddress,
+	external_address_acknowledged: Schema.optional(Schema.Boolean)
+};
 const PaymentInitiatedProps = Schema.Struct({
+	command_id: OptionalString,
+	execution_id: OptionalString,
+	payment_lifecycle_id: OptionalString,
 	...TelemetryEnvelopeProps,
+	...RecipientTelemetryProps,
 	kind: Schema.String,
 	payment_id: Schema.String
 });
+const PaymentLifecycleProps = {
+	payment_state: OptionalString,
+	execution_state: OptionalString,
+	occurred_at: Schema.optional(Schema.Number),
+	causal_sequence: Schema.optional(Schema.Number),
+	sponsorship_valid_until: Schema.optional(Schema.Number),
+	terminal_event_id: OptionalString
+};
 const PaymentSettledL2Props = Schema.Struct({
+	...PaymentLifecycleProps,
 	...TelemetryEnvelopeProps,
+	...RecipientTelemetryProps,
 	kind: Schema.String,
 	chain_id: Schema.Number,
-	settlement_id: Schema.String
+	settlement_id: Schema.String,
+	payment_id: OptionalString,
+	payment_ids: OptionalString,
+	command_id: OptionalString,
+	payment_lifecycle_id: OptionalString,
+	execution_id: OptionalString,
+	user_op_hash: OptionalString,
+	transaction_hash: OptionalString
 });
 const PaymentFailedL2Props = Schema.Struct({
+	...PaymentLifecycleProps,
 	...TelemetryEnvelopeProps,
 	...ChainCauseTelemetryProps,
+	...RecipientTelemetryProps,
 	kind: Schema.String,
 	payment_id: Schema.String,
-	reason_code: Schema.String
+	payment_ids: OptionalString,
+	reason_code: Schema.String,
+	command_id: OptionalString,
+	payment_lifecycle_id: OptionalString,
+	execution_id: OptionalString,
+	user_op_hash: OptionalString
 });
 const PaymentVerificationRetryProps = Schema.Struct({
+	...PaymentLifecycleProps,
 	...TelemetryEnvelopeProps,
+	...RecipientTelemetryProps,
 	command_id: Schema.String,
+	payment_lifecycle_id: Schema.String,
 	attempt: Schema.Number,
 	reason_code: Schema.String,
 	chain_id: Schema.Number,
 	delay_ms: DurationMsSchema$1,
-	outcome: Schema.Literals(["scheduled", "unresolved"])
+	outcome: Schema.Literals(["scheduled", "unresolved"]),
+	payment_id: OptionalString,
+	payment_ids: OptionalString,
+	execution_id: OptionalString,
+	user_op_hash: OptionalString
+});
+const PaymentLifecycleTransitionProps = Schema.Struct({
+	...TelemetryEnvelopeProps,
+	...RecipientTelemetryProps,
+	payment_id: Schema.String,
+	payment_lifecycle_id: Schema.String,
+	command_id: Schema.String,
+	payment_state: Schema.String,
+	occurred_at: Schema.Number,
+	causal_sequence: Schema.Number,
+	execution_id: OptionalString,
+	execution_state: OptionalString,
+	user_op_hash: OptionalString,
+	sponsorship_valid_until: Schema.optional(Schema.Number),
+	reason_code: OptionalString
+});
+const QuickPayExternalAddressAcknowledgedProps = Schema.Struct({
+	...TelemetryEnvelopeProps,
+	recipient_locator_kind: Schema.Literal("address"),
+	recipient_resolution_status: Schema.Literal("external_address"),
+	recipient_address: AddressSchema$1,
+	external_address_acknowledged: Schema.Literal(true),
+	organization_id: OptionalOrgId
 });
 const DepositInitiatedProps = Schema.Struct({ ...TelemetryEnvelopeProps });
 const DepositSettledProps = Schema.Struct({
@@ -1425,6 +1506,14 @@ Schema.Struct({
 	name: Schema.Literal("payment_verification_retry"),
 	props: PaymentVerificationRetryProps
 });
+Schema.Struct({
+	name: Schema.Literal("payment_lifecycle_transition"),
+	props: PaymentLifecycleTransitionProps
+});
+Schema.Struct({
+	name: Schema.Literal("quick_pay_external_address_acknowledged"),
+	props: QuickPayExternalAddressAcknowledgedProps
+});
 Schema.Struct({
 	name: Schema.Literal("deposit_initiated"),
 	props: DepositInitiatedProps
@@ -1774,16 +1863,13 @@ const CAPXUL_FUNCTIONS = {
 		list: "financialOps/destinations:list",
 		remove: "financialOps/destinations:remove"
 	},
-	"financialOps/mutations": { createPayee: "financialOps/mutations:createPayee" },
 	"financialOps/queries": {
 		depositInstructions: "financialOps/queries:depositInstructions",
-		getPayee: "financialOps/queries:getPayee",
 		getPayment: "financialOps/queries:getPayment",
 		listPayments: "financialOps/queries:listPayments",
 		me: "financialOps/queries:me",
 		renderStoredDocument: "financialOps/queries:renderStoredDocument",
-		resolveHandle: "financialOps/queries:resolveHandle",
-		resolvePayee: "financialOps/queries:resolvePayee",
+		resolveRecipient: "financialOps/queries:resolveRecipient",
 		verifyPaymentDocument: "financialOps/queries:verifyPaymentDocument"
 	},
 	"financialOps/requestsInbox": {
@@ -1802,7 +1888,7 @@ const CAPXUL_FUNCTIONS = {
 	},
 	"identity/queries": {
 		loadByAuthUserId: "identity/queries:loadByAuthUserId",
-		usernameAvailable: "identity/queries:usernameAvailable"
+		handleAvailable: "identity/queries:handleAvailable"
 	},
 	"holdings/actions": { current: "holdings/actions:current" },
 	"movement/activity": {
@@ -1812,6 +1898,7 @@ const CAPXUL_FUNCTIONS = {
 		summary: "movement/activity:summary"
 	},
 	"moneyExecution/actions": {
+		abandonPaymentExecution: "moneyExecution/actions:abandonPaymentExecution",
 		preparePermissionExecution: "moneyExecution/actions:preparePermissionExecution",
 		preparePaymentExecution: "moneyExecution/actions:preparePaymentExecution",
 		submitPermissionExecution: "moneyExecution/actions:submitPermissionExecution",
@@ -1889,6 +1976,7 @@ const CAPXUL_FUNCTIONS = {
 const PAYMENT_STATUSES = [
 	"pending",
 	"settling",
+	"unresolved",
 	"scheduled",
 	"streaming",
 	"pending_claim",
@@ -1896,6 +1984,30 @@ const PAYMENT_STATUSES = [
 	"cancelled",
 	"failed"
 ];
+/** The lifecycle of one signed Payment execution attempt. */
+const PAYMENT_EXECUTION_STATUS = {
+	PENDING: "pending",
+	INCLUDED: "included",
+	DROPPED: "dropped",
+	REPLACED: "replaced",
+	EXPIRED: "expired",
+	UNRESOLVED: "unresolved",
+	SUPERSEDED: "superseded",
+	FAILED: "failed",
+	SETTLED: "settled"
+};
+const PAYMENT_EXECUTION_STATUSES = [
+	PAYMENT_EXECUTION_STATUS.PENDING,
+	PAYMENT_EXECUTION_STATUS.INCLUDED,
+	PAYMENT_EXECUTION_STATUS.DROPPED,
+	PAYMENT_EXECUTION_STATUS.REPLACED,
+	PAYMENT_EXECUTION_STATUS.EXPIRED,
+	PAYMENT_EXECUTION_STATUS.UNRESOLVED,
+	PAYMENT_EXECUTION_STATUS.SUPERSEDED,
+	PAYMENT_EXECUTION_STATUS.FAILED,
+	PAYMENT_EXECUTION_STATUS.SETTLED
+];
+PAYMENT_EXECUTION_STATUS.DROPPED, PAYMENT_EXECUTION_STATUS.REPLACED, PAYMENT_EXECUTION_STATUS.EXPIRED, PAYMENT_EXECUTION_STATUS.SUPERSEDED;
 /** The payment direction relative to the current actor. */
 const PAYMENT_DIRECTIONS = [
 	"in",
@@ -1931,22 +2043,16 @@ const EVM_ADDRESS_RE = /^0x[a-fA-F0-9]{40}$/;
 */
 const PAYMENT_DOCUMENT_VERIFYING_CONTRACT = "0x7a5c25aB7ce91d7a475B71cd1ec33E230291f8a4";
 const PAYMENT_ID_RE = /^payment_[0-9A-Za-z]+$/;
-const PAYEE_ID_RE = /^payee_[0-9A-Za-z]+$/;
 const ORG_ID_RE = /^org_[0-9A-Za-z]+$/;
-const USER_ID_RE = /^user_[0-9A-Za-z]+$/;
 const PARTY_ID_RE = /^party_[0-9A-Za-z]+$/;
-const HANDLE_RE = /^@?[a-z0-9][a-z0-9-]{2,31}$/;
-const ORG_HANDLE_RE = /^[a-z0-9][a-z0-9-]{2,31}$/;
+const HANDLE_RE = /^@?[a-z0-9_-]{3,30}$/;
 const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 const MinorUnitStringSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => MINOR_UNIT_STRING_RE.test(value), { message: "must be a non-negative integer minor-unit string" })));
 const PaymentIdSchema$1 = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => PAYMENT_ID_RE.test(value), { message: "must be payment_ plus an alphanumeric id" })));
-const PayeeIdSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => PAYEE_ID_RE.test(value), { message: "must be payee_ plus an alphanumeric id" })));
 const OrgIdSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => ORG_ID_RE.test(value), { message: "must be org_ plus an alphanumeric id" })));
-const UserIdSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => USER_ID_RE.test(value), { message: "must be user_ plus an alphanumeric id" })));
 const PartyIdSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => PARTY_ID_RE.test(value), { message: "must be party_ plus an alphanumeric id" })));
 const DecimalStringSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => DECIMAL_STRING_RE.test(value), { message: "must be a non-negative decimal string" })));
 const HandleValueSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => !EVM_ADDRESS_RE.test(value) && HANDLE_RE.test(value), { message: "must be a handle; raw addresses are not accepted" })));
-const OrgHandleValueSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => !EVM_ADDRESS_RE.test(value) && ORG_HANDLE_RE.test(value), { message: "must be an org handle; raw addresses are not accepted" })));
 const EmailValueSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => !EVM_ADDRESS_RE.test(value) && EMAIL_RE.test(value), { message: "must be an email; raw addresses are not accepted" })));
 const Uint8Schema$1 = Schema.Number.pipe(Schema.check(Schema.makeFilter((value) => Number.isSafeInteger(value) && value >= 0 && value <= 255, { message: "must be a uint8" })));
 const Uint64Schema = Schema.Number.pipe(Schema.check(Schema.makeFilter((value) => Number.isSafeInteger(value) && value >= 0, { message: "must be a non-negative safe integer" })));
@@ -2066,42 +2172,39 @@ const WithdrawalDocumentEnvelope = Schema.Struct({
 	primaryType: Schema.Literal("Withdrawal"),
 	message: WithdrawalDocument
 });
-Schema.Union([AttachablePaymentDocumentEnvelope, WithdrawalDocumentEnvelope]);
-Schema.Struct({
-	payeeId: PayeeIdSchema,
-	label: Schema.String,
-	trustState: Schema.Literals([
-		"unverified",
-		"trusted",
-		"blocked"
-	]),
-	destinationKind: Schema.Literals([
-		"handle",
-		"email",
-		"saved-payee",
-		"org"
-	])
-});
-const PaymentRecipient = Schema.Struct({
-	kind: Schema.Literals([
-		"handle",
-		"email",
-		"payee",
-		"capxulUserId",
-		"me",
-		"org",
-		"party",
-		"external_address"
-	]),
-	label: Schema.String,
-	payeeId: Schema.optional(PayeeIdSchema)
-});
+const PaymentDocumentEnvelope = Schema.Union([AttachablePaymentDocumentEnvelope, WithdrawalDocumentEnvelope]);
+const ENVELOPE_PRIMARY_TYPE_TO_KIND = {
+	Memo: "memo",
+	Invoice: "invoice",
+	Payslip: "payslip",
+	Receipt: "receipt",
+	Withdrawal: "withdrawal"
+};
 /**
-* A raw external EVM address for the B3 withdraw lane — the cash-out
-* destination. This is the ONE schema that ACCEPTS a bare 0x (the withdraw
-* mutation args use it), as opposed to `PaymentRecipientRefSchema` which
-* REJECTS bare addresses to protect the pay lane. The full address never
-* crosses the model wire; it lives on the kind:4 Withdrawal document only.
+* Derive the wire `paymentType` an UNKNOWN document envelope classifies to
+* (payment-document-spec.md D11: memo/withdrawal → unspecified, invoice →
+* invoice, payslip → payroll, receipt → reimbursement), or `undefined` if the
+* envelope is absent / malformed — the same tolerance as
+* `tryHashPaymentDocument`. Callers holding an untyped envelope (e.g. the MCP
+* org spend port, #712) use this so the type they record agrees with the type
+* the backend re-derives from the same document.
+*/
+function paymentTypeForDocumentEnvelope(envelope) {
+	if (envelope === void 0 || envelope === null) return void 0;
+	const decoded = SchemaParser.decodeUnknownResult(PaymentDocumentEnvelope)(envelope);
+	if (decoded._tag === "Failure") return void 0;
+	return paymentTypeForDocumentKind(ENVELOPE_PRIMARY_TYPE_TO_KIND[decoded.success.primaryType]);
+}
+const PaymentRecipient = Schema.Union([Schema.Struct({
+	kind: Schema.Literal("party"),
+	partyId: PartyIdSchema,
+	label: Schema.String
+}), Schema.Struct({
+	kind: Schema.Literal("external_address"),
+	label: Schema.String
+})]);
+/**
+* A raw external EVM address for a payment or withdrawal destination.
 */
 const ExternalAddressSchema = Schema.String.pipe(Schema.check(Schema.makeFilter((value) => EVM_ADDRESS_RE.test(value), { message: "must be a 0x EVM address (40 hex chars)" })));
 const PaymentTiming = Schema.Union([
@@ -2127,16 +2230,8 @@ const PaymentRef = Schema.Union([
 		email: EmailValueSchema
 	}),
 	Schema.Struct({
-		kind: Schema.Literal("orgHandle"),
-		orgHandle: OrgHandleValueSchema
-	}),
-	Schema.Struct({
-		kind: Schema.Literal("capxulUserId"),
-		capxulUserId: UserIdSchema
-	}),
-	Schema.Struct({
-		kind: Schema.Literal("payeeId"),
-		payeeId: PayeeIdSchema
+		kind: Schema.Literal("address"),
+		address: ExternalAddressSchema
 	}),
 	Schema.Struct({
 		kind: Schema.Literal("party"),
@@ -2159,6 +2254,10 @@ const Payment = Schema.Struct({
 	timing: PaymentTiming,
 	released: FinancialOpsMoney,
 	availableToClaim: FinancialOpsMoney,
+	execution: Schema.optional(Schema.Struct({
+		status: Schema.Literals(PAYMENT_EXECUTION_STATUSES),
+		retryRequired: Schema.Boolean
+	})),
 	createdAt: EpochMsSchema,
 	updatedAt: EpochMsSchema
 }).pipe(Schema.check(Schema.makeFilter((payment) => payment.documents.every((document) => paymentTypeForDocumentKind(document.kind) === payment.paymentType), { message: "document kind must map to paymentType" })));
@@ -2303,11 +2402,21 @@ const MovementIdentitySchema = Schema.Struct({
 	txHash: TxHashSchema,
 	logIndex: LogIndexSchema
 });
-const MovementCanonicalStateSchema = Schema.Literals([
+const MovementCanonicalStateInputSchema = Schema.Literals([
 	"observed",
+	"included",
 	"finalized",
 	"removed"
 ]);
+const MovementCanonicalStateOutputSchema = Schema.Literals([
+	"observed",
+	"included",
+	"removed"
+]);
+const MovementCanonicalStateSchema = MovementCanonicalStateInputSchema.pipe(Schema.decodeTo(MovementCanonicalStateOutputSchema, {
+	decode: SchemaGetter.transform((state) => state === "finalized" ? "included" : state),
+	encode: SchemaGetter.transform((state) => state)
+}));
 const MovementSchema = Schema.Struct({
 	...MovementIdentitySchema.fields,
 	movementId: MovementIdSchema,
@@ -2658,7 +2767,7 @@ Schema.Struct({
 	transfers: Schema.Array(TransferEvidenceSchema),
 	requestCount: nonNegativeInteger("requestCount")
 });
-const FinalizedMoneyEvidenceCommonSchema = Schema.Struct({
+const VerifiedMoneyEvidenceCommonSchema = Schema.Struct({
 	chainId: BaseSepoliaChainIdSchema,
 	contractAddress: AddressSchema,
 	userOpHash: Bytes32Schema,
@@ -2668,8 +2777,8 @@ const FinalizedMoneyEvidenceCommonSchema = Schema.Struct({
 	blockTimestamp: Uint48Schema,
 	eventLogIndex: LogIndexSchema
 });
-const FinalizedPaymentEvidenceSchema = Schema.Struct({
-	...FinalizedMoneyEvidenceCommonSchema.fields,
+const VerifiedPaymentEvidenceSchema = Schema.Struct({
+	...VerifiedMoneyEvidenceCommonSchema.fields,
 	operation: Schema.Literal("send"),
 	settlementId: SettlementIdSchema,
 	purposeKind: PaymentPurposeKindSchema,
@@ -2681,8 +2790,8 @@ const FinalizedPaymentEvidenceSchema = Schema.Struct({
 	destination: AddressSchema,
 	rawAmount: WeiAmountSchema
 });
-const FinalizedCommitmentCreationEvidenceSchema = Schema.Struct({
-	...FinalizedMoneyEvidenceCommonSchema.fields,
+const VerifiedCommitmentCreationEvidenceSchema = Schema.Struct({
+	...VerifiedMoneyEvidenceCommonSchema.fields,
 	operation: Schema.Literal("create_commitment"),
 	commitmentId: Uint256StringSchema,
 	settlementId: SettlementIdSchema,
@@ -2698,8 +2807,8 @@ const FinalizedCommitmentCreationEvidenceSchema = Schema.Struct({
 	documentHash: NonzeroDocumentHashSchema,
 	transferLogIndex: LogIndexSchema
 });
-const FinalizedCommitmentClaimEvidenceSchema = Schema.Struct({
-	...FinalizedMoneyEvidenceCommonSchema.fields,
+const VerifiedCommitmentClaimEvidenceSchema = Schema.Struct({
+	...VerifiedMoneyEvidenceCommonSchema.fields,
 	operation: Schema.Literal("claim_commitment"),
 	commitmentId: Uint256StringSchema,
 	settlementId: SettlementIdSchema,
@@ -2712,8 +2821,8 @@ const FinalizedCommitmentClaimEvidenceSchema = Schema.Struct({
 	documentHash: NonzeroDocumentHashSchema,
 	transferLogIndex: LogIndexSchema
 });
-const FinalizedCommitmentCancelEvidenceSchema = Schema.Struct({
-	...FinalizedMoneyEvidenceCommonSchema.fields,
+const VerifiedCommitmentCancelEvidenceSchema = Schema.Struct({
+	...VerifiedMoneyEvidenceCommonSchema.fields,
 	operation: Schema.Literal("cancel_commitment"),
 	commitmentId: Uint256StringSchema,
 	settlementId: SettlementIdSchema,
@@ -2727,8 +2836,8 @@ const FinalizedCommitmentCancelEvidenceSchema = Schema.Struct({
 	documentHash: NonzeroDocumentHashSchema,
 	transfer: Schema.NullOr(TransferEvidenceSchema)
 });
-const FinalizedCommitmentRedirectEvidenceSchema = Schema.Struct({
-	...FinalizedMoneyEvidenceCommonSchema.fields,
+const VerifiedCommitmentRedirectEvidenceSchema = Schema.Struct({
+	...VerifiedMoneyEvidenceCommonSchema.fields,
 	operation: Schema.Literal("redirect_commitment"),
 	commitmentId: Uint256StringSchema,
 	settlementId: SettlementIdSchema,
@@ -2739,12 +2848,12 @@ const FinalizedCommitmentRedirectEvidenceSchema = Schema.Struct({
 	documentHash: NonzeroDocumentHashSchema,
 	transfer: Schema.Null
 });
-const FinalizedMoneyEvidenceSchema = Schema.Union([
-	FinalizedPaymentEvidenceSchema,
-	FinalizedCommitmentCreationEvidenceSchema,
-	FinalizedCommitmentClaimEvidenceSchema,
-	FinalizedCommitmentCancelEvidenceSchema,
-	FinalizedCommitmentRedirectEvidenceSchema
+const VerifiedMoneyEvidenceSchema = Schema.Union([
+	VerifiedPaymentEvidenceSchema,
+	VerifiedCommitmentCreationEvidenceSchema,
+	VerifiedCommitmentClaimEvidenceSchema,
+	VerifiedCommitmentCancelEvidenceSchema,
+	VerifiedCommitmentRedirectEvidenceSchema
 ]);
 Schema.Union([
 	Schema.Struct({
@@ -2754,7 +2863,7 @@ Schema.Union([
 	}),
 	Schema.Struct({
 		status: Schema.Literal("verified"),
-		evidence: FinalizedMoneyEvidenceSchema
+		evidence: VerifiedMoneyEvidenceSchema
 	}),
 	Schema.Struct({
 		status: Schema.Literal("mismatch"),
@@ -2766,7 +2875,7 @@ Schema.Union([
 		retryable: Schema.Literal(true)
 	})
 ]);
-const FinalizedAttributedInboundMovementSchema = Schema.Struct({
+const VerifiedAttributedInboundMovementSchema = Schema.Struct({
 	movement: MovementSchema,
 	attribution: MovementAttributionSchema
 });
@@ -2792,6 +2901,25 @@ const ProtocolBirthInputSchema = Schema.Struct({
 	release: ReleaseTermsSchema,
 	lineage: Schema.optional(PaymentCommandLineageSchema)
 }).pipe(Schema.refine((birth) => hasActorBoundPermission(birth.actor, birth.actor.kind === "organization" ? birth.actor.orgId : void 0, birth.permissionId), { message: "Organization Payment and Payout births require permissionId; personal births forbid it" }));
+const ApplyVerifiedEvidenceCommandSchema = Schema.Struct({
+	kind: Schema.Literal("apply_verified_evidence"),
+	paymentId: PaymentIdSchema,
+	evidence: VerifiedMoneyEvidenceSchema
+});
+const ApplyFinalizedEvidenceCommandSchema = Schema.Struct({
+	kind: Schema.Literal("apply_finalized_evidence"),
+	paymentId: PaymentIdSchema,
+	evidence: VerifiedMoneyEvidenceSchema
+}).pipe(Schema.decodeTo(ApplyVerifiedEvidenceCommandSchema, {
+	decode: SchemaGetter.transform((value) => ({
+		...value,
+		kind: "apply_verified_evidence"
+	})),
+	encode: SchemaGetter.transform((value) => ({
+		...value,
+		kind: "apply_finalized_evidence"
+	}))
+}));
 Schema.Union([
 	Schema.Struct({
 		kind: Schema.Literal("birth"),
@@ -2799,7 +2927,7 @@ Schema.Union([
 	}),
 	Schema.Struct({
 		kind: Schema.Literal("birth_deposit"),
-		movement: FinalizedAttributedInboundMovementSchema
+		movement: VerifiedAttributedInboundMovementSchema
 	}),
 	Schema.Struct({
 		kind: Schema.Literal("rollback_deposit"),
@@ -2811,11 +2939,8 @@ Schema.Union([
 		paymentIds: Schema.Array(PaymentIdSchema),
 		userOpHash: Bytes32Schema
 	}),
-	Schema.Struct({
-		kind: Schema.Literal("apply_finalized_evidence"),
-		paymentId: PaymentIdSchema,
-		evidence: FinalizedMoneyEvidenceSchema
-	}),
+	ApplyVerifiedEvidenceCommandSchema,
+	ApplyFinalizedEvidenceCommandSchema,
 	Schema.Struct({
 		kind: Schema.Literal("transition"),
 		paymentId: PaymentIdSchema,
@@ -2957,6 +3082,7 @@ const MoneyExecutionIdSchema = Schema.String.pipe(Schema.refine((value) => /^mon
 const OwnerSignatureSchema = Schema.String.pipe(Schema.refine((value) => /^0x[0-9a-fA-F]{130}$/u.test(value), { message: "signature must be a 65-byte 0x value" }));
 const PaymentExecutionIntentSchema = Schema.Struct({
 	to: PaymentRef,
+	externalAddressAcknowledged: Schema.optional(Schema.Literal(true)),
 	amount: FinancialOpsMoney,
 	paymentType: Schema.optional(Schema.Literals([
 		"unspecified",
@@ -2973,7 +3099,31 @@ Schema.Struct({
 	signerAddress: AddressSchema,
 	payment: PaymentExecutionIntentSchema
 });
+const RecipientObservationSchema = Schema.Struct({
+	recipient_locator_kind: Schema.Literals([
+		"handle",
+		"email",
+		"party",
+		"address"
+	]),
+	recipient_resolution_status: Schema.Literals([
+		"known_party",
+		"new_email",
+		"external_address"
+	]),
+	recipient_is_capxul_account: Schema.Boolean,
+	recipient_party_id: Schema.optional(Schema.String),
+	recipient_party_kind: Schema.optional(Schema.Literals([
+		"person",
+		"organization",
+		"unresolved"
+	])),
+	recipient_handle: Schema.optional(Schema.String),
+	recipient_address: AddressSchema,
+	external_address_acknowledged: Schema.Boolean
+});
 Schema.Struct({
+	recipientObservation: RecipientObservationSchema,
 	executionId: MoneyExecutionIdSchema,
 	commandId: PaymentCommandIdSchema,
 	paymentId: PaymentIdSchema,
@@ -2990,6 +3140,14 @@ Schema.Struct({
 	executionId: MoneyExecutionIdSchema,
 	signature: OwnerSignatureSchema
 });
+Schema.Struct({
+	executionId: MoneyExecutionIdSchema,
+	reason: Schema.Literals([
+		"signer_rejected",
+		"cancelled",
+		"prepared_mismatch"
+	])
+});
 Schema.Struct({
 	executionId: MoneyExecutionIdSchema,
 	commandId: PaymentCommandIdSchema,
@@ -3003,6 +3161,10 @@ Schema.Struct({
 	payments: Schema.Array(Payment)
 });
 const PaymentLifecycleExecutionIntentSchema = Schema.Union([
+	Schema.Struct({
+		kind: Schema.Literal("retry"),
+		paymentId: PaymentIdSchema
+	}),
 	Schema.Struct({
 		kind: Schema.Literal("claim"),
 		paymentId: PaymentIdSchema
@@ -3023,6 +3185,7 @@ Schema.Struct({
 });
 const OrganizationPaymentExecutionItemSchema = Schema.Struct({
 	to: PaymentRef,
+	externalAddressAcknowledged: Schema.optional(Schema.Literal(true)),
 	amount: FinancialOpsMoney,
 	paymentType: Schema.optional(Schema.Literals([
 		"unspecified",
@@ -3041,6 +3204,8 @@ Schema.Struct({
 	lineage: Schema.optional(PaymentCommandLineageSchema)
 });
 const PreparedPaymentCommandExecutionSchema = Schema.Struct({
+	recipientObservations: Schema.Array(RecipientObservationSchema),
+	emitPaymentInitiated: Schema.Boolean,
 	executionId: MoneyExecutionIdSchema,
 	commandId: PaymentCommandIdSchema,
 	paymentIds: Schema.Array(PaymentIdSchema),
@@ -3076,7 +3241,8 @@ const PermissionCommandSchema = Schema.Union([
 		operation: Schema.Literal("assign"),
 		requestKey: nonEmpty("requestKey"),
 		permissionId: PermissionIdSchema,
-		accountId: nonEmpty("accountId")
+		accountId: nonEmpty("accountId"),
+		expectedMemberEmail: Schema.optional(nonEmpty("expectedMemberEmail"))
 	}),
 	Schema.Struct({
 		operation: Schema.Literal("revoke"),
@@ -4520,25 +4686,11 @@ function normalizeRefForBackend$1(ref, field) {
 					email: nonEmptyRefValue$1(ref.email, "email")
 				}
 			};
-			case "orgHandle": return {
+			case "address": return {
 				ok: true,
 				value: {
-					kind: "orgHandle",
-					orgHandle: nonEmptyRefValue$1(ref.orgHandle, "orgHandle")
-				}
-			};
-			case "capxulUserId": return {
-				ok: true,
-				value: {
-					kind: "capxulUserId",
-					capxulUserId: nonEmptyRefValue$1(ref.capxulUserId, "capxulUserId")
-				}
-			};
-			case "payeeId": return {
-				ok: true,
-				value: {
-					kind: "payeeId",
-					payeeId: nonEmptyRefValue$1(ref.payeeId, "payeeId")
+					kind: "address",
+					address: toAddress(ref.address)
 				}
 			};
 			case "party": return {
@@ -4802,10 +4954,7 @@ function makeAccountMethods(deps) {
 const financialOpsContract = {
 	me: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/queries"].me),
 	depositInstructions: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/queries"].depositInstructions),
-	resolveHandle: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/queries"].resolveHandle),
-	createPayee: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/mutations"].createPayee),
-	getPayee: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/queries"].getPayee),
-	resolvePayee: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/queries"].resolvePayee),
+	resolveRecipient: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/queries"].resolveRecipient),
 	addDestination: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/destinations"].add),
 	listDestinations: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/destinations"].list),
 	removeDestination: makeFunctionReference(CAPXUL_FUNCTIONS["financialOps/destinations"].remove),
@@ -4821,6 +4970,7 @@ const financialOpsContract = {
 //#endregion
 //#region src/contract/money-execution.ts
 const moneyExecutionContract = {
+	abandonPaymentExecution: makeFunctionReference(CAPXUL_FUNCTIONS["moneyExecution/actions"].abandonPaymentExecution),
 	preparePermissionExecution: makeFunctionReference(CAPXUL_FUNCTIONS["moneyExecution/actions"].preparePermissionExecution),
 	preparePaymentExecution: makeFunctionReference(CAPXUL_FUNCTIONS["moneyExecution/actions"].preparePaymentExecution),
 	prepareOrganizationPaymentExecution: makeFunctionReference(CAPXUL_FUNCTIONS["moneyExecution/paymentCommandActions"].prepareOrganizationPaymentExecution),
@@ -4831,7 +4981,7 @@ const moneyExecutionContract = {
 };
 //#endregion
 //#region package.json
-var version = "3.2.0";
+var version = "4.0.0";
 //#endregion
 //#region src/telemetry/exception-projection.ts
 /** Fixed fallback for failures that have no safe message. */
@@ -5542,7 +5692,11 @@ function emitPaymentInitiated(telemetry, input) {
 		name: "payment_initiated",
 		props: {
 			kind: input.kind,
-			payment_id: input.paymentId
+			payment_id: input.paymentId,
+			payment_lifecycle_id: `payment_lifecycle_${input.paymentId}`,
+			...input.commandId === void 0 ? {} : { command_id: input.commandId },
+			...input.executionId === void 0 ? {} : { execution_id: input.executionId },
+			...input.recipient
 		}
 	});
 }
@@ -5574,7 +5728,17 @@ async function fingerprintPaymentIntent(intent) {
 function matchesIntent(expected) {
 	return async (request) => await fingerprintPaymentIntent(request) === await fingerprintPaymentIntent(expected);
 }
-async function executePrepared(deps, prepare, isExpectedRequest, signal) {
+async function abandonPrepared$1(deps, executionId, closePayment, reason, result, onPreparedClosed) {
+	if (!closePayment) return result;
+	const abandoned = await runIfActive(void 0, CAPXUL_OPERATIONS.moneyExecution.abandonPaymentExecution, () => deps.convexCall.action(deps.functions.abandonPaymentExecution, { input: {
+		executionId,
+		reason
+	} }));
+	if (!abandoned.ok) return abandoned;
+	if (abandoned.value) onPreparedClosed?.();
+	return result;
+}
+async function executePrepared(deps, prepare, isExpectedRequest, closePaymentOnExit, onPreparedClosed, signal) {
 	if (isAborted$2(signal)) return {
 		ok: false,
 		error: Errors.cancelled({ operation: "payments" })
@@ -5595,32 +5759,45 @@ async function executePrepared(deps, prepare, isExpectedRequest, signal) {
 	}
 	const prepared = await prepare(signerAddress);
 	if (!prepared.ok) return prepared;
-	if (!await isExpectedRequest(prepared.value.request)) return {
+	if (!await isExpectedRequest(prepared.value.request)) return abandonPrepared$1(deps, prepared.value.executionId, closePaymentOnExit, "prepared_mismatch", {
 		ok: false,
 		error: Errors.invalidInput("payment", "prepared command mismatch")
-	};
+	}, onPreparedClosed);
 	const expectedSafe = deriveCapxulSafeAddress({ email: session.email });
-	if (prepared.value.chainId !== deps.chainId || prepared.value.signerAddress.toLowerCase() !== signerAddress.toLowerCase() || prepared.value.userOpSenderSafe.toLowerCase() !== expectedSafe.toLowerCase()) return {
+	if (prepared.value.chainId !== deps.chainId || prepared.value.signerAddress.toLowerCase() !== signerAddress.toLowerCase() || prepared.value.userOpSenderSafe.toLowerCase() !== expectedSafe.toLowerCase()) return abandonPrepared$1(deps, prepared.value.executionId, closePaymentOnExit, "prepared_mismatch", {
 		ok: false,
 		error: Errors.invalidInput("payment", "prepared authority mismatch")
-	};
-	if (isAborted$2(signal)) return {
+	}, onPreparedClosed);
+	if (isAborted$2(signal)) return abandonPrepared$1(deps, prepared.value.executionId, closePaymentOnExit, "cancelled", {
 		ok: false,
 		error: Errors.cancelled({ operation: "payments" })
-	};
+	}, onPreparedClosed);
+	if (prepared.value.emitPaymentInitiated && "items" in prepared.value.request) for (const [index, item] of prepared.value.request.items.entries()) {
+		const paymentId = prepared.value.paymentIds[index];
+		const recipient = prepared.value.recipientObservations[index];
+		if (paymentId === void 0 || recipient === void 0) continue;
+		const paymentType = paymentTypeForDocumentEnvelope(item.document) ?? item.paymentType ?? "unspecified";
+		await emitPaymentInitiated(deps.telemetry, {
+			commandId: prepared.value.commandId,
+			executionId: prepared.value.executionId,
+			paymentId,
+			kind: paymentType === "unspecified" ? "quick_pay" : paymentType,
+			recipient
+		});
+	}
 	let signature;
 	try {
 		signature = await deps.signer.signUserOpHash(prepared.value.digest);
 	} catch (cause) {
-		return {
+		return abandonPrepared$1(deps, prepared.value.executionId, closePaymentOnExit, "signer_rejected", {
 			ok: false,
 			error: signerFailure(deps.signer.source, "signUserOpHash", cause)
-		};
+		}, onPreparedClosed);
 	}
-	if (isAborted$2(signal)) return {
+	if (isAborted$2(signal)) return abandonPrepared$1(deps, prepared.value.executionId, closePaymentOnExit, "cancelled", {
 		ok: false,
 		error: Errors.cancelled({ operation: "payments" })
-	};
+	}, onPreparedClosed);
 	return runIfActive(void 0, CAPXUL_OPERATIONS.payments.submitCommandExecution, () => deps.convexCall.action(deps.functions.submitPaymentCommandExecution, { input: {
 		executionId: prepared.value.executionId,
 		signature
@@ -5630,13 +5807,13 @@ function executePaymentLifecycle(deps, intent, signal) {
 	return executePrepared(deps, (signerAddress) => runIfActive(signal, CAPXUL_OPERATIONS.payments.prepareLifecycleExecution, () => deps.convexCall.action(deps.functions.preparePaymentLifecycleExecution, { input: {
 		signerAddress,
 		intent
-	} })), matchesIntent(intent), signal);
+	} })), matchesIntent(intent), false, void 0, signal);
 }
-function executeOrganizationPayment(deps, input, signal) {
+function executeOrganizationPayment(deps, input, signal, onPreparedClosed) {
 	return executePrepared(deps, (signerAddress) => runIfActive(signal, CAPXUL_OPERATIONS.organizationPayments.prepareExecution, () => deps.convexCall.action(deps.functions.prepareOrganizationPaymentExecution, { input: {
 		...input,
 		signerAddress
-	} })), matchesIntent(input), signal);
+	} })), matchesIntent(input), true, onPreparedClosed, signal);
 }
 //#endregion
 //#region src/surface/payment-execution.ts
@@ -5668,7 +5845,16 @@ async function signerCall(source, operation, run) {
 		};
 	}
 }
-async function executePersonalPayment(deps, payment, signal, requestKey) {
+async function abandonPrepared(deps, executionId, reason, result, onPreparedClosed) {
+	const abandoned = await runIfActive(void 0, CAPXUL_OPERATIONS.moneyExecution.abandonPaymentExecution, () => deps.convexCall.action(deps.functions.abandonPaymentExecution, { input: {
+		executionId,
+		reason
+	} }));
+	if (!abandoned.ok) return abandoned;
+	if (abandoned.value) onPreparedClosed?.();
+	return result;
+}
+async function executePersonalPayment(deps, payment, signal, requestKey, onPreparedClosed) {
 	if (isAborted$1(signal)) return cancelled(CAPXUL_OPERATIONS.payments.pay);
 	if (deps.signer === void 0) return mismatch("signer", "payments.pay requires a configured CapxulSigner");
 	const session = deps.actor.authSession();
@@ -5686,18 +5872,21 @@ async function executePersonalPayment(deps, payment, signal, requestKey) {
 		payment
 	} }));
 	if (!prepared.ok) return prepared;
-	if (prepared.value.requestKey !== resolvedRequestKey || canonicalJson(prepared.value.payment) !== canonicalJson(payment)) return mismatch("payment", "prepared Payment execution uses another request");
-	if (prepared.value.chainId !== deps.chainId) return mismatch("chainId", "prepared Payment execution uses another chain");
-	if (prepared.value.signerAddress.toLowerCase() !== signerAddress.value.toLowerCase()) return mismatch("signerAddress", "prepared Payment execution uses another signer");
-	if (prepared.value.userOpSenderSafe.toLowerCase() !== expectedSafe.toLowerCase()) return mismatch("userOpSenderSafe", "prepared Payment execution uses another Account Safe");
+	if (prepared.value.requestKey !== resolvedRequestKey || canonicalJson(prepared.value.payment) !== canonicalJson(payment)) return abandonPrepared(deps, prepared.value.executionId, "prepared_mismatch", mismatch("payment", "prepared Payment execution uses another request"), onPreparedClosed);
+	if (prepared.value.chainId !== deps.chainId) return abandonPrepared(deps, prepared.value.executionId, "prepared_mismatch", mismatch("chainId", "prepared Payment execution uses another chain"), onPreparedClosed);
+	if (prepared.value.signerAddress.toLowerCase() !== signerAddress.value.toLowerCase()) return abandonPrepared(deps, prepared.value.executionId, "prepared_mismatch", mismatch("signerAddress", "prepared Payment execution uses another signer"), onPreparedClosed);
+	if (prepared.value.userOpSenderSafe.toLowerCase() !== expectedSafe.toLowerCase()) return abandonPrepared(deps, prepared.value.executionId, "prepared_mismatch", mismatch("userOpSenderSafe", "prepared Payment execution uses another Account Safe"), onPreparedClosed);
 	if (prepared.value.emitPaymentInitiated) await emitPaymentInitiated(deps.telemetry, {
 		kind: prepared.value.purposeKind,
-		paymentId: prepared.value.paymentId
+		paymentId: prepared.value.paymentId,
+		commandId: prepared.value.commandId,
+		executionId: prepared.value.executionId,
+		recipient: prepared.value.recipientObservation
 	});
-	if (isAborted$1(signal)) return cancelled(CAPXUL_OPERATIONS.payments.pay);
+	if (isAborted$1(signal)) return abandonPrepared(deps, prepared.value.executionId, "cancelled", cancelled(CAPXUL_OPERATIONS.payments.pay), onPreparedClosed);
 	const signature = await signerCall(deps.signer.source, "signUserOpHash", () => deps.signer.signUserOpHash(prepared.value.digest));
-	if (!signature.ok) return signature;
-	if (isAborted$1(signal)) return cancelled(CAPXUL_OPERATIONS.payments.pay);
+	if (!signature.ok) return abandonPrepared(deps, prepared.value.executionId, "signer_rejected", signature, onPreparedClosed);
+	if (isAborted$1(signal)) return abandonPrepared(deps, prepared.value.executionId, "cancelled", cancelled(CAPXUL_OPERATIONS.payments.pay), onPreparedClosed);
 	return runIfActive(void 0, CAPXUL_OPERATIONS.payments.submitExecution, () => deps.convexCall.action(deps.functions.submitPaymentExecution, { input: {
 		executionId: prepared.value.executionId,
 		signature: signature.value
@@ -5925,6 +6114,30 @@ async function waitForPaymentSubmission(submission, signal, operation, onCancel
 		});
 	});
 }
+function normalizeActivityDetail(detail) {
+	if (detail === null) return null;
+	if (detail.kind === "payment") {
+		if (detail.evidence === null) return detail;
+		return {
+			...detail,
+			evidence: {
+				...detail.evidence,
+				inclusion: "included",
+				verification: "verified",
+				finality: "finalized"
+			}
+		};
+	}
+	return {
+		...detail,
+		evidence: {
+			...detail.evidence,
+			inclusion: "included",
+			verification: "verified",
+			canonicalState: "finalized"
+		}
+	};
+}
 function paymentExecutionIntent(input) {
 	if (actorReferenceToBackend(input.actor)?.kind === "org") return {
 		ok: false,
@@ -5937,6 +6150,7 @@ function paymentExecutionIntent(input) {
 		value: {
 			to: to.value,
 			amount: input.amount,
+			...input.externalAddressAcknowledged === void 0 ? {} : { externalAddressAcknowledged: input.externalAddressAcknowledged },
 			...input.paymentType === void 0 ? {} : { paymentType: input.paymentType },
 			...input.document === void 0 ? {} : { document: input.document },
 			...input.timing === void 0 ? {} : { timing: input.timing },
@@ -5974,6 +6188,7 @@ function makeFinancialOpsMethods(deps) {
 		let flight = inFlightPersonalPayments.get(sharedKey);
 		if (flight === void 0) {
 			const controller = new AbortController();
+			const requestState = { resolved: false };
 			const submission = executePersonalPayment({
 				actor: deps.actor,
 				chainId: deps.chainId,
@@ -5981,10 +6196,11 @@ function makeFinancialOpsMethods(deps) {
 				functions: executionFns,
 				...deps.signer === void 0 ? {} : { signer: deps.signer },
 				...deps.telemetry === void 0 ? {} : { telemetry: deps.telemetry }
-			}, payment.value, controller.signal, requestKey.key);
+			}, payment.value, controller.signal, requestKey.key, () => requestState.resolved = true);
 			flight = {
 				controller,
 				promise: submission,
+				requestState,
 				waiters: 0,
 				settled: false
 			};
@@ -6022,7 +6238,7 @@ function makeFinancialOpsMethods(deps) {
 		}
 		release(false);
 		try {
-			await requestKey.finish(submitted.ok);
+			await requestKey.finish(submitted.ok || flight.requestState.resolved);
 		} catch {}
 		return mapOk(submitted, (value) => normalizePaymentTiming(value.payment));
 	};
@@ -6062,61 +6278,34 @@ function makeFinancialOpsMethods(deps) {
 			};
 		}
 	};
+	const retryPayment = async (paymentId, signal) => {
+		const execution = lifecycleDependencies();
+		if (!execution.ok) return execution;
+		try {
+			const submitted = await executePaymentLifecycle(execution.value, {
+				kind: "retry",
+				paymentId
+			}, signal);
+			return submitted.ok ? {
+				ok: true,
+				value: submitted.value.payments.map((payment) => normalizePaymentTiming(payment))
+			} : submitted;
+		} catch (cause) {
+			return {
+				ok: false,
+				error: cause instanceof CapxulError ? cause : Errors.unknown(cause)
+			};
+		}
+	};
 	return {
 		me: {
 			get: (options) => runIfActive(options?.signal, CAPXUL_OPERATIONS.me.get, () => deps.convexCall.query(fns.me, {})),
 			depositInstructions: (options) => runIfActive(options?.signal, CAPXUL_OPERATIONS.me.depositInstructions, () => deps.convexCall.query(fns.depositInstructions, {}).pipe(Effect.tap(() => Effect.promise(() => emitDepositInitiated(deps.telemetry)))))
 		},
-		handles: { resolve: (handle, options) => runIfActive(options?.signal, CAPXUL_OPERATIONS.handles.resolve, () => deps.convexCall.query(fns.resolveHandle, { handle })) },
-		payees: {
-			create: (input, options) => runIfActive(options?.signal, CAPXUL_OPERATIONS.payees.create, () => deps.convexCall.mutation(fns.createPayee, {
-				label: input.label,
-				recipient: input.recipient,
-				...input.handle === void 0 ? {} : { handle: input.handle }
-			})),
-			get: (payeeId, options) => runIfActive(options?.signal, CAPXUL_OPERATIONS.payees.get, () => deps.convexCall.query(fns.getPayee, { payeeId })),
-			resolve: (recipient, options) => runIfActive(options?.signal, CAPXUL_OPERATIONS.payees.resolve, () => deps.convexCall.query(fns.resolvePayee, { recipient }))
-		},
 		targets: { resolve: async (reference, options) => {
-			switch (reference.kind) {
-				case "handle": return mapOk(await runIfActive(options?.signal, CAPXUL_OPERATIONS.targets.resolve.handle, () => deps.convexCall.query(fns.resolveHandle, { handle: reference.handle })), (target) => resolvedTargetFromResolution(reference, target));
-				case "email": return mapOk(await runIfActive(options?.signal, CAPXUL_OPERATIONS.targets.resolve.email, () => deps.convexCall.query(fns.resolvePayee, { recipient: reference.email })), (target) => resolvedTargetFromResolution(reference, target));
-				case "organization": {
-					const resolved = await runIfActive(options?.signal, CAPXUL_OPERATIONS.targets.resolve.organization, () => deps.convexCall.query(fns.resolveHandle, { handle: reference.handle }));
-					if (!resolved.ok) return {
-						ok: false,
-						error: resolved.error
-					};
-					if (resolved.value.kind !== "org") return {
-						ok: false,
-						error: Errors.invalidInput("reference", "organization handle could not be resolved")
-					};
-					return {
-						ok: true,
-						value: resolvedTargetFromResolution(reference, resolved.value)
-					};
-				}
-				case "payee": {
-					const payee = await runIfActive(options?.signal, CAPXUL_OPERATIONS.targets.resolve.payee, () => deps.convexCall.query(fns.getPayee, { payeeId: reference.id }));
-					if (!payee.ok) return {
-						ok: false,
-						error: payee.error
-					};
-					if (payee.value === null) return {
-						ok: false,
-						error: Errors.invalidInput("reference", "payee not found")
-					};
-					return {
-						ok: true,
-						value: resolvedTargetFromPayee(reference, payee.value)
-					};
-				}
-				case "party":
-				case "destination": return Promise.resolve({
-					ok: false,
-					error: Errors.notImplemented("targets", `resolve.${reference.kind}`)
-				});
-			}
+			const recipient = normalizeTargetForBackend(reference, "reference");
+			if (!recipient.ok) return recipient;
+			return mapOk(await runIfActive(options?.signal, CAPXUL_OPERATIONS.recipient.resolve, () => deps.convexCall.query(fns.resolveRecipient, { recipient: recipient.value })), resolvedTargetFromResolution);
 		} },
 		destinations: {
 			add: async (input, options) => {
@@ -6159,6 +6348,7 @@ function makeFinancialOpsMethods(deps) {
 		},
 		payments: {
 			pay,
+			retry: (paymentId, options) => retryPayment(paymentId, options?.signal),
 			createCommitment: (input, options) => pay(input, options),
 			claim: (paymentId, options) => runLifecycle({
 				kind: "claim",
@@ -6201,7 +6391,7 @@ function makeFinancialOpsMethods(deps) {
 						...reference.kind === "payment" ? activityActorField(reference.actor) : {}
 					},
 					...actor === void 0 ? {} : { actor }
-				}));
+				}).pipe(Effect.map(normalizeActivityDetail)));
 			},
 			annotate: (input, options) => {
 				if (input.actor !== void 0 && input.reference.kind === "payment" && input.reference.actor !== void 0 && !sameActor(input.actor, input.reference.actor)) return Promise.resolve({
@@ -6288,18 +6478,11 @@ function refFromTargetReference(reference, field) {
 					email: reference.email
 				}
 			};
-			case "organization": return {
-				ok: true,
-				value: {
-					kind: "orgHandle",
-					orgHandle: reference.handle
-				}
-			};
-			case "payee": return {
+			case "address": return {
 				ok: true,
 				value: {
-					kind: "payeeId",
-					payeeId: reference.id
+					kind: "address",
+					address: reference.address
 				}
 			};
 			case "party": return {
@@ -6309,10 +6492,6 @@ function refFromTargetReference(reference, field) {
 					partyId: reference.partyId
 				}
 			};
-			case "destination": return {
-				ok: false,
-				error: Errors.notImplemented("targets", "reference.destination")
-			};
 			default: return {
 				ok: false,
 				error: Errors.invalidInput(field, "target must be a known TargetReference variant")
@@ -6367,39 +6546,28 @@ function targetReferenceFromBackendRef(ref) {
 			kind: "email",
 			email: ref.email
 		};
-		case "orgHandle": return {
-			kind: "organization",
-			handle: ref.orgHandle
-		};
-		case "payeeId": return {
-			kind: "payee",
-			id: ref.payeeId
+		case "address": return {
+			kind: "address",
+			address: ref.address
 		};
 		case "party": return {
 			kind: "party",
 			partyId: ref.partyId
 		};
-		case "capxulUserId": throw Errors.notImplemented("targets", "reference.capxulUserId");
 	}
 }
-function resolvedTargetFromResolution(reference, resolution) {
-	const kind = resolution.kind === "org" ? "organization" : resolution.kind === "payee" ? "payee" : "person";
+function resolvedTargetFromResolution(resolution) {
+	const kind = resolution.status === "known_party" ? resolution.partyKind === "org" ? "organization" : "person" : resolution.status === "external_address" ? "external_address" : "unresolved";
 	return {
-		reference,
+		reference: targetReferenceFromBackendRef(resolution.recipient),
 		label: resolution.label,
+		status: resolution.status,
 		kind,
-		capabilities: {
-			canPay: true,
-			canRequest: true,
-			canPayout: false
-		}
-	};
-}
-function resolvedTargetFromPayee(reference, payee) {
-	return {
-		reference,
-		label: payee.label,
-		kind: "payee",
+		safeAddress: toAddress(resolution.safeAddress),
+		isCapxulAccount: resolution.isCapxulAccount,
+		...resolution.partyId === void 0 ? {} : { partyId: toPartyId(resolution.partyId) },
+		...resolution.handle === void 0 ? {} : { handle: resolution.handle },
+		...resolution.requiresAcknowledgement === void 0 ? {} : { requiresAcknowledgement: resolution.requiresAcknowledgement },
 		capabilities: {
 			canPay: true,
 			canRequest: true,
@@ -6457,10 +6625,6 @@ function destinationFromBackend(destination) {
 	};
 }
 function normalizeDestinationRefForBackend(ref, field) {
-	if (typeof ref === "object" && ref !== null && "kind" in ref && ref.kind === "capxulUserId") return {
-		ok: false,
-		error: Errors.notImplemented("targets", "reference.capxulUserId")
-	};
 	return normalizeRefForBackend(ref, field);
 }
 function normalizeRefForBackend(ref, field) {
@@ -6488,25 +6652,11 @@ function normalizeRefForBackend(ref, field) {
 					email: nonEmptyRefValue(ref.email, "email")
 				}
 			};
-			case "orgHandle": return {
-				ok: true,
-				value: {
-					kind: "orgHandle",
-					orgHandle: nonEmptyRefValue(ref.orgHandle, "orgHandle")
-				}
-			};
-			case "capxulUserId": return {
+			case "address": return {
 				ok: true,
 				value: {
-					kind: "capxulUserId",
-					capxulUserId: nonEmptyRefValue(ref.capxulUserId, "capxulUserId")
-				}
-			};
-			case "payeeId": return {
-				ok: true,
-				value: {
-					kind: "payeeId",
-					payeeId: nonEmptyRefValue(ref.payeeId, "payeeId")
+					kind: "address",
+					address: toAddress(ref.address)
 				}
 			};
 			case "party": return {
@@ -7553,7 +7703,7 @@ function makeSmartAccountMethods(deps) {
 }
 //#endregion
 //#region src/contract/identity.ts
-const usernameAvailableQuery = makeFunctionReference(CAPXUL_FUNCTIONS["identity/queries"].usernameAvailable);
+const handleAvailableQuery = makeFunctionReference(CAPXUL_FUNCTIONS["identity/queries"].handleAvailable);
 //#endregion
 //#region src/surface/identity-deps.ts
 /** The single Context tag the profile atom + `identity.loadCurrent` resolve. */
@@ -7597,19 +7747,19 @@ function makeIdentityMethods(deps) {
 				ok: false,
 				error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.identity.completeProfile })
 			};
-			if (typeof profile !== "object" || profile === null || typeof profile.displayName !== "string" || typeof profile.country !== "string" || typeof profile.username !== "string") return {
+			if (typeof profile !== "object" || profile === null || typeof profile.displayName !== "string" || typeof profile.country !== "string" || typeof profile.handle !== "string") return {
 				ok: false,
 				error: Errors.invalidInput("profile", "invalid profile")
 			};
 			const displayName = profile.displayName.trim();
-			const username = profile.username.trim();
+			const handle = profile.handle.trim();
 			if (displayName.length === 0) return {
 				ok: false,
 				error: Errors.invalidInput("displayName", "must not be empty")
 			};
-			if (username.length === 0) return {
+			if (handle.length === 0) return {
 				ok: false,
-				error: Errors.invalidInput("username", "must not be empty")
+				error: Errors.invalidInput("handle", "must not be empty")
 			};
 			let country;
 			try {
@@ -7630,98 +7780,259 @@ function makeIdentityMethods(deps) {
 				email: session.email,
 				displayName,
 				country,
-				username
+				handle
 			}), options, CAPXUL_OPERATIONS.identity.completeProfile);
 		},
-		async usernameAvailable(username, options) {
+		async handleAvailable(handle, options) {
 			if (options?.signal?.aborted) return {
 				ok: false,
-				error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.identity.usernameAvailable })
+				error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.identity.handleAvailable })
 			};
 			if (convexCall === void 0) return {
 				ok: false,
-				error: Errors.notImplemented("identity", "usernameAvailable")
+				error: Errors.notImplemented("identity", "handleAvailable")
 			};
-			return runPortEffect(convexCall.query(usernameAvailableQuery, { username }));
+			return runPortEffect(convexCall.query(handleAvailableQuery, { handle }));
 		}
 	};
 }
 //#endregion
 //#region src/surface/onboarding.ts
-const USERNAME_PATTERN = /^[a-z0-9_]{3,30}$/;
-function makeOnboardingMethods(deps) {
-	return { async completePerson(input, options) {
-		const isCancelled = () => options?.signal?.aborted === true;
-		if (typeof input !== "object" || input === null || typeof input.displayName !== "string" || typeof input.country !== "string" || typeof input.username !== "string" || !USERNAME_PATTERN.test(input.username.trim())) return {
-			ok: false,
-			error: Errors.invalidInput("username", "must be 3-30 characters of a-z, 0-9, or underscore")
+function normalizeHandleInput(input) {
+	if (typeof input !== "string") return {
+		ok: false,
+		error: Errors.invalidInput("handle", "is required")
+	};
+	try {
+		return {
+			ok: true,
+			value: validateHandle(input)
 		};
-		const username = input.username.trim();
-		const session = await deps.restoreSession(options);
-		if (!session.ok) return session;
-		if (session.value === null) return {
+	} catch (error) {
+		if (isCapxulError(error)) return {
 			ok: false,
-			error: Errors.notAuthenticated()
+			error
 		};
-		const available = await deps.usernameAvailable(username, options);
-		if (!available.ok) return available;
-		if (!available.value.available) return {
+		return {
 			ok: false,
-			error: Errors.invalidInput("username", "username is already taken")
+			error: Errors.unknown(error)
 		};
-		const completed = await deps.completeProfile({
-			...input,
-			username: available.value.normalized
-		}, options);
-		if (!completed.ok) return completed;
-		const refreshed = await deps.refreshIdentity(options);
-		if (!refreshed.ok) return refreshed;
-		if (isCancelled()) return {
+	}
+}
+function normalizeOrganization(input) {
+	if (typeof input !== "object" || input === null) return {
+		ok: false,
+		error: Errors.invalidInput("organization", "is required")
+	};
+	const name = typeof input.name === "string" ? input.name.trim() : "";
+	if (name.length === 0) return {
+		ok: false,
+		error: Errors.invalidInput("name", "is required")
+	};
+	const handle = normalizeHandleInput(input.handle);
+	if (!handle.ok) return handle;
+	if (input.bio !== void 0 && typeof input.bio !== "string") return {
+		ok: false,
+		error: Errors.invalidInput("bio", "must be text")
+	};
+	if (input.size !== void 0 && typeof input.size !== "string") return {
+		ok: false,
+		error: Errors.invalidInput("size", "must be text")
+	};
+	let country;
+	try {
+		country = toCountryCode(input.country);
+	} catch {
+		return {
 			ok: false,
-			error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.onboarding.completePerson })
+			error: Errors.invalidInput("country", "must be an ISO country code")
 		};
-		const ensured = await deps.ensureAccount();
+	}
+	const bio = input.bio?.trim() ?? "";
+	const size = input.size?.trim() ?? "";
+	return {
+		ok: true,
+		value: {
+			name,
+			handle: handle.value,
+			country,
+			...bio.length === 0 ? {} : { bio },
+			...size.length === 0 ? {} : { size }
+		}
+	};
+}
+function isClaimedIdentityState(state) {
+	return state.phase === "authenticated" && state.account.at === "claimed";
+}
+function organizationWrongState(currentState, validStates) {
+	return {
+		ok: false,
+		error: Errors.wrongState({
+			method: CAPXUL_OPERATIONS.onboarding.completeOrganization,
+			currentState,
+			validStates: [...validStates]
+		})
+	};
+}
+function requestCancelled(options) {
+	return options?.signal?.aborted === true;
+}
+async function reachClaimedAccount(deps, options) {
+	let state = deps.snapshotIdentity();
+	if (state.phase !== "authenticated" || state.account.at === "unknown") {
+		const ensured = await deps.sendIdentity({ _tag: "EnsureAccount" }, options);
 		if (!ensured.ok) return ensured;
-		if (isCancelled()) return {
-			ok: false,
-			error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.onboarding.completePerson })
-		};
-		const lifecycle = await deps.getLifecycle();
-		if (!lifecycle.ok) return lifecycle;
-		if (isCancelled()) return {
-			ok: false,
-			error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.onboarding.completePerson })
-		};
-		if (lifecycle.value.status !== "ready") return {
-			ok: false,
-			error: Errors.wrongState({
-				method: CAPXUL_OPERATIONS.onboarding.completePerson,
-				currentState: lifecycle.value.status,
-				validStates: ["ready"]
-			})
-		};
-		const profile = await deps.loadProfile(options);
-		if (!profile.ok) return profile;
-		if (profile.value === null || profile.value.displayName === null || profile.value.username !== available.value.normalized) return {
-			ok: false,
-			error: Errors.wrongState({
-				method: CAPXUL_OPERATIONS.onboarding.completePerson,
-				currentState: "profile-incomplete",
-				validStates: ["profile-complete"]
-			})
-		};
-		return {
-			ok: true,
-			value: {
-				profile: {
-					...profile.value,
-					displayName: profile.value.displayName,
-					username: profile.value.username
-				},
-				account: lifecycle.value
-			}
-		};
-	} };
+		state = ensured.value;
+	}
+	if (state.phase !== "authenticated") return organizationWrongState(state.phase, ["authenticated:claimed"]);
+	if (state.account.at !== "claimed") {
+		const event = state.account.at === "failed" ? { _tag: "RetryAccount" } : state.account.at === "counterfactual" ? { _tag: "ClaimAccount" } : { _tag: "EnsureAccount" };
+		const claimed = await deps.sendIdentity(event, options);
+		if (!claimed.ok) return claimed;
+		state = claimed.value;
+	}
+	return isClaimedIdentityState(state) ? {
+		ok: true,
+		value: state
+	} : organizationWrongState(state.phase === "authenticated" ? state.account.at : state.phase, ["claimed"]);
+}
+async function createOrResumeOrganization(deps, state, draft, options) {
+	const active = state.account.org;
+	if (active?.at === "ready") return {
+		ok: true,
+		value: { organizationId: active.orgId }
+	};
+	if (active?.at === "failed" && !active.retryable) return {
+		ok: false,
+		error: publicIdentityFailure(active.failure)
+	};
+	if (active?.at === "failed" && active.orgId === null) {
+		const cleared = await deps.sendIdentity({ _tag: "LeaveOrganization" }, options);
+		if (!cleared.ok) return cleared;
+	}
+	const event = active?.at === "failed" && active.orgId !== null ? { _tag: "RetryOrganization" } : {
+		_tag: "CreateOrganization",
+		draft
+	};
+	const created = await deps.sendIdentity(event, options);
+	if (!created.ok) return created;
+	const final = created.value;
+	const organization = isClaimedIdentityState(final) ? final.account.org : null;
+	return organization?.at === "ready" ? {
+		ok: true,
+		value: { organizationId: organization.orgId }
+	} : organizationWrongState(organization?.at ?? "organization-missing", ["ready"]);
+}
+function makeOnboardingMethods(deps) {
+	return {
+		async completePerson(input, options) {
+			const isCancelled = () => options?.signal?.aborted === true;
+			if (typeof input !== "object" || input === null || typeof input.displayName !== "string" || typeof input.country !== "string") return {
+				ok: false,
+				error: Errors.invalidInput("profile", "displayName and country are required")
+			};
+			const handle = normalizeHandleInput(input.handle);
+			if (!handle.ok) return handle;
+			const session = await deps.restoreSession(options);
+			if (!session.ok) return session;
+			if (session.value === null) return {
+				ok: false,
+				error: Errors.notAuthenticated()
+			};
+			const available = await deps.handleAvailable(handle.value, options);
+			if (!available.ok) return available;
+			if (!available.value.available) return {
+				ok: false,
+				error: Errors.invalidInput("handle", "handle is already taken")
+			};
+			const completed = await deps.completeProfile({
+				...input,
+				handle: available.value.normalized
+			}, options);
+			if (!completed.ok) return completed;
+			const refreshed = await deps.refreshIdentity(options);
+			if (!refreshed.ok) return refreshed;
+			if (isCancelled()) return {
+				ok: false,
+				error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.onboarding.completePerson })
+			};
+			const ensured = await deps.ensureAccount();
+			if (!ensured.ok) return ensured;
+			if (isCancelled()) return {
+				ok: false,
+				error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.onboarding.completePerson })
+			};
+			const lifecycle = await deps.getLifecycle();
+			if (!lifecycle.ok) return lifecycle;
+			if (isCancelled()) return {
+				ok: false,
+				error: Errors.cancelled({ operation: CAPXUL_OPERATIONS.onboarding.completePerson })
+			};
+			if (lifecycle.value.status !== "ready") return {
+				ok: false,
+				error: Errors.wrongState({
+					method: CAPXUL_OPERATIONS.onboarding.completePerson,
+					currentState: lifecycle.value.status,
+					validStates: ["ready"]
+				})
+			};
+			const profile = await deps.loadProfile(options);
+			if (!profile.ok) return profile;
+			if (profile.value === null || profile.value.displayName === null || profile.value.handle !== available.value.normalized) return {
+				ok: false,
+				error: Errors.wrongState({
+					method: CAPXUL_OPERATIONS.onboarding.completePerson,
+					currentState: "profile-incomplete",
+					validStates: ["profile-complete"]
+				})
+			};
+			return {
+				ok: true,
+				value: {
+					profile: {
+						...profile.value,
+						displayName: profile.value.displayName,
+						handle: profile.value.handle
+					},
+					account: lifecycle.value
+				}
+			};
+		},
+		async completeOrganization(input, options) {
+			const operation = CAPXUL_OPERATIONS.onboarding.completeOrganization;
+			const normalized = normalizeOrganization(input);
+			if (!normalized.ok) return normalized;
+			const session = await deps.restoreSession(options);
+			if (!session.ok) return session;
+			if (session.value === null) return {
+				ok: false,
+				error: Errors.notAuthenticated()
+			};
+			const profile = await deps.loadProfile(options);
+			if (!profile.ok) return profile;
+			if (profile.value === null || profile.value.displayName === null || profile.value.handle === null) return {
+				ok: false,
+				error: Errors.wrongState({
+					method: operation,
+					currentState: "profile-incomplete",
+					validStates: ["profile-complete"]
+				})
+			};
+			const refreshed = await deps.refreshIdentity(options);
+			if (!refreshed.ok) return refreshed;
+			if (requestCancelled(options)) return {
+				ok: false,
+				error: Errors.cancelled({ operation })
+			};
+			const claimed = await reachClaimedAccount(deps, options);
+			if (!claimed.ok) return claimed;
+			if (requestCancelled(options)) return {
+				ok: false,
+				error: Errors.cancelled({ operation })
+			};
+			return createOrResumeOrganization(deps, claimed.value, normalized.value, options);
+		}
+	};
 }
 //#endregion
 //#region src/surface/accounts-deps.ts
@@ -8024,7 +8335,8 @@ function executionDependencies$1(input) {
 		chainId: input.chainId,
 		convexCall: input.convexCall,
 		functions: moneyExecutionContract,
-		signer: input.signer
+		signer: input.signer,
+		...input.telemetry === void 0 ? {} : { telemetry: input.telemetry }
 	};
 }
 function makeOrganizationPaymentsMethods(deps, orgId) {
@@ -8056,16 +8368,18 @@ function makeOrganizationPaymentsMethods(deps, orgId) {
 		let flight = inFlightOrganizationPayments.get(flightKey);
 		if (flight === void 0) {
 			const controller = new AbortController();
+			const requestState = { resolved: false };
 			const submission = executeOrganizationPayment(execution, {
 				orgId,
 				permissionId: input.permissionId,
 				requestKey: requestKey.key,
 				items: input.items,
 				...input.lineage === void 0 ? {} : { lineage: input.lineage }
-			}, controller.signal);
+			}, controller.signal, () => requestState.resolved = true);
 			flight = {
 				controller,
 				promise: submission,
+				requestState,
 				waiters: 0,
 				settled: false
 			};
@@ -8103,11 +8417,29 @@ function makeOrganizationPaymentsMethods(deps, orgId) {
 		}
 		release(false);
 		try {
-			await requestKey.finish(result.ok);
+			await requestKey.finish(result.ok || flight.requestState.resolved);
 		} catch {}
-		return mapOk(result, (value) => value.payments.map((payment) => normalizePaymentTiming(payment)));
+		const normalized = mapOk(result, (value) => value.payments.map((payment) => normalizePaymentTiming(payment)));
+		if (!normalized.ok) return normalized;
+		return normalized;
 	};
 	return {
+		retry: async (paymentId, options) => {
+			const execution = executionDependencies$1(deps);
+			if (execution === null) return {
+				ok: false,
+				error: Errors.notImplemented("organizationPayments", "executionComposition")
+			};
+			const result = await executePaymentLifecycle(execution, {
+				kind: "retry",
+				paymentId
+			}, options?.signal);
+			if (!result.ok) return result;
+			return {
+				ok: true,
+				value: result.value.payments.map((payment) => normalizePaymentTiming(payment))
+			};
+		},
 		pay: async (input, options) => {
 			const { permissionId, requestKey: providedRequestKey, lineage, ...item } = input;
 			const result = await execute({
@@ -8239,6 +8571,7 @@ function makePayrollMethods(deps, orgId) {
 			input
 		}, input.requestKey);
 		let authorized;
+		let preparedClosed = false;
 		const submitted = await executePrepared(execution, async (signerAddress) => {
 			const prepared = await runIfActive(signal, AUTHORIZE_RUN, () => deps.convexCall.action(payrollContract.authorizeRun, { input: {
 				orgId,
@@ -8260,9 +8593,9 @@ function makePayrollMethods(deps, orgId) {
 			requestKey: requestKey.key,
 			runId: authorized.id,
 			items: input.items
-		})(request), signal);
+		})(request), true, () => preparedClosed = true, signal);
 		try {
-			await requestKey.finish(submitted.ok);
+			await requestKey.finish(submitted.ok || preparedClosed);
 		} catch {}
 		if (!submitted.ok) return submitted;
 		return authorized === void 0 ? {
@@ -8883,7 +9216,8 @@ function makeOrgMethods(deps) {
 					...deps.requestKeyScope === void 0 ? {} : { requestKeyScope: deps.requestKeyScope },
 					...deps.actor === void 0 ? {} : { actor: deps.actor },
 					...deps.chainId === void 0 ? {} : { chainId: Number(deps.chainId) },
-					...deps.signer === void 0 ? {} : { signer: deps.signer }
+					...deps.signer === void 0 ? {} : { signer: deps.signer },
+					...deps.telemetry === void 0 ? {} : { telemetry: deps.telemetry }
 				}, String(orgId)),
 				payroll: convexCall === void 0 ? makeUnavailablePayrollMethods() : makePayrollMethods({
 					convexCall,
@@ -8910,7 +9244,8 @@ function makeNotImplementedPermissionMethods() {
 function makeNotImplementedOrganizationPaymentsMethods() {
 	return {
 		pay: organizationPaymentExecutionUnavailable,
-		payBatch: organizationPaymentExecutionUnavailable
+		payBatch: organizationPaymentExecutionUnavailable,
+		retry: organizationPaymentExecutionUnavailable
 	};
 }
 const orgMeUnavailable = () => Promise.resolve({
@@ -9245,11 +9580,13 @@ function assembleCapxulClient(input) {
 	const onboarding = makeOnboardingMethods({
 		restoreSession: auth.getSession,
 		refreshIdentity: (options) => runCapxulEffect(askIdentity(actor, { _tag: "ReadSession" }, options).pipe(Effect.asVoid), options, CAPXUL_OPERATIONS.identity.readSession, effectRunner.runPromise),
-		usernameAvailable: identity.usernameAvailable,
+		handleAvailable: identity.handleAvailable,
 		completeProfile: identity.completeProfile,
 		loadProfile: identity.loadCurrent,
 		ensureAccount: account._internal.ensureReady,
-		getLifecycle: account.getLifecycle
+		getLifecycle: account.getLifecycle,
+		snapshotIdentity: actor.snapshot,
+		sendIdentity: (event, options) => runCapxulEffect(askIdentity(actor, event, options), options, CAPXUL_OPERATIONS._internal.identity.send, effectRunner.runPromise)
 	});
 	const system = makeSystemMethods({ convexCall: input.ports.convexCall });
 	const media = makeMediaMethods({ convexCall: input.ports.convexCall });
@@ -9308,7 +9645,7 @@ function assembleCapxulClient(input) {
 			}
 		},
 		async completeProfile(profile, controls) {
-			if (typeof profile !== "object" || profile === null || typeof profile.displayName !== "string" || typeof profile.country !== "string" || profile.username !== void 0 && typeof profile.username !== "string") return {
+			if (typeof profile !== "object" || profile === null || typeof profile.displayName !== "string" || typeof profile.country !== "string" || typeof profile.handle !== "string") return {
 				ok: false,
 				reason: "INVALID_INPUT"
 			};
@@ -9326,8 +9663,8 @@ function assembleCapxulClient(input) {
 					reason: "INVALID_INPUT"
 				};
 			}
-			const username = profile.username?.trim();
-			if (profile.username !== void 0 && username?.length === 0) return {
+			const handle = profile.handle.trim();
+			if (handle.length === 0) return {
 				ok: false,
 				reason: "INVALID_INPUT"
 			};
@@ -9341,7 +9678,7 @@ function assembleCapxulClient(input) {
 				email: session.email,
 				displayName,
 				country,
-				...username === void 0 ? {} : { username }
+				handle
 			}), controls, CAPXUL_OPERATIONS.identity.completeProfile, effectRunner.runPromise);
 			return result.ok ? { ok: true } : {
 				ok: false,
@@ -9360,8 +9697,6 @@ function assembleCapxulClient(input) {
 		accounts,
 		currentUser,
 		me: financialOps.me,
-		handles: financialOps.handles,
-		payees: financialOps.payees,
 		targets: financialOps.targets,
 		destinations: financialOps.destinations,
 		payments: financialOps.payments,
@@ -9380,6 +9715,20 @@ function assembleCapxulClient(input) {
 			accounts: { fund: accounts.fund },
 			organizationSetup: { getProofReceipt: (orgId) => runPortEffect(input.ports.convexCall.query(organizationSetupProofReceiptQuery, { orgId })) },
 			telemetry: input.ports.telemetry,
+			captureExternalAddressAcknowledged: (address, organizationId) => {
+				const telemetry = input.ports.telemetry;
+				if (telemetry === void 0) return;
+				Effect.runPromise(Effect.suspend(() => telemetry.emit({
+					name: "quick_pay_external_address_acknowledged",
+					props: {
+						recipient_locator_kind: "address",
+						recipient_resolution_status: "external_address",
+						recipient_address: address,
+						external_address_acknowledged: true,
+						...organizationId === void 0 ? {} : { organization_id: organizationId }
+					}
+				})).pipe(Effect.catchCause(() => Effect.void)));
+			},
 			close: stopActor
 		}
 	}, observation.failureObservation, observation.hostObservationSnapshot);