@subly_fi/pay 0.5.0 → 0.6.1

package/README.md

@@ -19,10 +19,14 @@ Ships one `pay` dispatcher bin with subcommands, all runnable with `npx` (no clo
   threshold, deposits, and (when the mandate opts in) withdrawals return an
   `approveUrl` to paste into chat; retry with the `approvalId` once the
   human approved.
-- `pay fetch <url>` — one-shot: pay for a URL, print the receipt (used by the
-  OpenClaw skill)
-- `pay deposit <amountRawUsdc>` / `pay withdraw <amountRawUsdc>` — vault
-  deposit / withdraw
+- `pay fetch <url> [maxAmountRawUsdc] [apr_<approvalId>]` — one-shot: pay for
+  a URL, print the receipt (used by the OpenClaw skill); retry with the
+  `apr_...` id after an `approval_required` refusal
+- `pay deposit <amountRawUsdc> [apr_...]` / `pay withdraw <amountRawUsdc>
+  [apr_...]` — vault deposit / withdraw with the same owner-approval flow
+- `pay setup-link [--initial-deposit <raw>] [--approval-threshold <raw>] ...`
+  / `pay setup-status <sessionId>` — owner onboarding for CLI/skill harnesses
+  (same flow as the MCP setup tools)
 
 ## Wallet
 

package/dist/cli.js

@@ -9,14 +9,16 @@ const TARGETS = {
   mcp: "mcp-server.js",
   fetch: "pay.js",
   deposit: "deposit.js",
-  withdraw: "withdraw.js"
+  withdraw: "withdraw.js",
+  "setup-link": "setup-link.js",
+  "setup-status": "setup-status.js"
 };
 
 const [sub, ...rest] = process.argv.slice(2);
 const target = sub === undefined ? undefined : TARGETS[sub];
 if (target === undefined) {
   console.error(
-    "usage: subly <mcp|fetch <url>|deposit <amountRawUsdc>|withdraw <amountRawUsdc>>"
+    "usage: subly <mcp|fetch <url>|deposit <amountRawUsdc>|withdraw <amountRawUsdc>|setup-link|setup-status <sessionId>>"
   );
   process.exit(1);
 }

package/dist/deposit.js

@@ -1115,26 +1115,26 @@ var VaultFlowClient = class {
    * up and used automatically before surfacing deposit_approval_required.
    */
   async deposit(input) {
-    let approvalId = input.approvalId;
+    let approvalId2 = input.approvalId;
     let prepared;
     try {
       prepared = await this.postJson("prepare", "/v1/deposits/prepare", {
         wallet: this.signer.walletAddress,
         amountRawUsdc: input.amountRawUsdc.toString(),
-        ...approvalId === void 0 ? {} : { approvalId }
+        ...approvalId2 === void 0 ? {} : { approvalId: approvalId2 }
       });
     } catch (error) {
-      if (!(error instanceof VaultFlowClientError) || error.code !== "deposit_approval_required" || approvalId !== void 0) {
+      if (!(error instanceof VaultFlowClientError) || error.code !== "deposit_approval_required" || approvalId2 !== void 0) {
         throw error;
       }
-      approvalId = await this.findApprovedDepositApproval(input.amountRawUsdc);
-      if (approvalId === void 0) {
+      approvalId2 = await this.findApprovedDepositApproval(input.amountRawUsdc);
+      if (approvalId2 === void 0) {
         throw error;
       }
       prepared = await this.postJson("prepare", "/v1/deposits/prepare", {
         wallet: this.signer.walletAddress,
         amountRawUsdc: input.amountRawUsdc.toString(),
-        approvalId
+        approvalId: approvalId2
       });
     }
     const signed = await this.signer.signDeposit({
@@ -1480,9 +1480,13 @@ var relayerBaseUrl = process.env.SUBLY_RELAYER_URL ?? process.env.SUBLY_FACILITA
 var amountRawUsdc = process.argv[2];
 if (amountRawUsdc === void 0 || !/^[1-9]\d*$/.test(amountRawUsdc)) {
   fail(
-    "Usage: npm run demo:deposit -- <amountRawUsdc>  (positive integer, e.g. 60000000 = 60 USDC)"
+    "Usage: pay deposit <amountRawUsdc> [apr_<approvalId>]  (positive integer, e.g. 60000000 = 60 USDC)"
   );
 }
+var approvalId = process.argv[3];
+if (approvalId !== void 0 && !/^apr_[0-9a-f]+$/i.test(approvalId)) {
+  fail(`unrecognized argument: ${approvalId} (expected apr_<approvalId>)`);
+}
 var keyPairSigner = await loadKeyPairSigner({
   base58Secret: process.env.SUBLY_DEMO_AGENT_KEYPAIR,
   jsonFilePath: process.env.SUBLY_DEMO_AGENT_KEYPAIR_PATH,
@@ -1508,9 +1512,46 @@ console.log(
 );
 var submitted;
 try {
-  submitted = await vaultFlows.deposit({ amountRawUsdc: BigInt(amountRawUsdc) });
+  submitted = await vaultFlows.deposit({
+    amountRawUsdc: BigInt(amountRawUsdc),
+    ...approvalId === void 0 ? {} : { approvalId }
+  });
 } catch (error) {
   if (error instanceof VaultFlowClientError) {
+    if (error.code === "deposit_approval_required") {
+      const details = error.errorDetails ?? {};
+      process.stdout.write(
+        `${JSON.stringify(
+          {
+            ok: false,
+            approvalRequired: true,
+            approvalId: details.approvalId ?? null,
+            approveUrl: details.approveUrl ?? null,
+            expiresAtMs: details.expiresAtMs ?? null,
+            message: `This deposit needs the owner's approval. Paste approveUrl to the user; once they approve (Face ID / wallet sign), retry: pay deposit ${amountRawUsdc} ${details.approvalId ?? "<approvalId>"}`
+          },
+          null,
+          2
+        )}
+`
+      );
+      process.exit(1);
+    }
+    if (error.code === "mandate_required_for_deposit") {
+      process.stdout.write(
+        `${JSON.stringify(
+          {
+            ok: false,
+            setupRequired: true,
+            message: `Deposits require a registered owner. Create a setup link (pay setup-link --initial-deposit ${amountRawUsdc}), paste the setupUrl to the user, wait for their Face ID, then deposit again \u2014 the first deposit is pre-approved.`
+          },
+          null,
+          2
+        )}
+`
+      );
+      process.exit(1);
+    }
     fail(`[deposit] ${error.step} failed: ${error.message}`);
   }
   throw error;

package/dist/pay.js

@@ -1120,26 +1120,26 @@ var VaultFlowClient = class {
    * up and used automatically before surfacing deposit_approval_required.
    */
   async deposit(input) {
-    let approvalId = input.approvalId;
+    let approvalId2 = input.approvalId;
     let prepared;
     try {
       prepared = await this.postJson("prepare", "/v1/deposits/prepare", {
         wallet: this.signer.walletAddress,
         amountRawUsdc: input.amountRawUsdc.toString(),
-        ...approvalId === void 0 ? {} : { approvalId }
+        ...approvalId2 === void 0 ? {} : { approvalId: approvalId2 }
       });
     } catch (error) {
-      if (!(error instanceof VaultFlowClientError) || error.code !== "deposit_approval_required" || approvalId !== void 0) {
+      if (!(error instanceof VaultFlowClientError) || error.code !== "deposit_approval_required" || approvalId2 !== void 0) {
         throw error;
       }
-      approvalId = await this.findApprovedDepositApproval(input.amountRawUsdc);
-      if (approvalId === void 0) {
+      approvalId2 = await this.findApprovedDepositApproval(input.amountRawUsdc);
+      if (approvalId2 === void 0) {
         throw error;
       }
       prepared = await this.postJson("prepare", "/v1/deposits/prepare", {
         wallet: this.signer.walletAddress,
         amountRawUsdc: input.amountRawUsdc.toString(),
-        approvalId
+        approvalId: approvalId2
       });
     }
     const signed = await this.signer.signDeposit({
@@ -2251,9 +2251,20 @@ function fail(message) {
 }
 var url = process.argv[2];
 if (url === void 0 || !/^https?:\/\//.test(url)) {
-  fail("Usage: pay fetch <url> [maxAmountRawUsdc]");
+  fail("Usage: pay fetch <url> [maxAmountRawUsdc] [apr_<approvalId>]");
+}
+var maxAmountArg;
+var approvalId;
+for (const arg of process.argv.slice(3)) {
+  if (/^apr_[0-9a-f]+$/i.test(arg)) {
+    approvalId = arg;
+  } else if (/^\d+$/.test(arg)) {
+    maxAmountArg = arg;
+  } else {
+    fail(`unrecognized argument: ${arg}
+Usage: pay fetch <url> [maxAmountRawUsdc] [apr_<approvalId>]`);
+  }
 }
-var maxAmountArg = process.argv[3];
 var relayerBaseUrl = process.env.SUBLY_RELAYER_URL ?? process.env.SUBLY_FACILITATOR_URL ?? "https://api.demo.sublyfi.com";
 var rpcUrl = process.env.SOLANA_RPC_URL ?? "https://api.mainnet-beta.solana.com";
 var defaultMaxAmountRawUsdc = process.env.SUBLY_MCP_MAX_AMOUNT_RAW_USDC === void 0 ? 10000n : BigInt(process.env.SUBLY_MCP_MAX_AMOUNT_RAW_USDC);
@@ -2294,6 +2305,7 @@ try {
     ...method === void 0 ? {} : { method },
     ...body === void 0 ? {} : { body, headers: { "content-type": "application/json" } },
     ...maxAmountArg === void 0 ? {} : { maxAmountRawUsdc: BigInt(maxAmountArg) },
+    ...approvalId === void 0 ? {} : { approvalId },
     ...process.env.SUBLY_PAY_FORCE_NEW_PAYMENT === "1" ? { forceNewPayment: true } : {}
   });
   process.stdout.write(`${JSON.stringify(result, null, 2)}
@@ -2303,9 +2315,18 @@ try {
   }
 } catch (error) {
   if (error instanceof StandardX402PayError) {
+    const refusalApprovalId = error.reason === "approval_required" ? error.detail?.approvalId : void 0;
     process.stdout.write(
       `${JSON.stringify(
-        { paid: false, reason: error.reason, message: error.message },
+        {
+          paid: false,
+          reason: error.reason,
+          message: error.message,
+          detail: error.detail ?? null,
+          ...refusalApprovalId === void 0 ? {} : {
+            retry: `pay fetch "${url}"${maxAmountArg === void 0 ? "" : ` ${maxAmountArg}`} ${refusalApprovalId}`
+          }
+        },
         null,
         2
       )}