shinjuku-shielded 0.3.7 → 0.3.8

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "488372b4f12886748870eb5fb6d5f25eb42a43b6ddc6f74c20cac033fe5f6927",
-  "bytes": 10818483,
-  "sourceCommit": "bb0d7783d7afef43e857ab6841b5dfc6c3ea6195",
+  "sha256": "08a4b56f6452268ffdd513e67326de8782b53dcec16ba88adaddf16793581206",
+  "bytes": 10822047,
+  "sourceCommit": "1368a8e875dcbdba3c4a936162975193929ef876",
   "sourceDirty": false,
   "installRecordMatchesLockfile": true,
   "releaseRule": "valid only when two fresh npm ci --ignore-scripts builds on different OSes give the same sha256; installRecordMatchesLockfile true means every entry npm installed equals its package-lock.json entry and every entry not marked optional, devOptional included, is installed: an optional entry (a package for another platform) may be absent",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "mcpName": "io.github.ShinjukuStaition/shinjuku-mcp",
   "description": "Shinjuku Shielded, the private x402 facilitator on Solana: the self-custody wallet CLI and its MCP server. Shield, pay, and unshield USDC from any MCP agent, under caps you set.",
-  "shinjukuRelease": "488372b4",
-  "shinjukuSha256": "488372b4f12886748870eb5fb6d5f25eb42a43b6ddc6f74c20cac033fe5f6927",
+  "shinjukuRelease": "08a4b56f",
+  "shinjukuSha256": "08a4b56f6452268ffdd513e67326de8782b53dcec16ba88adaddf16793581206",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -47814,14 +47814,20 @@ function parsePoolState(data) {
   if (!data) throw new Error("pool_state_length_invalid");
   const bytes2 = Buffer.from(data);
   const magic = bytes2.subarray(0, 8).toString("ascii");
-  if (bytes2.length === POOL_STATE_LEN && isP03PoolMagic(magic)) {
-    const anchors = [88, 136].map((offset) => ({
+  if ((bytes2.length === POOL_STATE_LEN || bytes2.length === POOL_STATE_LEN_RING) && isP03PoolMagic(magic)) {
+    const anchorMode = bytes2[11];
+    const ring = bytes2.length === POOL_STATE_LEN_RING;
+    if (ring !== (anchorMode === ANCHOR_MODE_RING) || !ring && anchorMode !== 0 && anchorMode !== 1) {
+      throw new Error("pool_state_anchor_layout_invalid");
+    }
+    const anchors = ring ? readAnchorRing(bytes2) : [88, 136].map((offset) => ({
       epoch: bytes2.readBigUInt64LE(offset),
       root: BigInt(`0x${bytes2.subarray(offset + 8, offset + 40).toString("hex")}`),
       index: bytes2.readBigUInt64LE(offset + 40)
     }));
     return {
       version: 3,
+      anchorMode,
       terminal: bytes2[12] === 1,
       poolDomain: BigInt(`0x${bytes2.subarray(16, 48).toString("hex")}`),
       currentRoot: BigInt(`0x${bytes2.subarray(48, 80).toString("hex")}`),
@@ -47856,6 +47862,22 @@ function parsePoolState(data) {
     paymentSettler: new import_web391.PublicKey(data.subarray(200, 232))
   };
 }
+function readAnchorRing(bytes2) {
+  const head = bytes2.readUInt16LE(ANCHOR_RING_HEADER);
+  const count2 = bytes2.readUInt16LE(ANCHOR_RING_HEADER + 2);
+  if (head >= ANCHOR_RING_SLOTS || count2 < 1 || count2 > ANCHOR_RING_SLOTS || bytes2.readUInt32LE(ANCHOR_RING_HEADER + 4) !== 0) throw new Error("pool_state_anchor_ring_invalid");
+  const anchors = [];
+  for (let back = 0; back < count2; back += 1) {
+    const offset = ANCHOR_RING_FIRST_SLOT + (head - back + ANCHOR_RING_SLOTS) % ANCHOR_RING_SLOTS * ANCHOR_RING_SLOT_LEN;
+    anchors.push({
+      epoch: bytes2.readBigUInt64LE(offset),
+      root: BigInt(`0x${bytes2.subarray(offset + 8, offset + 40).toString("hex")}`),
+      index: bytes2.readBigUInt64LE(offset + 40),
+      takenAt: bytes2.readBigInt64LE(offset + 48)
+    });
+  }
+  return anchors;
+}
 async function readPoolState(connection, pool, commitment = "finalized") {
   const info = await retryRpc(() => connection.getAccountInfo(pool, commitment));
   if (!info) return void 0;
@@ -48129,7 +48151,7 @@ function depositIntentAddress({ programId, pool, depositPublicInputBytesHex }) {
     programId
   )[0];
 }
-var import_web391, POOL_STATE_LEN, POOL_STATE_LEN_V2, BUFFER_HEADER_LEN, PAYLOAD_LENGTH, PAYLOAD_LENGTH_V2, TRANSITION_KIND, INSTRUCTION, MAINNET_GENESIS, bytes322;
+var import_web391, POOL_STATE_LEN, POOL_STATE_LEN_RING, ANCHOR_MODE_RING, ANCHOR_RING_SLOTS, ANCHOR_RING_HEADER, ANCHOR_RING_FIRST_SLOT, ANCHOR_RING_SLOT_LEN, POOL_STATE_LEN_V2, BUFFER_HEADER_LEN, PAYLOAD_LENGTH, PAYLOAD_LENGTH_V2, TRANSITION_KIND, INSTRUCTION, MAINNET_GENESIS, bytes322;
 var init_chain = __esm({
   "spikes/shielded-x402-wallet/lib/chain.mjs"() {
     "use strict";
@@ -48138,6 +48160,12 @@ var init_chain = __esm({
     init_proxy();
     init_compressedReplay();
     POOL_STATE_LEN = 312;
+    POOL_STATE_LEN_RING = 1664;
+    ANCHOR_MODE_RING = 2;
+    ANCHOR_RING_SLOTS = 24;
+    ANCHOR_RING_HEADER = 312;
+    ANCHOR_RING_FIRST_SLOT = 320;
+    ANCHOR_RING_SLOT_LEN = 56;
     POOL_STATE_LEN_V2 = 280;
     BUFFER_HEADER_LEN = 92;
     PAYLOAD_LENGTH = Object.freeze({
@@ -50101,13 +50129,13 @@ function parsePoolState2(data) {
   if (!data) throw new Error("pool_state_length_invalid");
   const bytes2 = Buffer.from(data);
   const magic = bytes2.subarray(0, 8).toString("ascii");
-  if ((bytes2.length === POOL_STATE_LEN2 || bytes2.length === POOL_STATE_LEN_RING) && isP03PoolMagic(magic)) {
+  if ((bytes2.length === POOL_STATE_LEN2 || bytes2.length === POOL_STATE_LEN_RING2) && isP03PoolMagic(magic)) {
     const anchorMode = bytes2[11];
-    const ring = bytes2.length === POOL_STATE_LEN_RING;
-    if (ring !== (anchorMode === ANCHOR_MODE_RING) || !ring && anchorMode !== 0 && anchorMode !== 1) {
+    const ring = bytes2.length === POOL_STATE_LEN_RING2;
+    if (ring !== (anchorMode === ANCHOR_MODE_RING2) || !ring && anchorMode !== 0 && anchorMode !== 1) {
       throw new Error("pool_state_anchor_layout_invalid");
     }
-    const anchors = ring ? readAnchorRing(bytes2) : [88, 136].map((offset) => ({
+    const anchors = ring ? readAnchorRing2(bytes2) : [88, 136].map((offset) => ({
       epoch: bytes2.readBigUInt64LE(offset),
       root: BigInt(`0x${bytes2.subarray(offset + 8, offset + 40).toString("hex")}`),
       index: bytes2.readBigUInt64LE(offset + 40)
@@ -50152,13 +50180,13 @@ function parsePoolState2(data) {
     paymentSettler: new import_web395.PublicKey(data.subarray(200, 232))
   };
 }
-function readAnchorRing(bytes2) {
-  const head = bytes2.readUInt16LE(ANCHOR_RING_HEADER);
-  const count2 = bytes2.readUInt16LE(ANCHOR_RING_HEADER + 2);
-  if (head >= ANCHOR_RING_SLOTS || count2 < 1 || count2 > ANCHOR_RING_SLOTS || bytes2.readUInt32LE(ANCHOR_RING_HEADER + 4) !== 0) throw new Error("pool_state_anchor_ring_invalid");
+function readAnchorRing2(bytes2) {
+  const head = bytes2.readUInt16LE(ANCHOR_RING_HEADER2);
+  const count2 = bytes2.readUInt16LE(ANCHOR_RING_HEADER2 + 2);
+  if (head >= ANCHOR_RING_SLOTS2 || count2 < 1 || count2 > ANCHOR_RING_SLOTS2 || bytes2.readUInt32LE(ANCHOR_RING_HEADER2 + 4) !== 0) throw new Error("pool_state_anchor_ring_invalid");
   const anchors = [];
   for (let back = 0; back < count2; back += 1) {
-    const offset = ANCHOR_RING_FIRST_SLOT + (head - back + ANCHOR_RING_SLOTS) % ANCHOR_RING_SLOTS * ANCHOR_RING_SLOT_LEN;
+    const offset = ANCHOR_RING_FIRST_SLOT2 + (head - back + ANCHOR_RING_SLOTS2) % ANCHOR_RING_SLOTS2 * ANCHOR_RING_SLOT_LEN2;
     anchors.push({
       epoch: bytes2.readBigUInt64LE(offset),
       root: BigInt(`0x${bytes2.subarray(offset + 8, offset + 40).toString("hex")}`),
@@ -50401,7 +50429,7 @@ function depositIntentAddress2({ programId, pool, depositPublicInputBytesHex })
     programId
   )[0];
 }
-var import_web395, POOL_STATE_LEN2, POOL_STATE_LEN_RING, ANCHOR_MODE_RING, ANCHOR_RING_SLOTS, ANCHOR_RING_HEADER, ANCHOR_RING_FIRST_SLOT, ANCHOR_RING_SLOT_LEN, POOL_STATE_LEN_V22, BUFFER_HEADER_LEN2, MEMO_BUNDLE_BYTES2, PAYLOAD_LENGTH2, PAYLOAD_LENGTH_V22, TRANSITION_KIND2, INSTRUCTION2, COUNTED_RPC_METHODS, HISTORY_RPC_METHODS, PINNED_HISTORY_PROXIES, PINNED_HISTORY_HTTPS, HISTORY_RPC_OWN, historyRpcErrors, HISTORY_RPC_BEHIND_WAIT_MS, HISTORY_RPC_REQUEST_TIMEOUT_MS, HISTORY_RPC_BEHIND_RETRY_MS, HISTORY_RPC_BEHIND_CODE, ED25519_SPKI_PREFIX, SIGNATURE_BYTES, VERSION_1_PREFIX, HISTORY_CROSS_CHECK_COUNT, runTransactions, warmedSources, bytes323, MEMO_BATCH_MAX, MEMO_ATTEMPTS, MEMO_MAX_WAIT_SECONDS, MEMO_ANSWER_TIMEOUT_MS, MEMO_BODY_TIMEOUT_MS, pauseFor, noticeOnStderr, memoDigestHex, memoFailureText, prefetchedMemosByFetch, MEMO_PREFETCH_LIFE_MS;
+var import_web395, POOL_STATE_LEN2, POOL_STATE_LEN_RING2, ANCHOR_MODE_RING2, ANCHOR_RING_SLOTS2, ANCHOR_RING_HEADER2, ANCHOR_RING_FIRST_SLOT2, ANCHOR_RING_SLOT_LEN2, POOL_STATE_LEN_V22, BUFFER_HEADER_LEN2, MEMO_BUNDLE_BYTES2, PAYLOAD_LENGTH2, PAYLOAD_LENGTH_V22, TRANSITION_KIND2, INSTRUCTION2, COUNTED_RPC_METHODS, HISTORY_RPC_METHODS, PINNED_HISTORY_PROXIES, PINNED_HISTORY_HTTPS, HISTORY_RPC_OWN, historyRpcErrors, HISTORY_RPC_BEHIND_WAIT_MS, HISTORY_RPC_REQUEST_TIMEOUT_MS, HISTORY_RPC_BEHIND_RETRY_MS, HISTORY_RPC_BEHIND_CODE, ED25519_SPKI_PREFIX, SIGNATURE_BYTES, VERSION_1_PREFIX, HISTORY_CROSS_CHECK_COUNT, runTransactions, warmedSources, bytes323, MEMO_BATCH_MAX, MEMO_ATTEMPTS, MEMO_MAX_WAIT_SECONDS, MEMO_ANSWER_TIMEOUT_MS, MEMO_BODY_TIMEOUT_MS, pauseFor, noticeOnStderr, memoDigestHex, memoFailureText, prefetchedMemosByFetch, MEMO_PREFETCH_LIFE_MS;
 var init_chain2 = __esm({
   "wallet/src/chain.mjs"() {
     "use strict";
@@ -50412,12 +50440,12 @@ var init_chain2 = __esm({
     init_reference2();
     init_anchorClock();
     POOL_STATE_LEN2 = 312;
-    POOL_STATE_LEN_RING = 1664;
-    ANCHOR_MODE_RING = 2;
-    ANCHOR_RING_SLOTS = 24;
-    ANCHOR_RING_HEADER = 312;
-    ANCHOR_RING_FIRST_SLOT = 320;
-    ANCHOR_RING_SLOT_LEN = 56;
+    POOL_STATE_LEN_RING2 = 1664;
+    ANCHOR_MODE_RING2 = 2;
+    ANCHOR_RING_SLOTS2 = 24;
+    ANCHOR_RING_HEADER2 = 312;
+    ANCHOR_RING_FIRST_SLOT2 = 320;
+    ANCHOR_RING_SLOT_LEN2 = 56;
     POOL_STATE_LEN_V22 = 280;
     BUFFER_HEADER_LEN2 = 92;
     MEMO_BUNDLE_BYTES2 = 25600;
@@ -59700,6 +59728,7 @@ var init_errorCodes = __esm({
       "p03_resource_cli_out_unwritable_rerun_same_request",
       "p03_resource_payment_response_unconfirmed_retry_same_request",
       "p03_resource_payment_refused_pay_again_new_request_id",
+      "p03_resource_payment_another_request_unresolved",
       "p03_seller_anchor_not_ready",
       "p03_seller_http_failed",
       "p03_seller_lock_release_failed",
@@ -89554,6 +89583,18 @@ var init_floatPay = __esm({
   }
 });
 
+// wallet/src/pay/requestId.mjs
+var payerRequestIdOf;
+var init_requestId = __esm({
+  "wallet/src/pay/requestId.mjs"() {
+    "use strict";
+    payerRequestIdOf = (record) => {
+      const id = typeof record?.requestId === "string" ? record.requestId.replace(/:float$/, "") : void 0;
+      return id !== void 0 && !id.startsWith("float:") && /^[A-Za-z0-9._:-]{1,128}$/.test(id) ? id : void 0;
+    };
+  }
+});
+
 // wallet/src/pay/payResource.mjs
 import { fileURLToPath as fileURLToPath10 } from "node:url";
 function assertOwnerUnshieldRequest(requestId, url) {
@@ -90094,7 +90135,7 @@ async function payResourceOnce({
     if (reconciling) break;
     const other = store.readWal(name);
     if (other?.state === "submitted" && other.refused?.landed) fail19("refused_payment_landed");
-    if (!["receipt", "cancelled"].includes(other?.state)) fail19("another_request_unresolved");
+    if (!["receipt", "cancelled"].includes(other?.state)) failUnresolved(other);
   }
   if (record?.state === "cancelled") fail19(record.refused ? "request_refused_use_new_request_id" : "request_cancelled");
   const walkHistory = deps.walkHistory ?? (() => walkFinalizedP03TransitionContexts({
@@ -90176,7 +90217,7 @@ async function payResourceOnce({
     if (isPending(other)) {
       mark("prior-finality-wait");
       other = await withPhaseScope(mark, "fin", () => finalizePendingReceipt({ store, connection, programId, name, ...finalityWait, deps: finality }));
-      if (isPending(other)) fail19("another_request_unresolved");
+      if (isPending(other)) failUnresolved(other);
       mark("prior-finality-done");
     }
     if (other?.state === "receipt" && other.receiptFinality === "never-finalized") {
@@ -90261,6 +90302,7 @@ async function payResourceOnce({
           state: "quoted",
           fingerprint,
           url,
+          requestId,
           request: suppliedRequest,
           paymentRequired,
           ownerUnshield,
@@ -90420,7 +90462,7 @@ async function payResourceOnce({
   mark("receipt-pending");
   return { replayed: false, receipt, resultBase64, receiptFinality: "pending" };
 }
-var import_web3110, fail19, hash10, OWNER_UNSHIELD_REQUEST, OWNER_UNSHIELD_ORIGIN, POCKET_FILL_ID, RECEIPT_FINALITY_TIMEOUT_MS, RECEIPT_FINALITY_POLL_MS, FINALITY_GATE_MARGIN_SLOTS, FINALITY_GATE_POLL_MS, FINALITY_GATE_SKIP_AFTER_MS, PENDING_FINALITY, isPending, REPLAY_INPUTS, PAYMENT_OUTPUT_INPUT2, QUOTE_MARGIN_SECONDS, SELLER_REFUSED_PAY_AGAIN, SELLER_REASON_FACILITATOR_UNDERFUNDED, ANCHOR_EPOCH_MS, ANCHOR_MARGIN_MS, ANCHOR_WAIT_CAP_MS, DEAD_PAYMENT_MARGIN_SECONDS, SYSVAR_OWNER, quoteLiveAt, replayValuesOf;
+var import_web3110, fail19, failUnresolved, hash10, OWNER_UNSHIELD_REQUEST, OWNER_UNSHIELD_ORIGIN, POCKET_FILL_ID, RECEIPT_FINALITY_TIMEOUT_MS, RECEIPT_FINALITY_POLL_MS, FINALITY_GATE_MARGIN_SLOTS, FINALITY_GATE_POLL_MS, FINALITY_GATE_SKIP_AFTER_MS, PENDING_FINALITY, isPending, REPLAY_INPUTS, PAYMENT_OUTPUT_INPUT2, QUOTE_MARGIN_SECONDS, SELLER_REFUSED_PAY_AGAIN, SELLER_REASON_FACILITATOR_UNDERFUNDED, ANCHOR_EPOCH_MS, ANCHOR_MARGIN_MS, ANCHOR_WAIT_CAP_MS, DEAD_PAYMENT_MARGIN_SECONDS, SYSVAR_OWNER, quoteLiveAt, replayValuesOf;
 var init_payResource = __esm({
   "wallet/src/pay/payResource.mjs"() {
     "use strict";
@@ -90443,9 +90485,16 @@ var init_payResource = __esm({
     init_proxy();
     init_phaseTiming();
     init_anchorClock();
+    init_requestId();
     fail19 = (reason) => {
       throw new Error(`p03_resource_payment_${reason}`);
     };
+    failUnresolved = (other) => {
+      const error = new Error("p03_resource_payment_another_request_unresolved");
+      const blocking = payerRequestIdOf(other);
+      if (blocking !== void 0) error.blockingRequestId = blocking;
+      throw error;
+    };
     hash10 = (value) => sha256Hex2(Buffer.from(value, "utf8"));
     OWNER_UNSHIELD_REQUEST = /^unshield-([0-9a-zA-Z_-]{1,48})$/;
     OWNER_UNSHIELD_ORIGIN = "https://self-pay.invalid";
@@ -116177,8 +116226,8 @@ import { createHash as createHash21 } from "node:crypto";
 import { dirname as dirname16, join as join15, sep as sep3 } from "node:path";
 var PINNED_PROOF_TOOLS = Object.freeze({
   [DEFAULT_FACILITATOR_ORIGIN]: Object.freeze({
-    dir: "ad860e62",
-    sumsSha256: "ad860e62dd9bde09008fce798dbe0970f59ef9f7fca846e5a5238c93d7f42597"
+    dir: "47678912",
+    sumsSha256: "47678912949d7da8b705c399edf03d2367465f6eb581b00a059356373baed28e"
   })
 });
 var UPDATE_NEXT = "update the wallet: npx -y shinjuku-shielded@latest setup";
@@ -116363,6 +116412,7 @@ init_sealedCache();
 init_deposit();
 init_selfPay();
 init_book();
+init_requestId();
 var BALANCE_SNAPSHOT_SCHEMA = "carbon-shielded-wallet/balance-snapshot/v1";
 var BALANCE_SNAPSHOT_FILE = "balance-snapshot.json";
 var SNAPSHOT_KEY_LABEL = "carbon-shielded-wallet/balance-snapshot-key/v1";
@@ -116638,11 +116688,13 @@ function computeBalance({ store, snapshotRead, source = "local", now = Date.now(
       const proof = byName.get(`resource-proof-${key}`)?.record;
       const inputs = provenInputs(proof);
       const selfPay2 = String(entry.record.url ?? "").startsWith(SELF_PAY_ORIGIN2);
+      const requestId = payerRequestIdOf(entry.record);
       const item = {
         kind: selfPay2 ? "unshield-self-payment" : "payment",
         state: entry.state,
         amountAtomic: paymentAmount(entry.record) ?? null,
-        ...selfPay2 ? {} : { url: publicUrl(entry.record.url) }
+        ...selfPay2 ? {} : { url: publicUrl(entry.record.url) },
+        ...requestId === void 0 ? {} : { requestId }
       };
       if (inputs === void 0) {
         unknownInputs = true;
@@ -120032,6 +120084,9 @@ function createWalletTools({
       );
     } else if (code === "p03_resource_payment_refused_pay_again_new_request_id") {
       next = "Nothing was paid, and the seller closed this request_id. To pay, call x402_pay with a NEW request_id and the same url, method, headers, and body; if the same refusal repeats, tell your owner what the detail says";
+    } else if (/another_request_unresolved$/.test(code)) {
+      const blocking = error?.blockingRequestId ?? error?.cause?.blockingRequestId;
+      next = typeof blocking === "string" && /^[A-Za-z0-9._:-]{1,128}$/.test(blocking) ? `Nothing was paid: an earlier payment (request_id "${blocking}") is not finished, and the wallet pays one at a time. Call x402_pay again with request_id "${blocking}" and that payment's url, method, headers, and body (it finishes it and never pays twice), or close it with wallet_cancel request_id "${blocking}"; then call x402_pay again with request_id "${requestId}"` : `Nothing was paid: an earlier payment is not finished, and the wallet pays one at a time. wallet_balance lists it in detail.inFlight; finish it with x402_pay and its request_id, or close it with wallet_cancel; then call x402_pay again with request_id "${requestId}"`;
     } else if (/accounts_split_merge_first/.test(line)) {
       next = `Nothing was paid: the shielded balance covers this price in total, but it sits in several accounts and one payment draws only one account and at most 3 notes. Tell your owner to join them: shinjuku-wallet merge --wallet <wallet.json> --passphrase-file passphrase.txt --program <program> --proof-tools proof-tools.json --profile public-profile.json --facilitator <facilitator origin> (--dry-run shows the plan; shinjuku-wallet help merge). After it finished and the next pool anchor (up to 5 minutes; about 30 s on a pool with sub-anchors) passed, call x402_pay again with request_id "${requestId}" and the same url, method, headers, and body`;
     } else if (code.startsWith("wallet_spend_refused_")) {
@@ -128468,7 +128523,7 @@ function failureHint(command, reason, deps, values) {
   if (/wallet_quote_refused_/.test(reason)) {
     return "nothing was paid: the seller's payment terms do not fit this wallet (the code names the failed check: pool, asset, network, binding, or a malformed challenge). Pay a seller that accepts this wallet's pool";
   }
-  if (/another_request_unresolved/.test(reason)) return `finish the earlier payment (rerun its pay command) or close it (${CLI2} help cancel); ${CLI2} balance lists it`;
+  if (/another_request_unresolved/.test(reason)) return `finish the earlier payment (rerun its pay command with the same --request-id) or close it (${CLI2} help cancel); ${CLI2} balance --refresh lists it in detail.inFlight with its requestId`;
   if (/resource_cli_out_unwritable/.test(reason)) return "the payment is recorded, but the --out file could not be written; rerun the same pay command (same --request-id) with a --out path you can write: it replays the receipt and never pays twice";
   if (/p03_facilitator_underfunded/.test(reason)) {
     const again = command.name === "unshield" ? "rerun the same command with a new --unshield-id" : command.name === "pocket fill" ? "rerun the same pocket fill command (it starts the fill again with a new quote)" : "pay again with a new --request-id";
@@ -128984,8 +129039,11 @@ async function runShinjukuWallet(argv, overrides = {}) {
     const codes = failureCodes(error, reason);
     writeRunResult(deps, command, 1, error, codes);
     const hint = failureHint(command, codes.join(" "), deps, values);
+    const blocking = error?.blockingRequestId ?? error?.cause?.blockingRequestId;
+    const blockingLine = typeof blocking === "string" && /^[A-Za-z0-9._:-]{1,128}$/.test(blocking) ? `earlier payment: --request-id ${blocking}
+` : "";
     io.err(`${CLI2} ${command.name} failed: ${reason}
-${hint ? `hint: ${hint}
+${blockingLine}${hint ? `hint: ${hint}
 ` : ""}Help: ${CLI2} help ${command.name}
 `);
     return 1;