@capxul/cli 4.20.0-beta.20 → 4.20.0-beta.22

package/dist/main.mjs

@@ -1343,6 +1343,11 @@ const CAPXUL_OPERATIONS = {
 		deactivate: "offers.deactivate"
 	},
 	checkouts: {
+		request: "checkouts.request",
+		prepareRequest: "checkouts.prepareRequest",
+		requestState: "checkouts.requestState",
+		reconcileRequest: "checkouts.reconcileRequest",
+		prepareRequestRegistered: "checkouts.prepareRequestRegistered",
 		invoice: "checkouts.invoice",
 		prepareInvoice: "checkouts.prepareInvoice",
 		invoiceState: "checkouts.invoiceState",
@@ -14926,6 +14931,7 @@ const PreparedOfferCheckoutExecutionSchema = Schema.Struct({
 });
 /** Link holders receive payment terms, not the private Invoice document. */
 const InvoiceCheckoutSummarySchema = Schema.Struct({
+	documentKind: Schema.optional(Schema.Literals(["memo", "invoice"])),
 	linkToken: text$3(128),
 	issuerLabel: text$3(256),
 	dueAt: InvoiceDraftSchema.fields.dueAt,
@@ -14987,6 +14993,44 @@ const PreparedInvoiceCheckoutExecutionSchema = Schema.Struct({
 	...registeredCheckoutExecutionFields,
 	invoice: InvoiceCheckoutSummarySchema
 });
+/** Generic request checkout uses the same fixed obligation and receipt contract. */
+const RequestCheckoutSummarySchema = Schema.Struct({
+	...InvoiceCheckoutSummarySchema.fields,
+	documentKind: Schema.Literals(["memo", "invoice"])
+});
+const RequestCheckoutPreparationSchema = Schema.Struct({
+	request: RequestCheckoutSummarySchema,
+	sourceWallet: InvoiceCheckoutPreparationSchema.fields.sourceWallet,
+	allowance: InvoiceCheckoutPreparationSchema.fields.allowance,
+	approval: InvoiceCheckoutPreparationSchema.fields.approval,
+	payment: InvoiceCheckoutPreparationSchema.fields.payment
+});
+const RequestCheckoutStateSchema = Schema.Struct({
+	request: RequestCheckoutSummarySchema,
+	verification: InvoiceCheckoutStateSchema.fields.verification,
+	receipt: InvoiceCheckoutStateSchema.fields.receipt,
+	latePayment: InvoiceCheckoutStateSchema.fields.latePayment
+});
+const RequestCheckoutReconciliationSchema = Schema.Union([
+	Schema.Struct({
+		status: Schema.Literal("verified"),
+		receipt: CheckoutReceiptSchema,
+		state: RequestCheckoutStateSchema
+	}),
+	Schema.Struct({
+		status: Schema.Literals(["pending", "provider_failure"]),
+		state: RequestCheckoutStateSchema
+	}),
+	Schema.Struct({
+		status: Schema.Literal("mismatch"),
+		code: Schema.String,
+		state: RequestCheckoutStateSchema
+	})
+]);
+const PreparedRequestCheckoutExecutionSchema = Schema.Struct({
+	...registeredCheckoutExecutionFields,
+	request: RequestCheckoutSummarySchema
+});
 /** Build a reference URL. The consumer still reads authoritative terms from the backend. */
 function checkoutUrl(frontendOrigin, reference) {
 	const origin = new URL(frontendOrigin);
@@ -14998,7 +15042,7 @@ function checkoutUrl(frontendOrigin, reference) {
 	if (origin.protocol !== "https:" && !(origin.protocol === "http:" && loopback) || origin.username !== "" || origin.password !== "" || origin.pathname !== "/" || origin.search !== "" || origin.hash !== "") throw new TypeError("Provide an approved frontend origin");
 	const id = reference.kind === "offer" ? reference.offerId : reference.linkToken;
 	if (!/^[A-Za-z0-9_-]{1,128}$/u.test(id)) throw new TypeError("Invalid checkout reference");
-	const route = reference.kind === "offer" ? "offers" : "invoices";
+	const route = reference.kind === "offer" ? "offers" : reference.kind === "request" ? "requests" : "invoices";
 	const result = new URL(`/checkout/${route}/${encodeURIComponent(id)}`, origin);
 	if (reference.kind === "offer" && reference.quantity !== void 0) {
 		if (!Number.isSafeInteger(reference.quantity) || reference.quantity < 1) throw new TypeError("Invalid checkout quantity");
@@ -15124,6 +15168,13 @@ const CAPXUL_FUNCTIONS = {
 		state: "financialOps/offerCheckoutSettlement:state",
 		reconcile: "financialOps/offerCheckoutSettlement:reconcile"
 	},
+	"financialOps/requestCheckouts": {
+		summary: "financialOps/requestCheckouts:summary",
+		prepare: "financialOps/requestCheckouts:prepare",
+		state: "financialOps/requestCheckouts:state",
+		reconcile: "financialOps/requestCheckouts:reconcile",
+		prepareRegistered: "financialOps/requestCheckouts:prepareRegistered"
+	},
 	"financialOps/invoiceCheckouts": {
 		summary: "financialOps/invoiceCheckouts:summary",
 		prepare: "financialOps/invoiceCheckouts:prepare",
@@ -16629,7 +16680,7 @@ function signerFailure(source, operation, cause) {
 }
 //#endregion
 //#region ../../packages/sdk/package.json
-var version$3 = "4.20.0-beta.20";
+var version$3 = "4.20.0-beta.22";
 //#endregion
 //#region ../../packages/sdk/src/telemetry/exception-projection.ts
 /** Fixed fallback for failures that have no safe message. */
@@ -18900,19 +18951,41 @@ function itemFactsMatch(source, item, observation) {
 	if (exact.denomination !== 1 || item.tokenAddress.toLowerCase() !== asset?.tokenAddress.toLowerCase() || (item.operation === "send" ? item.rawAmount : item.totalAmount) !== exact.minorUnits || !operationMatches(source, item) || observation !== void 0 && "to" in source && !recipientMatches$1(source, observation, item.recipientSafe.toLowerCase())) return null;
 	return exact;
 }
+/** Retry keeps the original request instruction. Ordinary Payment retries keep actor context. */
+function requestRetryInstruction(input) {
+	const request = input.evidence.request;
+	const original = input.evidence.sourceCommand;
+	if (!("kind" in request) || request.kind !== "retry" || original?.kind !== "birth" || original.lineage?.kind !== "payment_request" && original.lineage?.kind !== "invoice_checkout" || original.lineage.requestId !== original.requestKey || !input.evidence.sourcePaymentIds?.includes(request.paymentId)) return void 0;
+	const document = original.items[input.index]?.document;
+	if (document?.kind !== "envelope") return void 0;
+	const bytes = decodeCanonicalBase64V3(document.bytesBase64);
+	const envelope = decodeSupportedPaymentDocumentEnvelope(bytes);
+	if (envelope.primaryType !== "Memo" && envelope.primaryType !== "Invoice") return void 0;
+	return {
+		documentHash: hashSupportedPaymentDocument(envelope),
+		contentHash: hashPaymentDocumentContentV3(bytes),
+		role: "instruction",
+		kind: envelope.primaryType === "Memo" ? "memo" : "invoice",
+		format: envelope.version === 4 ? "envelope-v4" : "envelope-v3",
+		issuedAt: envelope.message.issuedAt
+	};
+}
 async function documentContextMatches(input, command, item, bundle, ref, exact) {
 	const envelope = bundle.envelope;
-	const originId = hashDocumentOriginIdV3({
+	const request = input.evidence.request;
+	const confirmedInstruction = "kind" in request && request.kind === "payment_request" ? request.confirmation.instruction : requestRetryInstruction(input);
+	const originId = confirmedInstruction === void 0 ? hashDocumentOriginIdV3({
 		chainId: input.evidence.chainId,
 		actorKind: input.actorKind,
 		actorId: input.actorId,
 		requestKey: input.requestKey,
 		itemIndex: input.index
-	});
-	return bundle.originId === originId && verifySupportedPaymentDocumentContext(envelope, {
+	}) : envelope.message.originId;
+	const source = confirmedInstruction !== void 0 && envelope.primaryType === "Memo" ? envelope.message.source : command.senderSafe.toLowerCase();
+	return (confirmedInstruction === void 0 || documentJson$1(ref) === documentJson$1(confirmedInstruction)) && bundle.originId === originId && verifySupportedPaymentDocumentContext(envelope, {
 		chainId: input.evidence.chainId,
 		originId,
-		source: command.senderSafe.toLowerCase(),
+		source,
 		target: item.recipientSafe.toLowerCase(),
 		amount: {
 			asset: exact.asset,
@@ -19092,7 +19165,7 @@ function verifiesOfferCheckoutBirthEvidence(evidence, checkout, chainId) {
 /** Invoice checkout binds public fixed terms and the caller-selected funding Safe. */
 function verifiesInvoiceCheckoutBirthEvidence(evidence, invoice, chainId, sourceWallet) {
 	const item = evidence.preparedCommand?.items[0];
-	return "kind" in evidence.request && evidence.request.kind === "invoice_checkout" && evidence.request.linkToken === invoice.linkToken && evidence.preparedCommand?.items.length === 1 && item?.operation === "send" && evidence.preparedCommand.senderSafe.toLowerCase() === sourceWallet.toLowerCase() && evidence.preparedCommand.contractAddress.toLowerCase() === invoice.contractAddress.toLowerCase() && item.settlementId === invoice.settlementId && item.documentHash === invoice.documentHash && item.recipientSafe.toLowerCase() === invoice.recipientSafe.toLowerCase() && item.tokenAddress.toLowerCase() === invoice.tokenAddress.toLowerCase() && item.rawAmount === invoice.rawAmount && item.kind === 1 && invoice.chainId === chainId;
+	return "kind" in evidence.request && evidence.request.kind === "invoice_checkout" && evidence.request.linkToken === invoice.linkToken && evidence.preparedCommand?.items.length === 1 && item?.operation === "send" && evidence.preparedCommand.senderSafe.toLowerCase() === sourceWallet.toLowerCase() && evidence.preparedCommand.contractAddress.toLowerCase() === invoice.contractAddress.toLowerCase() && item.settlementId === invoice.settlementId && item.documentHash === invoice.documentHash && item.recipientSafe.toLowerCase() === invoice.recipientSafe.toLowerCase() && item.tokenAddress.toLowerCase() === invoice.tokenAddress.toLowerCase() && item.rawAmount === invoice.rawAmount && item.kind === (invoice.documentKind === "memo" ? 0 : 1) && invoice.chainId === chainId;
 }
 //#endregion
 //#region ../../packages/sdk/src/surface/payment-command-execution.ts
@@ -66163,8 +66236,14 @@ function makeOnboardingMethods(deps) {
 //#region ../../packages/sdk/src/contract/checkouts.ts
 const fns = CAPXUL_FUNCTIONS["financialOps/offerCheckouts"];
 const settlement = CAPXUL_FUNCTIONS["financialOps/offerCheckoutSettlement"];
+const requests = CAPXUL_FUNCTIONS["financialOps/requestCheckouts"];
 const invoices = CAPXUL_FUNCTIONS["financialOps/invoiceCheckouts"];
 const checkoutContract = {
+	request: makeFunctionReference(requests.summary),
+	prepareRequest: makeFunctionReference(requests.prepare),
+	requestState: makeFunctionReference(requests.state),
+	reconcileRequest: makeFunctionReference(requests.reconcile),
+	prepareRequestRegistered: makeFunctionReference(requests.prepareRegistered),
 	invoice: makeFunctionReference(invoices.summary),
 	prepareInvoice: makeFunctionReference(invoices.prepare),
 	invoiceState: makeFunctionReference(invoices.state),
@@ -66184,9 +66263,96 @@ const missing$2 = async () => ({
 	ok: false,
 	error: Errors.notImplemented("checkouts", "convex")
 });
+const decodeCheckoutResponse = (read) => Effect.try({
+	try: read,
+	catch: (cause) => ({ publicError: isCapxulError(cause) ? cause : Errors.unknown(cause) })
+});
+function decodeObligationSummary(value, generic) {
+	if (generic) return Schema.decodeUnknownSync(RequestCheckoutSummarySchema)(value);
+	const invoice = Schema.decodeUnknownSync(InvoiceCheckoutSummarySchema)(value);
+	if (invoice.documentKind === "memo") throw Errors.invalidInput("invoice", "Invoice checkout cannot use a Memo");
+	return invoice;
+}
+function decodeRegisteredObligation(value, generic) {
+	if (generic) {
+		const { request, ...evidence } = Schema.decodeUnknownSync(PreparedRequestCheckoutExecutionSchema, { onExcessProperty: "error" })(value);
+		return {
+			snapshot: request,
+			evidence
+		};
+	}
+	const { invoice, ...evidence } = Schema.decodeUnknownSync(PreparedInvoiceCheckoutExecutionSchema, { onExcessProperty: "error" })(value);
+	if (invoice.documentKind === "memo") throw Errors.invalidInput("invoice", "Invoice checkout cannot use a Memo");
+	return {
+		snapshot: invoice,
+		evidence
+	};
+}
+async function payObligationRegistered(deps, input, options, generic) {
+	const port = deps.convexCall;
+	if (port === void 0 || deps.execution === void 0) return missing$2();
+	const lifetime = deps.execution.actor.authLifetime();
+	const authUserId = deps.execution.actor.authSession()?.authUserId;
+	if (authUserId === void 0) return {
+		ok: false,
+		error: Errors.notAuthenticated()
+	};
+	const controls = deps.invocationControls?.(options) ?? options;
+	const sourceWallet = Schema.decodeUnknownResult(AddressSchema)(input.sourceWallet);
+	if (sourceWallet._tag === "Failure") return {
+		ok: false,
+		error: Errors.invalidInput("sourceWallet", "selected funding wallet is invalid")
+	};
+	const frozen = await runPortEffect(port.query(generic ? checkoutContract.request : checkoutContract.invoice, copyInvocationObservation(controls, { linkToken: input.linkToken })).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => value === null ? null : decodeObligationSummary(value, generic)))), controls, generic ? CAPXUL_OPERATIONS.checkouts.request : CAPXUL_OPERATIONS.checkouts.invoice, deps.runPromise);
+	if (!deps.execution.actor.matchesAuthLifetime(lifetime, authUserId)) return {
+		ok: false,
+		error: Errors.cancelled({ operation: "checkouts" })
+	};
+	if (!frozen.ok) return frozen;
+	if (frozen.value === null || frozen.value.linkToken !== input.linkToken) return {
+		ok: false,
+		error: Errors.invalidInput(generic ? "request" : "invoice", generic ? "Request is unavailable" : "Invoice is unavailable")
+	};
+	const snapshot = frozen.value;
+	const { sourceWallet: _sourceWallet, ...wireInput } = input;
+	const request = {
+		kind: "invoice_checkout",
+		linkToken: input.linkToken,
+		payer: input.payer,
+		...input.permissionId === void 0 ? {} : { permissionId: input.permissionId }
+	};
+	return executePrepared(deps.execution, async (signerAddress) => {
+		const prepared = await runPortEffect(generic ? port.action(checkoutContract.prepareRequestRegistered, copyInvocationObservation(controls, { input: {
+			...wireInput,
+			signerAddress
+		} })).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => decodeRegisteredObligation(value, true)))) : port.action(checkoutContract.prepareInvoiceRegistered, copyInvocationObservation(controls, { input: {
+			...wireInput,
+			signerAddress
+		} })).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => decodeRegisteredObligation(value, false)))), controls, generic ? CAPXUL_OPERATIONS.checkouts.prepareRequestRegistered : CAPXUL_OPERATIONS.moneyExecution.prepareInvoiceCheckoutExecution, deps.runPromise);
+		if (!prepared.ok) return prepared;
+		if (canonicalJson(prepared.value.snapshot) !== canonicalJson(snapshot)) return {
+			ok: false,
+			error: Errors.invalidInput(generic ? "request" : "invoice", "prepared checkout differs from frozen terms")
+		};
+		return {
+			ok: true,
+			value: {
+				...prepared.value.evidence,
+				request,
+				emitPaymentInitiated: false,
+				recipientObservations: []
+			}
+		};
+	}, async (actual) => canonicalJson(actual) === canonicalJson(request), false, void 0, controls?.signal, controls, void 0, void 0, snapshot, sourceWallet.success);
+}
 function makeCheckoutMethods(deps) {
 	const port = deps.convexCall;
 	if (port === void 0) return {
+		request: missing$2,
+		prepareRequest: missing$2,
+		requestState: missing$2,
+		reconcileRequest: missing$2,
+		payRequestRegistered: missing$2,
 		invoice: missing$2,
 		prepareInvoice: missing$2,
 		invoiceState: missing$2,
@@ -66203,82 +66369,65 @@ function makeCheckoutMethods(deps) {
 	const offer = Schema.decodeUnknownSync(FixedOfferSchema);
 	const checkout = Schema.decodeUnknownSync(OfferCheckoutSchema);
 	return {
+		request: (linkToken, options) => {
+			const controls = deps.invocationControls?.(options) ?? options;
+			return runPortEffect(port.query(checkoutContract.request, copyInvocationObservation(controls, { linkToken })).pipe(Effect.map((value) => value === null ? null : Schema.decodeUnknownSync(RequestCheckoutSummarySchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.request, deps.runPromise);
+		},
+		prepareRequest: (input, options) => {
+			const controls = deps.invocationControls?.(options) ?? options;
+			return runPortEffect(port.mutation(checkoutContract.prepareRequest, copyInvocationObservation(controls, {
+				linkToken: input.linkToken,
+				sourceWallet: input.sourceWallet
+			})).pipe(Effect.map((value) => Schema.decodeUnknownSync(RequestCheckoutPreparationSchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.prepareRequest, deps.runPromise);
+		},
+		requestState: (linkToken, options) => {
+			const controls = deps.invocationControls?.(options) ?? options;
+			return runPortEffect(port.action(checkoutContract.requestState, copyInvocationObservation(controls, { linkToken })).pipe(Effect.map((value) => value === null ? null : Schema.decodeUnknownSync(RequestCheckoutStateSchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.requestState, deps.runPromise);
+		},
+		reconcileRequest: (input, options) => {
+			const controls = deps.invocationControls?.(options) ?? options;
+			return runPortEffect(port.action(checkoutContract.reconcileRequest, copyInvocationObservation(controls, {
+				linkToken: input.linkToken,
+				transactionHash: input.transactionHash
+			})).pipe(Effect.map((value) => Schema.decodeUnknownSync(RequestCheckoutReconciliationSchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.reconcileRequest, deps.runPromise);
+		},
 		invoice: (linkToken, options) => {
 			const controls = deps.invocationControls?.(options) ?? options;
-			return runPortEffect(port.query(checkoutContract.invoice, copyInvocationObservation(controls, { linkToken })).pipe(Effect.map((value) => value === null ? null : Schema.decodeUnknownSync(InvoiceCheckoutSummarySchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.invoice, deps.runPromise);
+			return runPortEffect(port.query(checkoutContract.invoice, copyInvocationObservation(controls, { linkToken })).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => value === null ? null : decodeObligationSummary(value, false)))), controls, CAPXUL_OPERATIONS.checkouts.invoice, deps.runPromise);
 		},
 		prepareInvoice: (input, options) => {
 			const controls = deps.invocationControls?.(options) ?? options;
 			return runPortEffect(port.query(checkoutContract.prepareInvoice, copyInvocationObservation(controls, {
 				linkToken: input.linkToken,
 				sourceWallet: input.sourceWallet
-			})).pipe(Effect.map((value) => Schema.decodeUnknownSync(InvoiceCheckoutPreparationSchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.prepareInvoice, deps.runPromise);
+			})).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => {
+				const decoded = Schema.decodeUnknownSync(InvoiceCheckoutPreparationSchema)(value);
+				decodeObligationSummary(decoded.invoice, false);
+				return decoded;
+			}))), controls, CAPXUL_OPERATIONS.checkouts.prepareInvoice, deps.runPromise);
 		},
 		invoiceState: (linkToken, options) => {
 			const controls = deps.invocationControls?.(options) ?? options;
-			return runPortEffect(port.action(checkoutContract.invoiceState, copyInvocationObservation(controls, { linkToken })).pipe(Effect.map((value) => value === null ? null : Schema.decodeUnknownSync(InvoiceCheckoutStateSchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.invoiceState, deps.runPromise);
+			return runPortEffect(port.action(checkoutContract.invoiceState, copyInvocationObservation(controls, { linkToken })).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => {
+				if (value === null) return null;
+				const decoded = Schema.decodeUnknownSync(InvoiceCheckoutStateSchema)(value);
+				decodeObligationSummary(decoded.invoice, false);
+				return decoded;
+			}))), controls, CAPXUL_OPERATIONS.checkouts.invoiceState, deps.runPromise);
 		},
 		reconcileInvoice: (input, options) => {
 			const controls = deps.invocationControls?.(options) ?? options;
 			return runPortEffect(port.action(checkoutContract.reconcileInvoice, copyInvocationObservation(controls, {
 				linkToken: input.linkToken,
 				transactionHash: input.transactionHash
-			})).pipe(Effect.map((value) => Schema.decodeUnknownSync(InvoiceCheckoutReconciliationSchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.reconcileInvoice, deps.runPromise);
-		},
-		payInvoiceRegistered: async (input, options) => {
-			if (deps.execution === void 0) return missing$2();
-			const lifetime = deps.execution.actor.authLifetime();
-			const authUserId = deps.execution.actor.authSession()?.authUserId;
-			if (authUserId === void 0) return {
-				ok: false,
-				error: Errors.notAuthenticated()
-			};
-			const controls = deps.invocationControls?.(options) ?? options;
-			const sourceWallet = Schema.decodeUnknownResult(AddressSchema)(input.sourceWallet);
-			if (sourceWallet._tag === "Failure") return {
-				ok: false,
-				error: Errors.invalidInput("sourceWallet", "selected funding wallet is invalid")
-			};
-			const frozen = await runPortEffect(port.query(checkoutContract.invoice, copyInvocationObservation(controls, { linkToken: input.linkToken })).pipe(Effect.map((value) => value === null ? null : Schema.decodeUnknownSync(InvoiceCheckoutSummarySchema)(value))), controls, CAPXUL_OPERATIONS.checkouts.invoice, deps.runPromise);
-			if (!deps.execution.actor.matchesAuthLifetime(lifetime, authUserId)) return {
-				ok: false,
-				error: Errors.cancelled({ operation: "checkouts" })
-			};
-			if (!frozen.ok) return frozen;
-			if (frozen.value === null || frozen.value.linkToken !== input.linkToken) return {
-				ok: false,
-				error: Errors.invalidInput("invoice", "Invoice is unavailable")
-			};
-			const snapshot = frozen.value;
-			const { sourceWallet: _sourceWallet, ...wireInput } = input;
-			const request = {
-				kind: "invoice_checkout",
-				linkToken: input.linkToken,
-				payer: input.payer,
-				...input.permissionId === void 0 ? {} : { permissionId: input.permissionId }
-			};
-			return executePrepared(deps.execution, async (signerAddress) => {
-				const prepared = await runPortEffect(port.action(checkoutContract.prepareInvoiceRegistered, copyInvocationObservation(controls, { input: {
-					...wireInput,
-					signerAddress
-				} })).pipe(Effect.map((value) => Schema.decodeUnknownSync(PreparedInvoiceCheckoutExecutionSchema, { onExcessProperty: "error" })(value))), controls, CAPXUL_OPERATIONS.moneyExecution.prepareInvoiceCheckoutExecution, deps.runPromise);
-				if (!prepared.ok) return prepared;
-				if (canonicalJson(prepared.value.invoice) !== canonicalJson(snapshot)) return {
-					ok: false,
-					error: Errors.invalidInput("invoice", "prepared Invoice differs from frozen terms")
-				};
-				const { invoice: _invoice, ...evidence } = prepared.value;
-				return {
-					ok: true,
-					value: {
-						...evidence,
-						request,
-						emitPaymentInitiated: false,
-						recipientObservations: []
-					}
-				};
-			}, async (actual) => canonicalJson(actual) === canonicalJson(request), false, void 0, controls?.signal, controls, void 0, void 0, snapshot, sourceWallet.success);
+			})).pipe(Effect.flatMap((value) => decodeCheckoutResponse(() => {
+				const decoded = Schema.decodeUnknownSync(InvoiceCheckoutReconciliationSchema)(value);
+				decodeObligationSummary(decoded.state.invoice, false);
+				return decoded;
+			}))), controls, CAPXUL_OPERATIONS.checkouts.reconcileInvoice, deps.runPromise);
 		},
+		payInvoiceRegistered: (input, options) => payObligationRegistered(deps, input, options, false),
+		payRequestRegistered: (input, options) => payObligationRegistered(deps, input, options, true),
 		payRegistered: async (input, options) => {
 			if (deps.execution === void 0) return missing$2();
 			const lifetime = deps.execution.actor.authLifetime();
@@ -69817,8 +69966,8 @@ function captureException(telemetry, error, context) {
 }
 //#endregion
 //#region src/runtime/version.ts
-const cliVersion = "4.20.0-beta.20";
-const sdkVersion = "4.20.0-beta.20";
+const cliVersion = "4.20.0-beta.22";
+const sdkVersion = "4.20.0-beta.22";
 const ReleaseVersion = Schema.String.check(Schema.isMaxLength(256), Schema.isPattern(/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?$/u)).pipe(Schema.brand("CliReleaseVersion"));
 const parts = (version) => {
 	const [core = "", ...prerelease] = version.split("+")[0].split("-");
@@ -75111,13 +75260,16 @@ const referenceLabel = (ref) => {
 		case "handle": return ref.handle;
 	}
 };
-const requestCheckout = (item, origin) => ({
-	...item,
-	..."linkToken" in item && item.linkToken !== void 0 && item.documents.some((document) => document.kind === "invoice" && document.role === "instruction") ? { checkoutUrl: checkoutUrl(origin, {
-		kind: "invoice",
-		linkToken: item.linkToken
-	}) } : {}
-});
+const requestCheckout = (item, origin) => {
+	const instruction = item.documents.find((document) => document.role === "instruction" && (document.kind === "invoice" || document.kind === "memo"));
+	return {
+		...item,
+		..."linkToken" in item && item.linkToken !== void 0 && instruction !== void 0 ? { checkoutUrl: checkoutUrl(origin, {
+			kind: instruction.kind === "invoice" ? "invoice" : "request",
+			linkToken: item.linkToken
+		}) } : {}
+	};
+};
 const requestLines = (item, email, orgId = null) => [
 	`Request ${terminalText(item.id)}`,
 	...item.checkoutUrl === void 0 ? [] : [`  Checkout: ${terminalText(item.checkoutUrl)}`],
@@ -75638,7 +75790,20 @@ const readPaymentInput = (source) => Effect.gen(function* () {
 }).pipe(Effect.mapError((error) => error instanceof UpdateUnavailable ? inputRequired("Payment input exceeds 64 KiB.") : error));
 //#endregion
 //#region src/commands/request/internal/issue-input.ts
-const invalid$4 = () => inputRequired("Provide one Invoice request JSON object with payer, amount, and invoice.");
+const invalid$4 = () => inputRequired("Provide one request JSON object with payer, amount, and reference or invoice.");
+const readRequestMetadata = (value, invoiceNumber) => Effect.gen(function* () {
+	const reference = "reference" in value ? value.reference : invoiceNumber;
+	if (typeof reference !== "string" || reference.trim().length === 0 || reference.trim().length > 120) return yield* invalid$4();
+	const memo = "memo" in value ? value.memo : void 0;
+	if (memo !== void 0 && (typeof memo !== "string" || memo.trim().length > 280)) return yield* invalid$4();
+	const expiresAt = "expiresAt" in value ? value.expiresAt : void 0;
+	if (expiresAt !== void 0 && (typeof expiresAt !== "number" || !Number.isSafeInteger(expiresAt) || expiresAt <= Date.now())) return yield* inputRequired("Provide expiresAt as a future epoch time in milliseconds.");
+	return {
+		reference: reference.trim(),
+		...memo === void 0 || memo.trim() === "" ? {} : { memo: memo.trim() },
+		...expiresAt === void 0 ? {} : { expiresAt }
+	};
+});
 const parseIssueInput = (value) => Effect.gen(function* () {
 	if (!record$1(value)) return yield* invalid$4();
 	if (!Object.keys(value).every((key) => [
@@ -75649,27 +75814,22 @@ const parseIssueInput = (value) => Effect.gen(function* () {
 		"memo",
 		"expiresAt"
 	].includes(key))) return yield* invalid$4();
-	if (!("payer" in value) || !("amount" in value) || !("invoice" in value)) return yield* invalid$4();
+	if (!("payer" in value) || !("amount" in value)) return yield* invalid$4();
 	const payment = yield* parsePaymentInput({
 		to: value.payer,
 		amount: value.amount,
-		document: value.invoice
+		..."invoice" in value ? { document: value.invoice } : {}
 	});
-	if (payment.document?.kind !== "invoice") return yield* invalid$4();
-	if (!Number.isFinite(new Date(payment.document.dueAt).getTime())) return yield* inputRequired("Provide an Invoice dueAt that is a valid UTC date in epoch milliseconds.");
-	const reference = "reference" in value ? value.reference : payment.document.invoiceNumber;
-	if (typeof reference !== "string" || reference.trim().length === 0 || reference.trim().length > 120) return yield* invalid$4();
-	const memo = "memo" in value ? value.memo : void 0;
-	if (memo !== void 0 && (typeof memo !== "string" || memo.trim().length > 280)) return yield* invalid$4();
-	const expiresAt = "expiresAt" in value ? value.expiresAt : void 0;
-	if (expiresAt !== void 0 && (typeof expiresAt !== "number" || !Number.isSafeInteger(expiresAt) || expiresAt <= Date.now())) return yield* inputRequired("Provide expiresAt as a future epoch time in milliseconds.");
+	const invoice = payment.document;
+	if ("invoice" in value && invoice?.kind !== "invoice") return yield* invalid$4();
+	if (invoice !== void 0 && invoice.kind !== "invoice") return yield* invalid$4();
+	if (invoice !== void 0 && !Number.isFinite(new Date(invoice.dueAt).getTime())) return yield* inputRequired("Provide an Invoice dueAt that is a valid UTC date in epoch milliseconds.");
+	const metadata = yield* readRequestMetadata(value, invoice?.invoiceNumber);
 	return {
 		payer: payment.to,
 		amount: payment.amount,
-		invoice: payment.document,
-		reference: reference.trim(),
-		...memo === void 0 || memo.trim() === "" ? {} : { memo: memo.trim() },
-		...expiresAt === void 0 ? {} : { expiresAt }
+		...invoice === void 0 ? {} : { invoice },
+		...metadata
 	};
 });
 const readIssueInput = (source) => Effect.gen(function* () {
@@ -75681,7 +75841,7 @@ const readIssueInput = (source) => Effect.gen(function* () {
 		catch: invalid$4
 	});
 	return yield* parseIssueInput(value);
-}).pipe(Effect.mapError((error) => error instanceof UpdateUnavailable ? inputRequired("Invoice input exceeds 64 KiB.") : error));
+}).pipe(Effect.mapError((error) => error instanceof UpdateUnavailable ? inputRequired("Request input exceeds 64 KiB.") : error));
 const issuePreview = (draft) => {
 	const decimals = requireAsset(draft.amount.asset).decimals;
 	const minor = (raw) => {
@@ -75692,28 +75852,32 @@ const issuePreview = (draft) => {
 			value
 		});
 	};
+	const invoice = draft.invoice;
 	return [
-		`Invoice: ${terminalText(draft.invoice.invoiceNumber)}`,
+		...invoice === void 0 ? [] : [`Invoice: ${terminalText(invoice.invoiceNumber)}`],
 		`Payer: ${terminalText(referenceLabel(draft.payer))}`,
 		`Reference: ${terminalText(draft.reference)}`,
 		`Total: ${terminalText(formatAssetAmount(draft.amount))}`,
-		`Due: ${draft.invoice.dueAt === 0 ? "No due date" : terminalText(new Date(draft.invoice.dueAt).toUTCString())}`,
-		...draft.invoice.lineItems.map((item) => `  ${terminalText(item.description)}: ${item.quantity} x ${terminalText(minor(item.unitMinor))}`),
-		`Discount: ${terminalText(minor(draft.invoice.discountMinor ?? "0"))}`,
-		...draft.invoice.note === void 0 ? [] : [`Notes: ${terminalText(draft.invoice.note)}`]
+		...draft.memo === void 0 ? [] : [`Memo: ${terminalText(draft.memo)}`],
+		...invoice === void 0 ? [] : [
+			`Due: ${invoice.dueAt === 0 ? "No due date" : terminalText(new Date(invoice.dueAt).toUTCString())}`,
+			...invoice.lineItems.map((item) => `  ${terminalText(item.description)}: ${item.quantity} x ${terminalText(minor(item.unitMinor))}`),
+			`Discount: ${terminalText(minor(invoice.discountMinor ?? "0"))}`,
+			...invoice.note === void 0 ? [] : [`Notes: ${terminalText(invoice.note)}`]
+		]
 	];
 };
 //#endregion
 //#region src/commands/request/subcommands/issue/execute.ts
 const execute$59 = (config, input) => Effect.gen(function* () {
 	const orgId = yield* readScope(input);
-	if (input.direction !== "issued") return yield* inputRequired("Use request issue for an issued Invoice.");
+	if (input.direction !== "issued") return yield* inputRequired("Use request issue for an issued payment request.");
 	const draft = yield* readIssueInput(input.source);
 	const interactive = yield* requireWriteConfirmation(input.confirm);
 	const { client, session } = yield* restoreAuthenticatedClient(config, input.email);
 	if (interactive) yield* confirmWrite({
 		lines: [`Scope: ${orgId === null ? "Personal" : `Organization ${terminalText(orgId)}`}`, ...issuePreview(draft)],
-		question: "Issue this Invoice request?"
+		question: "Issue this payment request?"
 	});
 	const actor = orgId === null ? client.account : client.org(orgId);
 	const stored = yield* Effect.promise((signal) => actor.requests.issue(draft, { signal })).pipe(Effect.flatMap(resultValue), Effect.mapError((error) => requestWriteFailure(error, orgId, "issued", null, session.email)));
@@ -75746,7 +75910,7 @@ const command$62 = (context) => Command.make("issue", {
 	email: Option.getOrUndefined(email),
 	outputDirectory: Option.getOrUndefined(outputDirectory),
 	orgs: "orgs" in scope ? scope.orgs : []
-}, execute$59)).pipe(context.annotate("issue"), Command.withDescription("Issue an Invoice request and save its PDF"));
+}, execute$59)).pipe(context.annotate("issue"), Command.withDescription("Issue a payment request and save its available PDFs"));
 //#endregion
 //#region src/commands/request/subcommands/pay/execute.ts
 const command$61 = (args) => args.map(shellArgument).join(" ");