@absol-labs/agent 0.12.0-rc.2 → 0.12.0-rc.4

package/dist/cli/commands/claim.d.ts

@@ -13,6 +13,12 @@ import type { StreamV2 } from "@absol-labs/sdk";
  * learn a fact that was already available.
  */
 export declare const claimCommand: CommandSpec;
+/**
+ * A claim reverted because its proof no longer matches a root the escrow
+ * accepts (a checkpoint rotated, or a lagging node served a not-yet-visible
+ * root). Re-planning reads a fresh proof, so it is worth one more round.
+ */
+export declare function isStaleProofError(error: unknown): boolean;
 /**
  * Which claim, if any, `metrik claim` would send. Reads only, so it is
  * testable (and checkable against a live stream) without a key.
@@ -42,4 +48,13 @@ export type ClaimPlan = {
     readonly error: CliError;
 };
 export declare function planClaim(read: CliReadClient, streamId: `0x${string}`, stream: Pick<StreamV2, "claimedCumulative">, escrowGeneration: string): Promise<ClaimPlan>;
+/**
+ * The buyer's recovery command for a stream. A reclaim needs the clock
+ * stopped (closed, or past expiresAt), so a still-running stream gets
+ * `--close-first`; the plain form only once it has stopped.
+ */
+export declare function buyerSideCommand(stream: {
+    readonly status: string;
+    readonly expiresAt: number;
+}, streamId: string, nowSeconds: number): string;
 //# sourceMappingURL=claim.d.ts.map

