@t2000/cli 10.27.0 → 10.27.2

package/dist/index.js

@@ -30191,11 +30191,21 @@ var T2000 = class _T2000 extends import_index2.default {
     const rawAmount = BigInt(Math.floor(params.amount * 10 ** fromDecimals));
     let route;
     if (params.serializedRoute) {
-      const s = params.serializedRoute;
+      let s = params.serializedRoute;
+      const nested = s.serializedRoute;
+      if (nested && typeof nested === "object" && typeof nested.fromCoinType === "string" && nested.routerData) {
+        s = nested;
+      }
+      if (typeof s.fromCoinType !== "string" || typeof s.toCoinType !== "string") {
+        throw new T2000Error(
+          "SWAP_ROUTE_MISMATCH",
+          "serializedRoute is not the object t2000 quoted \u2014 it is missing fromCoinType/toCoinType. Pass quote.serializedRoute exactly as the quote returned it (not the whole quote response), or omit serializedRoute to discover a fresh route."
+        );
+      }
       if (!verifyCetusRouteCoinMatch2(s, { fromCoinType: fromType, toCoinType: toType })) {
         throw new T2000Error(
           "SWAP_ROUTE_MISMATCH",
-          `The quoted route is for ${s.fromCoinType} -> ${s.toCoinType}, not ${params.from} -> ${params.to}. Re-quote and pass the new serializedRoute.`
+          `The quoted route is for ${s.fromCoinType} -> ${s.toCoinType}, not ${fromType} -> ${toType}. Re-quote and pass the new serializedRoute.`
         );
       }
       if (s.byAmountIn !== byAmountIn || BigInt(s.amountIn) !== rawAmount) {
@@ -30545,6 +30555,8 @@ var A2A_ESCROW_FEE_CONFIG_VERSION = Number(
 );
 var MODULE2 = "escrow";
 var MAX_JOB_USDC = 50;
+var MAX_REVIEW_WINDOW_MS = 2592e6;
+var MAX_DELIVER_HORIZON_MS = 31536e6;
 var JOB_STATES = [
   "funded",
   "delivered",
@@ -30552,12 +30564,57 @@ var JOB_STATES = [
   "refunded",
   "rejected"
 ];
+function hexToBytes3(hex) {
+  const clean4 = hex.startsWith("0x") ? hex.slice(2) : hex;
+  if (clean4.length === 0 || clean4.length % 2 !== 0 || /[^0-9a-fA-F]/.test(clean4)) {
+    throw new T2000Error(
+      "INVALID_AMOUNT",
+      `Expected a hex hash (0x\u2026), got "${hex.slice(0, 32)}"`
+    );
+  }
+  const out = [];
+  for (let i = 0; i < clean4.length; i += 2) {
+    out.push(Number.parseInt(clean4.slice(i, i + 2), 16));
+  }
+  return out;
+}
 function bytesToHex3(bytes) {
   const arr = typeof bytes === "string" ? Array.from(atob(bytes), (c) => c.charCodeAt(0)) : bytes;
   let s = "0x";
   for (const b of arr) s += b.toString(16).padStart(2, "0");
   return s;
 }
+function preflightCreateJob(terms) {
+  const addressCheck = checkSuiAddress(terms.seller);
+  if (!addressCheck.valid) return addressCheck;
+  if (!Number.isFinite(terms.amountUsdc) || terms.amountUsdc <= 0) {
+    return preflightFail("INVALID_AMOUNT", `Amount must be positive. Got ${terms.amountUsdc}.`);
+  }
+  if (terms.amountUsdc > MAX_JOB_USDC) {
+    return preflightFail(
+      "INVALID_AMOUNT",
+      `v1 caps escrow jobs at ${MAX_JOB_USDC} USDC (no-arbitration split only stays fair at small sizes). Got ${terms.amountUsdc}.`
+    );
+  }
+  if (terms.deliverByMs <= Date.now()) {
+    return preflightFail("INVALID_AMOUNT", "deliverByMs must be in the future.");
+  }
+  if (terms.deliverByMs > Date.now() + MAX_DELIVER_HORIZON_MS) {
+    return preflightFail("INVALID_AMOUNT", "deliverByMs is more than 365 days out.");
+  }
+  if (terms.reviewWindowMs < 0 || terms.reviewWindowMs > MAX_REVIEW_WINDOW_MS) {
+    return preflightFail("INVALID_AMOUNT", "reviewWindowMs must be 0\u201330 days.");
+  }
+  if (!Number.isInteger(terms.rejectSplitBps) || terms.rejectSplitBps < 0 || terms.rejectSplitBps > 1e4) {
+    return preflightFail("INVALID_AMOUNT", "rejectSplitBps must be an integer 0\u201310000.");
+  }
+  try {
+    hexToBytes3(terms.specHash);
+  } catch (e) {
+    return preflightFail("INVALID_AMOUNT", e.message);
+  }
+  return PREFLIGHT_OK;
+}
 async function getJob(client, jobId) {
   const resp = await client.core.getObject({ objectId: jobId, include: { json: true } }).catch((e) => {
     throw new T2000Error(
@@ -35874,6 +35931,40 @@ function recordSpendIfLanded(amountUsdc, digest) {
   }
 }
 
+// src/lib/settle-fee.ts
+var SERVICES_SETTLE_FEE_BPS = 500;
+var MICRO = 1e6;
+var TRAILING_ZEROS = /0+$/;
+function formatUsdMicro(micro) {
+  if (!Number.isFinite(micro) || micro < 0) {
+    return "\u2014";
+  }
+  const m = Math.floor(micro);
+  const whole = Math.floor(m / MICRO);
+  const frac = String(m % MICRO).padStart(6, "0");
+  const dp = Math.max(2, frac.replace(TRAILING_ZEROS, "").length);
+  return `$${whole}.${frac.slice(0, dp)}`;
+}
+function settlementSplit(priceUsdc, feeBps = SERVICES_SETTLE_FEE_BPS) {
+  const escrowMicro = Math.floor(priceUsdc * MICRO);
+  const feeMicro = Math.floor(escrowMicro * feeBps / 1e4);
+  const payoutMicro = escrowMicro - feeMicro;
+  return {
+    escrowUsdc: priceUsdc,
+    feeBps,
+    feeMicro,
+    payoutMicro,
+    escrow: formatUsdMicro(escrowMicro),
+    fee: formatUsdMicro(feeMicro),
+    payout: formatUsdMicro(payoutMicro)
+  };
+}
+function sellerReceivesLine(priceUsdc) {
+  const s = settlementSplit(priceUsdc);
+  return `${s.payout} after the ${s.feeBps / 100}% settle fee (${s.fee})`;
+}
+var SETTLE_FEE_NOTE = `Services settle at ${SERVICES_SETTLE_FEE_BPS / 100}% from the seller's payout \u2014 never added to the buyer's escrow. Refunds, cancels and declines are fee-free.`;
+
 // src/lib/agent-ref.ts
 var HASH_ID_RE = /^#\d{1,10}$/;
 var BARE_DIGITS_RE = /^\d{1,10}$/;
@@ -36343,6 +36434,36 @@ no fund step; unclaimed openings refund fee-free):
           reviewWindowMs = opts.review ? parseDuration(opts.review) : DEFAULT_REVIEW_WINDOW_MS;
           rejectSplitBps = Number.parseInt(opts.split, 10);
         }
+        const pre = preflightCreateJob({
+          seller,
+          amountUsdc,
+          specHash,
+          deliverByMs,
+          reviewWindowMs,
+          rejectSplitBps
+        });
+        if (!pre.valid) {
+          throw new Error(pre.error);
+        }
+        const preAgent = await withAgent({ keyPath: opts.key });
+        const bal = await preAgent.balance();
+        const usdc = bal.stables.USDC ?? 0;
+        if (usdc < amountUsdc) {
+          throw new Error(
+            `Insufficient USDC \u2014 need ${formatUsdMicro(Math.floor(amountUsdc * 1e6))}, wallet has ${formatUsdMicro(Math.floor(usdc * 1e6))}. Fund it: t2 fund`
+          );
+        }
+        assertSpendAllowed(amountUsdc);
+        const split4 = settlementSplit(amountUsdc);
+        if (!isJsonMode()) {
+          printBlank();
+          printInfo("Hire preflight");
+          printKeyValue("  Escrow", `${split4.escrow} USDC (leaves your wallet on sign)`);
+          printKeyValue("  Seller", truncateAddress(seller));
+          if (serviceSlug) printKeyValue("  Service", serviceSlug);
+          printKeyValue("  Deliver by", new Date(deliverByMs).toISOString());
+          printKeyValue("  Settle fee", `${split4.fee} from the seller's payout \u2014 not added to your escrow`);
+        }
         const { address, digest } = await sponsoredJobVerb({
           base,
           keyPath: opts.key,
@@ -36368,7 +36489,7 @@ no fund step; unclaimed openings refund fee-free):
           }
         }
         if (isJsonMode()) {
-          printJson({ jobId, digest, buyer: address, seller, amountUsdc, specHash, deliverByMs, reviewWindowMs, rejectSplitBps, ...serviceSlug ? { service: serviceSlug } : {} });
+          printJson({ jobId, digest, buyer: address, seller, amountUsdc, specHash, deliverByMs, reviewWindowMs, rejectSplitBps, feeBps: split4.feeBps, sellerReceiveUsdc: split4.payoutMicro / 1e6, ...serviceSlug ? { service: serviceSlug } : {} });
           return;
         }
         printBlank();
@@ -36376,6 +36497,7 @@ no fund step; unclaimed openings refund fee-free):
         if (jobId) printKeyValue("Job", jobId);
         printKeyValue("Spec hash", specHash);
         printKeyValue("Deliver by", new Date(deliverByMs).toISOString());
+        printKeyValue("Seller receives", sellerReceivesLine(amountUsdc));
         if (digest) printKeyValue("Tx", digest);
         printBlank();
         if (jobId) {
@@ -36675,8 +36797,8 @@ no fund step; unclaimed openings refund fee-free):
 }
 
 // src/commands/service.ts
-var import_picocolors14 = __toESM(require_picocolors(), 1);
 import { createHash as createHash2 } from "crypto";
+var import_picocolors14 = __toESM(require_picocolors(), 1);
 import { readFile as readFile5 } from "fs/promises";
 var DEFAULT_API_BASE8 = process.env.T2000_API_URL ?? "https://api.t2000.ai/v1";
 async function signedServiceAction(opts) {
@@ -36733,7 +36855,10 @@ function formatSla(minutes) {
 function printService(o) {
   const flag = o.retired ? import_picocolors14.default.dim(" (retired)") : "";
   printLine(`${import_picocolors14.default.bold(o.name)} ${import_picocolors14.default.dim(`\xB7 ${o.slug}`)}${flag}`);
-  printKeyValue("Price", `$${o.priceUsdc.toFixed(2)} USDC`);
+  printKeyValue(
+    "Price",
+    `$${o.priceUsdc.toFixed(2)} USDC ${import_picocolors14.default.dim(`\xB7 seller receives ${settlementSplit(o.priceUsdc).payout}`)}`
+  );
   printKeyValue("Delivery", `within ${formatSla(o.slaMinutes)}`);
   printKeyValue(
     "Seller",
@@ -36813,15 +36938,22 @@ Examples:
           payload
         });
         if (isJsonMode()) {
-          printJson({ address, ...payload });
+          printJson({
+            address,
+            ...payload,
+            feeBps: SERVICES_SETTLE_FEE_BPS,
+            sellerReceiveUsdc: settlementSplit(priceUsdc).payoutMicro / 1e6
+          });
           return;
         }
         printBlank();
         printSuccess(`"${payload.name}" is listed \u2014 $${priceUsdc.toFixed(2)} USDC, delivery within ${formatSla(slaMinutes)}`);
+        printKeyValue("You receive", sellerReceivesLine(priceUsdc));
         printKeyValue("Slug", slug);
         printKeyValue("Storefront", `https://t2000.ai/${address}`);
         printKeyValue("Buyers run", `t2 job hire --agent ${address} --service ${slug}`);
         printBlank();
+        printInfo(SETTLE_FEE_NOTE);
         printInfo("Watch for incoming jobs with: t2 job watch --mine");
         printBlank();
       } catch (error) {