@t2000/cli 0.17.16 → 0.17.18

package/dist/index.js

@@ -324,14 +324,7 @@ function registerBalance(program2) {
         printKeyValue("Total", `${formatUsd2(bal.total)}`);
       }
       if (bal.pendingRewards > 0) {
-        try {
-          const pending = await agent.getPendingRewards();
-          if (pending.length > 0) {
-            const tokens = [...new Set(pending.map((r) => r.symbol))].join(", ");
-            printKeyValue("Rewards", `${pc3.yellow(tokens)}  ${pc3.dim("(claimable \u2014 run claim-rewards)")}`);
-          }
-        } catch {
-        }
+        printKeyValue("Rewards", `${pc3.yellow("claimable")}  ${pc3.dim("(run claim-rewards)")}`);
       }
       if (limits) {
         printBlank();
@@ -753,13 +746,13 @@ function registerPositions(program2) {
         printJson(result);
         return;
       }
-      let rewardsByProtocol = {};
+      let hasRewards = false;
+      const rewardsByKey = /* @__PURE__ */ new Map();
       try {
         const pending = await agent.getPendingRewards();
         for (const r of pending) {
-          const key = r.protocol;
-          if (!rewardsByProtocol[key]) rewardsByProtocol[key] = [];
-          if (!rewardsByProtocol[key].includes(r.symbol)) rewardsByProtocol[key].push(r.symbol);
+          rewardsByKey.set(`${r.protocol}:${r.asset}`, true);
+          hasRewards = true;
         }
       } catch {
       }
@@ -773,16 +766,15 @@ function registerPositions(program2) {
           printLine(pc6.bold("Savings"));
           printDivider();
           for (const pos of saves) {
-            const rewardTokens = rewardsByProtocol[pos.protocol];
-            const rewardSuffix = rewardTokens ? `  ${pc6.yellow(`+${rewardTokens.join(", ")}`)}` : "";
-            printKeyValue(pos.protocol, `${formatUsd8(pos.amount)} ${pos.asset} @ ${pos.apy.toFixed(2)}% APY${rewardSuffix}`);
+            const earning = rewardsByKey.has(`${pos.protocol}:${pos.asset}`) ? `  ${pc6.yellow("+rewards")}` : "";
+            printKeyValue(pos.protocol, `${formatUsd8(pos.amount)} ${pos.asset} @ ${pos.apy.toFixed(2)}% APY${earning}`);
           }
           const totalSaved = saves.reduce((s, p) => s + p.amount, 0);
           if (saves.length > 1) {
             printKeyValue("Total", formatUsd8(totalSaved));
           }
-          if (Object.keys(rewardsByProtocol).length > 0) {
-            printLine(`  ${pc6.dim("Run claim-rewards to collect reward tokens")}`);
+          if (hasRewards) {
+            printLine(`  ${pc6.dim("Run claim-rewards to collect and convert to USDC")}`);
           }
           printBlank();
         }
@@ -1898,7 +1890,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-3TGAP6PT.js");
+      mod = await import("./dist-F6YRISIO.js");
     } catch {
       console.error(
         "MCP server not installed. Run:\n  npm install -g @t2000/mcp"
@@ -2533,7 +2525,7 @@ function registerInvest(program2) {
 // src/commands/portfolio.ts
 import pc14 from "picocolors";
 import { T2000 as T200025, formatUsd as formatUsd16, formatAssetAmount as formatAssetAmount2 } from "@t2000/sdk";
-function printPositionLine(pos, rewardsByProtocol) {
+function printPositionLine(pos, rewardKeys) {
   if (pos.currentPrice === 0 && pos.totalAmount > 0) {
     printKeyValue(
       pos.asset,
@@ -2544,9 +2536,9 @@ function printPositionLine(pos, rewardsByProtocol) {
     const pnlSign = pos.unrealizedPnL >= 0 ? "+" : "";
     let yieldSuffix = "";
     if (pos.earning && pos.earningApy) {
-      const tokens = rewardsByProtocol?.[pos.earningProtocol ?? ""];
-      const rewardTag = tokens ? ` +${tokens.join(", ")}` : "";
-      yieldSuffix = `    ${pc14.cyan(`${pos.earningApy.toFixed(1)}% APY (${pos.earningProtocol})`)}${rewardTag ? pc14.yellow(rewardTag) : ""}`;
+      const hasRewards = rewardKeys?.has(`${pos.earningProtocol}:${pos.asset}`);
+      const rewardTag = hasRewards ? ` ${pc14.yellow("+rewards")}` : "";
+      yieldSuffix = `    ${pc14.cyan(`${pos.earningApy.toFixed(1)}% APY (${pos.earningProtocol})`)}${rewardTag}`;
     }
     printKeyValue(
       pos.asset,
@@ -2564,14 +2556,10 @@ function registerPortfolio(program2) {
         printJson(portfolio);
         return;
       }
-      let rewardsByProtocol = {};
+      const rewardKeys = /* @__PURE__ */ new Set();
       try {
         const pending = await agent.getPendingRewards();
-        for (const r of pending) {
-          const key = r.protocol;
-          if (!rewardsByProtocol[key]) rewardsByProtocol[key] = [];
-          if (!rewardsByProtocol[key].includes(r.symbol)) rewardsByProtocol[key].push(r.symbol);
-        }
+        for (const r of pending) rewardKeys.add(`${r.protocol}:${r.asset}`);
       } catch {
       }
       printBlank();
@@ -2594,7 +2582,7 @@ function registerPortfolio(program2) {
           printLine(`  ${pc14.bold(pc14.cyan(`\u25B8 ${stratLabel}`))}`);
           printSeparator();
           for (const pos of positions) {
-            printPositionLine(pos, rewardsByProtocol);
+            printPositionLine(pos, rewardKeys);
           }
           const stratValue = positions.reduce((s, p) => s + p.currentValue, 0);
           printLine(`  ${pc14.dim(`Subtotal: ${formatUsd16(stratValue)}`)}`);
@@ -2607,7 +2595,7 @@ function registerPortfolio(program2) {
         }
         printSeparator();
         for (const pos of portfolio.positions) {
-          printPositionLine(pos, rewardsByProtocol);
+          printPositionLine(pos, rewardKeys);
         }
         if (hasStrategyPositions) {
           const directValue = portfolio.positions.reduce((s, p) => s + p.currentValue, 0);
@@ -2638,9 +2626,9 @@ function registerPortfolio(program2) {
 
 // src/commands/claimRewards.ts
 import pc15 from "picocolors";
-import { T2000 as T200026 } from "@t2000/sdk";
+import { T2000 as T200026, formatUsd as formatUsd17 } from "@t2000/sdk";
 function registerClaimRewards(program2) {
-  program2.command("claim-rewards").description("Claim pending protocol rewards (vSUI, DEEP, SPRING_SUI)").option("--key <path>", "Key file path").action(async (opts) => {
+  program2.command("claim-rewards").description("Claim pending protocol rewards").option("--key <path>", "Key file path").action(async (opts) => {
     try {
       const pin = await resolvePin();
       const agent = await T200026.create({ pin, keyPath: opts.key });
@@ -2655,15 +2643,13 @@ function registerClaimRewards(program2) {
         printBlank();
         return;
       }
-      printLine(`  ${pc15.green("\u2713")} Claimed protocol rewards`);
+      const protocols = [...new Set(result.rewards.map((r) => r.protocol))];
+      printLine(`  ${pc15.green("\u2713")} Claimed and converted rewards to USDC`);
       printSeparator();
-      for (const reward of result.rewards) {
-        printKeyValue(
-          `${reward.symbol}`,
-          `${pc15.dim(`from ${reward.protocol}`)}`
-        );
+      if (result.usdcReceived > 0) {
+        printKeyValue("Received", `${pc15.green(formatUsd17(result.usdcReceived))} USDC`);
       }
-      printSeparator();
+      printKeyValue("Source", protocols.join(", "));
       if (result.tx) {
         printKeyValue("Tx", `https://suiscan.xyz/mainnet/tx/${result.tx}`);
       }