package/dist/cli/commands/claim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/claim.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAA6B,MAAM,cAAc,CAAC;AASnE,OAAO,KAAK,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,EAAE,WAyG1B,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,SAAS,GACjB;IACE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,aAAa,CAAC;IAChD,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,6DAA6D;IAC7D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE3D,wBAAsB,SAAS,CAC7B,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,KAAK,MAAM,EAAE,EACvB,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAC3C,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,CAAC,CA8FpB"}
+{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/claim.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAA6B,MAAM,cAAc,CAAC;AASnE,OAAO,KAAK,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,EAAE,WAoH1B,CAAC;AAOF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGzD;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,SAAS,GACjB;IACE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,aAAa,CAAC;IAChD,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,6DAA6D;IAC7D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE3D,wBAAsB,SAAS,CAC7B,IAAI,EAAE,aAAa,EACnB,QAAQ,EAAE,KAAK,MAAM,EAAE,EACvB,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EAC3C,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,CAAC,CA8FpB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC/D,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,MAAM,CAKR"}

package/dist/cli/commands/claim.js

@@ -49,34 +49,52 @@ export const claimCommand = {
         if (stream.operator.toLowerCase() !== account.address.toLowerCase()) {
             throw new CliError(`wallet ${account.address} is not the operator of this stream`, {
                 exitCode: 3,
-                hint: `only ${stream.operator} can claim it — the escrow enforces this, so no other wallet can. Set ${PRIVATE_KEY_ENV} to the operator's key. (The buyer's side of this stream is \`metrik reclaim ${streamId}\`.)`,
+                hint: `only ${stream.operator} can claim it — the escrow enforces this, so no other wallet can. Set ${PRIVATE_KEY_ENV} to the operator's key. (The buyer's side of this stream is \`${buyerSideCommand(stream, streamId, deps.nowSeconds())}\`.)`,
             });
         }
-        const plan = await planClaim(read, streamId, stream, escrowGenerationFor(config.chainId, config.escrow));
-        if (plan.kind === "nothing")
-            throw plan.error;
         const write = deps.createWriteClient(config, account, writeClientOptions(wallet));
-        const action = {
-            streamId,
-            // `null` for a policy-enforced wallet — see `../spend-policy.ts`.
-            signedMandate: isPolicyEnforced(wallet)
-                ? null
-                : await signClaimMandate(account, config.chainId),
-            spentSoFarUsdc: 0n,
-            nowSeconds: deps.nowSeconds(),
-        };
+        const generation = escrowGenerationFor(config.chainId, config.escrow);
+        // The oracle can post (or the escrow retain) a newer checkpoint between
+        // this plan and the transaction, so a proof read moments ago can revert
+        // `InvalidProof`. Nothing was spent on a reverted simulation: re-plan from
+        // fresh chain and proof state and try again, a bounded number of times.
+        let plan;
         let result;
-        if (plan.kind === "claimWithProof") {
-            result = await write.claimStream(action);
-        }
-        else {
-            if (write.claimProvenStream === undefined) {
-                throw new CliError("this write client cannot send claimProven, which is the only way to collect this stream's proven value", {
-                    exitCode: 3,
-                    hint: "no current checkpoint proof pays it, so a proof claim would revert NothingToClaim",
-                });
+        for (let attempt = 1;; attempt += 1) {
+            const planned = await planClaim(read, streamId, stream, generation);
+            if (planned.kind === "nothing")
+                throw planned.error;
+            plan = planned;
+            const action = {
+                streamId,
+                // `null` for a policy-enforced wallet — see `../spend-policy.ts`.
+                signedMandate: isPolicyEnforced(wallet)
+                    ? null
+                    : await signClaimMandate(account, config.chainId),
+                spentSoFarUsdc: 0n,
+                nowSeconds: deps.nowSeconds(),
+            };
+            try {
+                if (plan.kind === "claimWithProof") {
+                    result = await write.claimStream(action);
+                }
+                else {
+                    if (write.claimProvenStream === undefined) {
+                        throw new CliError("this write client cannot send claimProven, which is the only way to collect this stream's proven value", {
+                            exitCode: 3,
+                            hint: "no current checkpoint proof pays it, so a proof claim would revert NothingToClaim",
+                        });
+                    }
+                    result = await write.claimProvenStream(action);
+                }
+                break;
+            }
+            catch (error) {
+                if (attempt >= CLAIM_REPLAN_ATTEMPTS || !isStaleProofError(error)) {
+                    throw error;
+                }
+                await deps.sleep(CLAIM_REPLAN_DELAY_MS);
             }
-            result = await write.claimProvenStream(action);
         }
         out.result({
             streamId,
@@ -102,6 +120,19 @@ export const claimCommand = {
         ]);
     },
 };
+/** How many plan-then-send rounds `metrik claim` makes before giving up. */
+const CLAIM_REPLAN_ATTEMPTS = 3;
+/** Pause between rounds, so a just-posted checkpoint can settle on the RPC. */
+const CLAIM_REPLAN_DELAY_MS = 3_000;
+/**
+ * A claim reverted because its proof no longer matches a root the escrow
+ * accepts (a checkpoint rotated, or a lagging node served a not-yet-visible
+ * root). Re-planning reads a fresh proof, so it is worth one more round.
+ */
+export function isStaleProofError(error) {
+    const text = describeError(error);
+    return /InvalidProof|fresh checkpoint proof/.test(text);
+}
 export async function planClaim(read, streamId, stream, escrowGeneration) {
     let verifiedCumulative = null;
     let proofError = null;
@@ -187,4 +218,15 @@ export async function planClaim(read, streamId, stream, escrowGeneration) {
         }),
     };
 }
+/**
+ * The buyer's recovery command for a stream. A reclaim needs the clock
+ * stopped (closed, or past expiresAt), so a still-running stream gets
+ * `--close-first`; the plain form only once it has stopped.
+ */
+export function buyerSideCommand(stream, streamId, nowSeconds) {
+    const stopped = stream.status === "closed" || nowSeconds >= stream.expiresAt;
+    return stopped
+        ? `metrik reclaim ${streamId}`
+        : `metrik reclaim ${streamId} --close-first`;
+}
 //# sourceMappingURL=claim.js.map

package/dist/cli/commands/claim.js.map

@@ -1 +1 @@
-{"version":3,"file":"claim.js","sourceRoot":"","sources":["../../../src/cli/commands/claim.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claim.js","sourceRoot":"","sources":["../../../src/cli/commands/claim.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/pay.d.ts

@@ -1,7 +1,17 @@
 import type { X402QuoteSummary } from "@absol-labs/sdk/x402";
 import { type ServerMandateCaps } from "../../mandates/env.js";
+import { type CloseAfterOutcome } from "../../x402-buyer/refund-actions.js";
 import type { CommandSpec } from "../context.js";
 export declare const payCommand: CommandSpec;
+/**
+ * The `closeAfter` part of `metrik pay --close-after --json`: what this
+ * client's close + reclaim did, with the amounts from the verified receipt.
+ */
+export declare function describeCloseAfter(outcome: CloseAfterOutcome, context: {
+    readonly price: bigint | null;
+    readonly deposit: bigint | null;
+    readonly finishCommand: string | null;
+}): Record<string, unknown>;
 /**
  * One line stating what a quote commits the payer to, printed before signing:
  * for an upfront-opener quote, the NON-REFUNDABLE per-call part and the

package/dist/cli/commands/pay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pay.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/pay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AA2B/B,OAAO,KAAK,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AAOjE,eAAO,MAAM,UAAU,EAAE,WAsSxB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAQlE;AAqBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GACrE,KAAK,MAAM,EAAE,GAAG,IAAI,CAKtB;AAKD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,iBAAiB,GAAG,IAAI,EACjC,KAAK,EAAE;IACL,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,CAAC;CAC9C,GACA,iBAAiB,CA4CnB;AAqFD,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAkDzD"}
+{"version":3,"file":"pay.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/pay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AA2B/B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,oCAAoC,CAAC;AAQ5C,OAAO,KAAK,EAAkB,WAAW,EAAE,MAAM,eAAe,CAAC;AAOjE,eAAO,MAAM,UAAU,EAAE,WA0ZxB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE;IACP,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CACvC,GACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAmDzB;AA2DD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,CAQlE;AAqBD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,GACrE,KAAK,MAAM,EAAE,GAAG,IAAI,CAKtB;AAKD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,iBAAiB,GAAG,IAAI,EACjC,KAAK,EAAE;IACL,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,CAAC;CAC9C,GACA,iBAAiB,CA4CnB;AAqFD,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAkDzD"}

package/dist/cli/commands/pay.js

@@ -7,6 +7,8 @@ import { CliError, configError, usageError } from "../errors.js";
 import { usdcFundingHint } from "../../network.js";
 import { CDP_ENV_VARS, PRIVATE_KEY_ENV, isPrivyWalletSource, resolveCliWallet, } from "../wallet.js";
 import { hasHeader, parseHeaders } from "./invoke.js";
+import { closeAfterPayment, } from "../../x402-buyer/refund-actions.js";
+import { authorizeCloseSigner, DEFAULT_ATTEMPTS, DEFAULT_MAX_WAIT_SECONDS, explainRefundFailure, reclaimActivity, } from "./refund.js";
 /** Default stream window a request-sized mandate allows (one day). */
 const DEFAULT_MAX_DURATION_SECONDS = 86_400;
 /** Longest response body printed in human mode before it is truncated. */
@@ -14,7 +16,7 @@ const MAX_PRINTED_BODY_CHARS = 64 * 1024;
 export const payCommand = {
     name: "pay",
     summary: "Pay an x402 endpoint into a recoverable escrow stream, under a spend mandate",
-    usage: 'metrik pay <url> [--json \'{"text":"hi"}\' | --data <body>] [--method POST] [--header "K: V"] --max-amount <usdc> [--max-rate <usdc/s>] [--max-upfront <usdc>] [--max-duration <seconds>] [--min-duration <seconds>] [--operator <address>] [--units atomic]',
+    usage: 'metrik pay <url> [--json \'{"text":"hi"}\' | --data <body>] [--method POST] [--header "K: V"] --max-amount <usdc> [--max-rate <usdc/s>] [--max-upfront <usdc>] [--max-duration <seconds>] [--min-duration <seconds>] [--operator <address>] [--close-after] [--units atomic]',
     flags: [
         "data",
         "json-body",
@@ -26,6 +28,7 @@ export const payCommand = {
         "max-duration",
         "min-duration",
         "operator",
+        "close-after",
         "units",
         "allow-legacy-factory",
     ],
@@ -46,6 +49,7 @@ export const payCommand = {
         "max-upfront": "--max-upfront <usdc> (cap on the NON-REFUNDABLE per-call part of an upfront-opener quote; default 0.10 USDC, 0 refuses any)",
         data: "--data <body>",
         "json-body": "--json <body> (alias: --json-body <body>)",
+        "close-after": "--close-after (after a successful paid response, this client closes the stream for you and reclaims the unearned part: it signs the payer's Close, the seller's refund relay sends it and pays the gas, then it waits for the covering checkpoint and asks the relay to reclaim to the payer. Your request, sent by your client; not an automatic refund. Exit 5 if it does not finish, with the command that finishes it)",
     },
     async run(context) {
         const { args, config, env, out, deps } = context;
@@ -154,7 +158,15 @@ export const payCommand = {
         const opener = result.metrikStreamOpener;
         const quote = result.quote;
         const settlementTx = settlementTransaction(result.paymentResponse);
-        out.result({
+        const closeAfter = booleanFlag(args, "close-after");
+        // A stream on another (e.g. legacy) registered escrow is reached by
+        // naming that escrow; the CLI defaults to the network's current one.
+        const escrowFlag = opener?.escrow !== null &&
+            opener?.escrow !== undefined &&
+            opener.escrow.toLowerCase() !== config.escrow.toLowerCase()
+            ? ` --escrow ${opener.escrow}`
+            : "";
+        const payResult = {
             paid: result.paid,
             // The facilitator's settlement transaction, from the PAYMENT-RESPONSE
             // header the seller relayed: the facilitator's relayer broadcast it, not
@@ -186,16 +198,36 @@ export const payCommand = {
             minEarnSeconds: quote?.minEarnSeconds ?? null,
             mandateSource: envCaps === null ? "request" : "env",
             refundIsAutomatic: false,
-        });
+        };
         if (!result.paid) {
+            // Nothing settled (the endpoint answered without a payment, or the paid
+            // request failed and was never settled): there is nothing to close.
+            out.result({
+                ...payResult,
+                ...(closeAfter ? { closeAfter: { outcome: "not-paid" } } : {}),
+            });
             out.print(`The endpoint answered ${result.response.status} without asking for payment; nothing was signed or paid.`);
             out.print(truncate(bodyText));
+            if (closeAfter) {
+                out.print("--close-after: nothing was paid, so there is nothing to close.");
+            }
             return;
         }
         out.print(`Paid. HTTP ${result.response.status}`);
         out.print(truncate(bodyText));
         out.print("");
         if (opener !== null && opener.streamId === null) {
+            out.result({
+                ...payResult,
+                ...(closeAfter
+                    ? {
+                        closeAfter: {
+                            outcome: "nothing-to-close",
+                            refundIsAutomatic: false,
+                        },
+                    }
+                    : {}),
+            });
             // Upfront-only: no stream exists, so there is no refund or reclaim to offer.
             out.table([
                 ["opener", opener.opener],
@@ -212,64 +244,228 @@ export const payCommand = {
             ]);
             out.print("");
             out.print("This payment is FINAL: it was an upfront-only (minimum-charge) payment, the whole price was paid to the seller at settlement as a non-refundable per-call charge, and no escrow stream was opened. There is nothing to refund or reclaim.");
+            if (closeAfter) {
+                out.print("--close-after: nothing to close — no stream was opened. Nothing was signed or sent.");
+            }
             return;
         }
-        if (opener !== null && opener.streamId !== null) {
-            out.table([
-                ["streamId", opener.streamId],
-                ["opener", opener.opener],
-                ["payer", account.address],
-                ...splitRows(quote, opener.upfrontFee),
-                ...(opener.deposit === null
-                    ? []
-                    : [["deposit", formatUsdc(opener.deposit)]]),
-                ...(opener.ratePerSecond === null
-                    ? []
-                    : [
-                        ["rate", `${formatUsdc(opener.ratePerSecond)} / verified second`],
-                    ]),
-                ...(quote?.minEarnSeconds === null ||
-                    quote?.minEarnSeconds === undefined
-                    ? []
-                    : [
-                        [
-                            "fully earned after",
-                            `${formatDuration(Number(quote.minEarnSeconds))} of verified delivery`,
-                        ],
-                    ]),
-                ...(opener.expiresAt === null
-                    ? []
-                    : [
-                        ["expires", new Date(opener.expiresAt * 1000).toISOString()],
-                    ]),
-                ["refund url", opener.refundUrl ?? "(the seller advertised no relay)"],
-                ...(settlementTx === null
-                    ? []
-                    : [
-                        [
-                            "settlement tx",
-                            `${settlementTx} (reported by the seller's facilitator in PAYMENT-RESPONSE; its relayer broadcast it)`,
-                        ],
-                    ]),
-            ]);
-            out.print("");
-            // A stream on another (e.g. legacy) registered escrow is reached by
-            // naming that escrow; the CLI defaults to the network's current one.
-            const escrowFlag = opener.escrow !== null &&
-                opener.escrow.toLowerCase() !== config.escrow.toLowerCase()
-                ? ` --escrow ${opener.escrow}`
-                : "";
+        if (opener === null || opener.streamId === null) {
+            out.result(payResult);
+            return;
+        }
+        const streamId = opener.streamId;
+        out.table([
+            ["streamId", streamId],
+            ["opener", opener.opener],
+            ["payer", account.address],
+            ...splitRows(quote, opener.upfrontFee),
+            ...(opener.deposit === null
+                ? []
+                : [["deposit", formatUsdc(opener.deposit)]]),
+            ...(opener.ratePerSecond === null
+                ? []
+                : [
+                    ["rate", `${formatUsdc(opener.ratePerSecond)} / verified second`],
+                ]),
+            ...(quote?.minEarnSeconds === null || quote?.minEarnSeconds === undefined
+                ? []
+                : [
+                    [
+                        "fully earned after",
+                        `${formatDuration(Number(quote.minEarnSeconds))} of verified delivery`,
+                    ],
+                ]),
+            ...(opener.expiresAt === null
+                ? []
+                : [
+                    ["expires", new Date(opener.expiresAt * 1000).toISOString()],
+                ]),
+            ["refund url", opener.refundUrl ?? "(the seller advertised no relay)"],
+            ...(settlementTx === null
+                ? []
+                : [
+                    [
+                        "settlement tx",
+                        `${settlementTx} (reported by the seller's facilitator in PAYMENT-RESPONSE; its relayer broadcast it)`,
+                    ],
+                ]),
+        ]);
+        out.print("");
+        const refundCommand = (flags) => opener.refundUrl === null
+            ? `metrik reclaim ${streamId}${escrowFlag}`
+            : `metrik refund ${streamId} --refund-url ${opener.refundUrl}${escrowFlag} ${flags}`;
+        if (!closeAfter) {
+            out.result(payResult);
             out.print(quote?.openerKind === "upfront" &&
                 quote.upfrontAmount !== null &&
                 quote.upfrontAmount > 0n
                 ? `Refunds are NOT automatic. The ${formatUsdc(quote.upfrontAmount)} upfront charge is final; of the ${formatUsdc(quote.refundableAmount ?? 0n)} escrowed, the seller earns only verified seconds, and whatever is unearned stays in the escrow until someone reclaims it for you:`
                 : "Refunds are NOT automatic. The seller earns only for verified seconds; whatever is unearned stays in the escrow until someone reclaims it for you:");
             out.print(opener.refundUrl === null
-                ? `  metrik reclaim ${opener.streamId}${escrowFlag}      (anyone may send it; the refund always goes to the payer)`
-                : `  metrik refund ${opener.streamId} --refund-url ${opener.refundUrl}${escrowFlag} --close --reclaim`);
+                ? `  ${refundCommand("")}      (anyone may send it; the refund always goes to the payer)`
+                : `  ${refundCommand("--close --reclaim")}`);
+            return;
         }
+        // --close-after: the buyer asked for it, so THIS client now sends the
+        // buyer's own close and reclaim. Not an automatic refund.
+        out.note("--close-after: closing the stream now, as you asked. This client signs the payer's Close and the seller's refund relay sends it (the relay pays the gas); then it waits for the checkpoint covering the close and asks the relay to reclaim the unearned part to the payer.");
+        const outcome = await closeAfterPayment({
+            payment: opener,
+            payer: account.address,
+            openRefunds: async () => await x402.refundClient(config, {
+                refundUrl: opener.refundUrl,
+                streamId,
+                opener: opener.opener,
+                maxAttempts: DEFAULT_ATTEMPTS,
+                maxDelayMs: DEFAULT_MAX_WAIT_SECONDS * 1_000,
+                ...(typeof opener.settledAt === "number"
+                    ? { settledAt: opener.settledAt }
+                    : {}),
+            }),
+            closeSigner: async () => await authorizeCloseSigner(account, config.chainId),
+            sleep: deps.sleep,
+            note: out.note,
+            ...(context.progress === undefined
+                ? {}
+                : {
+                    setActivity: (activity) => context.progress?.setActivity(activity),
+                }),
+            reclaimActivity: reclaimActivity(DEFAULT_ATTEMPTS, DEFAULT_MAX_WAIT_SECONDS),
+        });
+        const finishCommand = outcome.outcome === "incomplete"
+            ? refundCommand(outcome.incomplete?.closed === true
+                ? "--reclaim"
+                : "--close --reclaim")
+            : null;
+        out.result({
+            ...payResult,
+            closeAfter: describeCloseAfter(outcome, {
+                price: quote?.amount ?? null,
+                deposit: opener.deposit,
+                finishCommand,
+            }),
+        });
+        out.table(closeAfterRows(outcome, quote, opener.deposit));
+        out.print("");
+        if (outcome.outcome === "incomplete") {
+            const incomplete = outcome.incomplete;
+            const why = incomplete?.error instanceof Error
+                ? explainRefundFailure(incomplete.error)
+                : null;
+            throw new CliError(`paid (HTTP ${result.response.status}), but the close-after did not finish: ${incomplete?.stage === "no-relay" ? "" : `the ${incomplete?.stage ?? "close"} did not finish — `}${incomplete?.reason ?? "unknown"}`, {
+                exitCode: 5,
+                hint: `the payment and the response are fine, and nothing is lost: ${incomplete?.closed === true ? "the stream is closed and " : ""}the unearned part stays in the escrow for the payer. Finish it with:\n    ${finishCommand ?? refundCommand("--close --reclaim")}${why instanceof CliError && why.hint !== undefined
+                    ? `\n  (${why.hint})`
+                    : ""}`,
+                cause: incomplete?.error ?? undefined,
+            });
+        }
+        out.print(describeCloseAfterDone(outcome));
     },
 };
+/**
+ * The `closeAfter` part of `metrik pay --close-after --json`: what this
+ * client's close + reclaim did, with the amounts from the verified receipt.
+ */
+export function describeCloseAfter(outcome, context) {
+    const refunded = outcome.refundedUsdc;
+    return {
+        outcome: outcome.outcome,
+        streamId: outcome.streamId,
+        close: outcome.close === null
+            ? null
+            : {
+                transaction: outcome.close.transaction,
+                verified: outcome.close.verified,
+            },
+        closeSkipped: outcome.closeSkipped,
+        reclaim: outcome.reclaim === null
+            ? null
+            : {
+                transaction: outcome.reclaim.transaction,
+                amount: outcome.reclaim.amount,
+                verified: outcome.reclaim.verified,
+            },
+        reclaimSkipped: outcome.reclaimSkipped,
+        // Base units returned to the payer, from the receipt's ReclaimForwarded
+        // (null unless the receipt was verified).
+        refunded,
+        // What the payment finally cost: price - refunded (upfront + earned).
+        kept: refunded === null || context.price === null
+            ? null
+            : context.price - refunded,
+        // What the seller earned from the escrow: deposit - refunded.
+        earned: refunded === null || context.deposit === null
+            ? null
+            : context.deposit - refunded,
+        finishedReason: outcome.finished,
+        status: outcome.status?.status ?? null,
+        reclaimed: outcome.status?.reclaimed ?? null,
+        incomplete: outcome.incomplete === null
+            ? null
+            : {
+                stage: outcome.incomplete.stage,
+                closed: outcome.incomplete.closed,
+                reason: outcome.incomplete.reason,
+            },
+        finishCommand: context.finishCommand,
+        // The buyer's own client sent these, at the buyer's request.
+        sentBy: "buyer",
+        refundIsAutomatic: false,
+    };
+}
+/** Human rows for a close-after run. */
+function closeAfterRows(outcome, quote, deposit) {
+    const rows = [];
+    if (outcome.close !== null) {
+        rows.push([
+            "close tx",
+            `${outcome.close.transaction}${outcome.close.verified ? " (verified)" : " (relay-reported)"}`,
+        ]);
+    }
+    else if (outcome.closeSkipped !== null) {
+        rows.push(["close", "skipped — already closed"]);
+    }
+    if (outcome.reclaim !== null) {
+        rows.push([
+            "reclaim tx",
+            `${outcome.reclaim.transaction}${outcome.reclaim.verified ? " (verified)" : " (relay-reported)"}`,
+        ]);
+        const amount = outcome.refundedUsdc ?? outcome.reclaim.amount;
+        if (amount !== null) {
+            rows.push([
+                "refunded to payer",
+                `${formatUsdc(amount)}${outcome.refundedUsdc === null ? " (relay-reported; the receipt was NOT verified)" : " (from the verified receipt)"}`,
+            ]);
+            if (deposit !== null) {
+                rows.push([
+                    "seller earned",
+                    `${formatUsdc(deposit - amount)} (verified seconds)`,
+                ]);
+            }
+            if (quote !== null) {
+                rows.push([
+                    "payment cost",
+                    `${formatUsdc(quote.amount - amount)} of the ${formatUsdc(quote.amount)} paid`,
+                ]);
+            }
+        }
+    }
+    return rows;
+}
+function describeCloseAfterDone(outcome) {
+    if (outcome.reclaim !== null) {
+        const amount = outcome.refundedUsdc ?? outcome.reclaim.amount;
+        return `Closed and reclaimed at your request: ${amount === null ? "the unearned remainder" : formatUsdc(amount)} went back to the payer${outcome.refundedUsdc !== null ? " (receipt verified on-chain)" : ""}. Nothing further to do for this stream.`;
+    }
+    if (outcome.finished === "reclaimed") {
+        return "Already finished: the stream is closed and was already reclaimed to the payer. Nothing further to do.";
+    }
+    if (outcome.finished === "nothing-to-reclaim") {
+        return "Closed at your request. Nothing to reclaim: the verified delivery covers the whole deposit, so none of it is unearned.";
+    }
+    return "Closed at your request.";
+}
 /**
  * One line stating what a quote commits the payer to, printed before signing:
  * for an upfront-opener quote, the NON-REFUNDABLE per-call part and the