@t2000/cli 0.20.44 → 0.21.1

package/dist/index.js

@@ -1453,67 +1453,51 @@ function isRetryable(code) {
 // src/commands/pay.ts
 import pc9 from "picocolors";
 import { T2000 as T200019 } from "@t2000/sdk";
-import { x402Client } from "@t2000/x402";
-function createX402Wallet(agent) {
-  return {
-    client: agent.suiClient,
-    keypair: agent.signer,
-    address: () => agent.address(),
-    signAndExecute: async (tx) => {
-      const result = await agent.suiClient.signAndExecuteTransaction({
-        signer: agent.signer,
-        transaction: tx
-      });
-      return { digest: result.digest };
-    }
-  };
-}
 function registerPay(program2) {
-  program2.command("pay <url>").description("Pay for an x402-protected API resource").option("--key <path>", "Key file path").option("--method <method>", "HTTP method (GET, POST, PUT)", "GET").option("--data <json>", "Request body for POST/PUT").option("--header <key=value>", "Additional HTTP header (repeatable)", collectHeaders, {}).option("--max-price <amount>", "Max USDC price to auto-approve", "1.00").option("--timeout <seconds>", "Request timeout in seconds", "30").option("--dry-run", "Show what would be paid without paying").action(async (url, opts) => {
+  program2.command("pay <url>").description("Pay for an MPP-protected API resource").option("--key <path>", "Key file path").option("--method <method>", "HTTP method (GET, POST, PUT)", "GET").option("--data <json>", "Request body for POST/PUT").option("--header <key=value>", "Additional HTTP header (repeatable)", collectHeaders, {}).option("--max-price <amount>", "Max USDC price to auto-approve", "1.00").action(async (url, opts) => {
     try {
       const pin = await resolvePin();
       const agent = await T200019.create({ pin, keyPath: opts.key });
-      agent.enforcer.check({ operation: "pay", amount: parseFloat(opts.maxPrice) });
-      const wallet = createX402Wallet(agent);
-      const client = new x402Client(wallet);
       const startTime = Date.now();
+      const method = opts.data && opts.method === "GET" ? "POST" : opts.method;
       if (!isJsonMode()) {
         printBlank();
-        printInfo(`\u2192 ${opts.method} ${url}`);
+        printInfo(`\u2192 ${method} ${url}`);
       }
-      const response = await client.fetch(url, {
-        method: opts.method,
+      const maxPrice = parseFloat(opts.maxPrice);
+      if (isNaN(maxPrice) || maxPrice <= 0) {
+        throw new Error(`Invalid --max-price: "${opts.maxPrice}". Must be a positive number.`);
+      }
+      const result = await agent.pay({
+        url,
+        method,
         headers: opts.header,
         body: opts.data,
-        maxPrice: parseFloat(opts.maxPrice),
-        timeout: parseInt(opts.timeout, 10) * 1e3,
-        dryRun: opts.dryRun,
-        onPayment: (details) => {
-          if (!isJsonMode()) {
-            printInfo(`\u2190 402 Payment Required: $${details.amount} USDC (Sui)`);
-            printSuccess(`Paid $${details.amount} USDC (tx: ${details.txHash.slice(0, 10)}...)`);
-          }
-        }
+        maxPrice
       });
       const elapsed = Date.now() - startTime;
       if (!isJsonMode()) {
-        printInfo(`\u2190 ${response.status} ${response.statusText || "OK"}  ${pc9.dim(`[${elapsed}ms]`)}`);
+        if (result.paid && result.receipt) {
+          printSuccess(`Paid via MPP (tx: ${result.receipt.reference.slice(0, 10)}...)`);
+        }
+        printInfo(`\u2190 ${result.status} OK  ${pc9.dim(`[${elapsed}ms]`)}`);
       }
-      const contentType = response.headers.get("content-type") ?? "";
-      const body = contentType.includes("application/json") ? await response.json() : await response.text();
       if (isJsonMode()) {
         printJson({
-          status: response.status,
+          status: result.status,
           url,
           elapsed,
-          body
+          paid: result.paid,
+          cost: result.cost,
+          receipt: result.receipt,
+          body: result.body
         });
       } else {
         printBlank();
-        if (typeof body === "string") {
-          console.log(body);
+        if (typeof result.body === "string") {
+          console.log(result.body);
         } else {
-          console.log(JSON.stringify(body, null, 2));
+          console.log(JSON.stringify(result.body, null, 2));
         }
         printBlank();
       }
@@ -2053,7 +2037,7 @@ function registerMcp(program2) {
   mcp.command("start", { isDefault: true }).description("Start MCP server (stdio transport)").option("--key <path>", "Key file path").action(async (opts) => {
     let mod;
     try {
-      mod = await import("./dist-B43ZP5VT.js");
+      mod = await import("./dist-7OOZ6NXP.js");
     } catch {
       console.error(
         "MCP server not installed. Run:\n  npm install -g @t2000/mcp"