@t2000/cli 1.23.0 → 1.24.0

package/dist/{chunk-JKL4VB6Z.js → chunk-JDOIQPNR.js}

@@ -22466,35 +22466,6 @@ async function vt(e, n) {
   );
   return await De(e, t, n);
 }
-function wt(e) {
-  const n = /* @__PURE__ */ new Map();
-  e.forEach((r) => {
-    const t = r.assetId, a = r.option, s = `${t}-${a}-${r.rewardCoinType}-${r.market}`;
-    n.has(s) ? n.get(s).total += r.userClaimableReward : n.set(s, {
-      assetId: t,
-      rewardType: a,
-      coinType: r.rewardCoinType,
-      total: Number(r.userClaimableReward),
-      market: r.market
-    });
-  });
-  const o = /* @__PURE__ */ new Map();
-  for (const { assetId: r, rewardType: t, coinType: a, total: s, market: i } of n.values()) {
-    const c = `${r}-${t}-${i}`;
-    o.has(c) || o.set(c, { assetId: r, rewardType: t, market: i, rewards: /* @__PURE__ */ new Map() });
-    const u = o.get(c);
-    u.rewards.set(a, (u.rewards.get(a) || 0) + s);
-  }
-  return Array.from(o.values()).map((r) => ({
-    assetId: r.assetId,
-    rewardType: r.rewardType,
-    market: r.market,
-    rewards: Array.from(r.rewards.entries()).map(([t, a]) => ({
-      coinType: t,
-      available: a.toFixed(6)
-    }))
-  }));
-}
 async function Ct(e, n, o) {
   const r = await R({
     ...o,
@@ -22670,6 +22641,7 @@ async function Ct(e, n, o) {
   return a;
 }
 init_errors();
+init_token_registry();
 var MIN_HEALTH_FACTOR = 1.5;
 function sdkOptions(client) {
   return { env: "prod", client, cacheTime: 0, disableCache: true };
@@ -23044,24 +23016,8 @@ async function getPendingRewards(client, address) {
     );
   }
   if (!rewards || rewards.length === 0) return [];
-  const summary = wt(rewards);
-  const result = [];
-  for (const s of summary) {
-    for (const rw of s.rewards) {
-      const available = Number(rw.available);
-      if (available <= 0) continue;
-      const symbol = rw.coinType.split("::").pop() ?? "UNKNOWN";
-      result.push({
-        protocol: "navi",
-        asset: String(s.assetId),
-        coinType: rw.coinType,
-        symbol,
-        amount: available,
-        estimatedValueUsd: 0
-      });
-    }
-  }
-  return result;
+  const claimable = rewards.filter((r) => Number(r.userClaimableReward) > 0);
+  return aggregateClaimableRewards(claimable);
 }
 async function addClaimRewardsToTx(tx, client, address) {
   let rewards;
@@ -23111,7 +23067,8 @@ function aggregateClaimableRewards(claimable) {
   for (const c of claimable) {
     const coinType = c.rewardCoinType;
     if (!coinType) continue;
-    const symbol = coinType.split("::").pop() ?? "REWARD";
+    const meta = getCoinMeta(coinType);
+    const symbol = meta?.symbol ?? coinType.split("::").pop() ?? "REWARD";
     const amount = Number(c.userClaimableReward);
     if (!Number.isFinite(amount) || amount <= 0) continue;
     const existing = aggregated.get(coinType);
@@ -24830,6 +24787,181 @@ var T2000 = class _T2000 extends import_index.default {
 };
 init_errors();
 init_coinSelection();
+init_errors();
+init_token_registry();
+init_cetus_swap();
+async function addHarvestToTx(tx, client, address, options = {}) {
+  const slippage = options.slippage ?? 0.01;
+  const minRewardUsd = options.minRewardUsd ?? 0.01;
+  const priceCache = options.priceCache;
+  let rawRewards;
+  try {
+    rawRewards = await vt(address, {
+      env: "prod",
+      client,
+      markets: ["main"]
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new T2000Error(
+      "PROTOCOL_UNAVAILABLE",
+      `NAVI rewards lookup failed: ${msg}`,
+      { source: "navi-harvest-read" },
+      true
+    );
+  }
+  const claimable = (rawRewards ?? []).filter((r) => Number(r.userClaimableReward) > 0);
+  if (claimable.length === 0) {
+    throw new T2000Error(
+      "INVALID_AMOUNT",
+      "No pending rewards to harvest.",
+      { source: "navi-harvest" }
+    );
+  }
+  const aggregated = aggregateClaimableRewards(claimable);
+  let claimed;
+  try {
+    const claimResult = await Ct(tx, claimable, {
+      env: "prod",
+      // 'skip' = NAVI doesn't auto-transfer; coin handles stay in the PTB
+      // for downstream consumption. Verified against NAVI lending source
+      // (index.esm.js@1828–1911) — when type !== 'transfer' && type !==
+      // 'depositNAVI', the `else` branch pushes `{ coin, identifier, ... }`
+      // to the return without consuming the handle.
+      customCoinReceive: { type: "skip" }
+    });
+    const grouped = /* @__PURE__ */ new Map();
+    for (const c of claimResult) {
+      const ct2 = c.identifier.suiCoinType ?? "";
+      if (!ct2) continue;
+      const list = grouped.get(ct2) ?? [];
+      list.push(c.coin);
+      grouped.set(ct2, list);
+    }
+    claimed = [];
+    for (const [coinType, handles] of grouped.entries()) {
+      if (handles.length === 1) {
+        claimed.push({ coin: handles[0], coinType });
+      } else {
+        const [dest, ...rest] = handles;
+        tx.mergeCoins(dest, rest);
+        claimed.push({ coin: dest, coinType });
+      }
+    }
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new T2000Error(
+      "PROTOCOL_UNAVAILABLE",
+      `NAVI claim PTB build failed: ${msg}`,
+      { source: "navi-harvest-claim-ptb" },
+      true
+    );
+  }
+  const usdcHandles = [];
+  const swaps = [];
+  const skipped = [];
+  let expectedUsdcDeposited = 0;
+  for (const { coin, coinType } of claimed) {
+    const aggRow = aggregated.find((r) => r.coinType === coinType);
+    if (!aggRow) {
+      continue;
+    }
+    if (coinType === USDC_TYPE) {
+      usdcHandles.push(coin);
+      expectedUsdcDeposited += aggRow.amount;
+      continue;
+    }
+    const meta = getCoinMeta(coinType);
+    const isTradeable = meta && (meta.tier === 1 || meta.tier === 2);
+    if (!isTradeable) {
+      tx.transferObjects([coin], address);
+      skipped.push({
+        symbol: aggRow.symbol,
+        coinType,
+        amount: aggRow.amount,
+        reason: "untradeable"
+      });
+      continue;
+    }
+    if (priceCache && minRewardUsd > 0) {
+      const px = priceCache.get(aggRow.symbol.toUpperCase());
+      if (px && px > 0 && aggRow.amount * px < minRewardUsd) {
+        tx.transferObjects([coin], address);
+        skipped.push({
+          symbol: aggRow.symbol,
+          coinType,
+          amount: aggRow.amount,
+          reason: "dust"
+        });
+        continue;
+      }
+    }
+    try {
+      const swapResult = await addSwapToTx(tx, client, address, {
+        from: aggRow.symbol,
+        to: "USDC",
+        amount: aggRow.amount,
+        slippage,
+        inputCoin: coin,
+        providers: options.providers
+      });
+      usdcHandles.push(swapResult.coin);
+      expectedUsdcDeposited += swapResult.expectedAmountOut;
+      swaps.push({
+        fromSymbol: aggRow.symbol,
+        fromCoinType: coinType,
+        toSymbol: "USDC",
+        inputAmount: swapResult.effectiveAmountIn,
+        expectedOutputUsdc: swapResult.expectedAmountOut
+      });
+    } catch (err) {
+      const code = err instanceof T2000Error ? err.code : "UNKNOWN";
+      if (code !== "SWAP_NO_ROUTE" && code !== "SWAP_FAILED") {
+        throw err;
+      }
+      tx.transferObjects([coin], address);
+      skipped.push({
+        symbol: aggRow.symbol,
+        coinType,
+        amount: aggRow.amount,
+        reason: "no-route"
+      });
+    }
+  }
+  if (usdcHandles.length > 0) {
+    let depositCoin;
+    if (usdcHandles.length === 1) {
+      depositCoin = usdcHandles[0];
+    } else {
+      const [primary, ...rest] = usdcHandles;
+      tx.mergeCoins(primary, rest);
+      depositCoin = primary;
+    }
+    try {
+      await addSaveToTx(tx, client, address, depositCoin, { asset: "USDC" });
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      throw new T2000Error(
+        "PROTOCOL_UNAVAILABLE",
+        `NAVI deposit failed during harvest: ${msg}`,
+        { source: "navi-harvest-deposit" },
+        true
+      );
+    }
+  }
+  return {
+    claimed: aggregated,
+    swaps,
+    skipped,
+    expectedUsdcDeposited
+  };
+}
+async function buildHarvestRewardsTx(client, address, options = {}) {
+  const tx = new Transaction();
+  tx.setSender(address);
+  const plan = await addHarvestToTx(tx, client, address, options);
+  return { tx, plan };
+}
 init_cetus_swap();
 init_volo();
 init_coinSelection();
@@ -25029,6 +25161,29 @@ var WRITE_APPENDER_REGISTRY = {
     const rewards = await addClaimRewardsToTx(tx, ctx.client, ctx.sender);
     return { preview: { toolName: "claim_rewards", rewards } };
   },
+  // [Track B / 2026-05-08] Macro appender — assembles claim → swap(s) →
+  // save inline. The audric host wires `getSponsoredSwapProviders()` into
+  // `options.providers` automatically when `ctx.sponsoredContext === true`
+  // (parity with `swap_execute` below). Slippage + dust-floor pulled from
+  // the input; price cache is forwarded from the host so the dust filter
+  // can compare claimed amounts to USD.
+  harvest_rewards: async (tx, input, ctx) => {
+    const providers = ctx.sponsoredContext ? await getSponsoredSwapProviders() : void 0;
+    const plan = await addHarvestToTx(tx, ctx.client, ctx.sender, {
+      slippage: input.slippage,
+      minRewardUsd: input.minRewardUsd,
+      providers
+    });
+    return {
+      preview: {
+        toolName: "harvest_rewards",
+        claimed: plan.claimed,
+        swaps: plan.swaps,
+        skipped: plan.skipped,
+        expectedUsdcDeposited: plan.expectedUsdcDeposited
+      }
+    };
+  },
   volo_stake: async (tx, input, ctx) => {
     if (input.amountSui <= 0) {
       throw new T2000Error("INVALID_AMOUNT", "Stake amount must be greater than zero");
@@ -25529,7 +25684,9 @@ export {
   extractTxCommands,
   getRates,
   getPendingRewards,
+  addClaimRewardsToTx,
   buildClaimRewardsTx,
+  aggregateClaimableRewards,
   ProtocolRegistry,
   naviDescriptor,
   allDescriptors,
@@ -25540,6 +25697,7 @@ export {
   SafeguardEnforcer,
   ContactManager,
   T2000,
+  buildHarvestRewardsTx,
   WRITE_APPENDER_REGISTRY,
   deriveAllowedAddressesFromPtb,
   composeTx,
@@ -25582,4 +25740,4 @@ axios/dist/node/axios.cjs:
 @scure/bip39/index.js:
   (*! scure-bip39 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-JKL4VB6Z.js.map
+//# sourceMappingURL=chunk-JDOIQPNR.js.map