@t2000/cli 0.20.10 → 0.20.11

package/dist/index.js

@@ -378,11 +378,11 @@ function registerBalance(program2) {
         const positions = await agent.positions();
         const saves = positions.positions.filter((p) => p.type === "save");
         const borrows = positions.positions.filter((p) => p.type === "borrow");
-        const weightedApy = saves.length > 0 ? saves.reduce((sum, p) => sum + p.amount * p.apy, 0) / saves.reduce((sum, p) => sum + p.amount, 0) : 0;
+        const weightedApy = saves.length > 0 ? saves.reduce((sum, p) => sum + (p.amountUsd ?? p.amount) * p.apy, 0) / saves.reduce((sum, p) => sum + (p.amountUsd ?? p.amount), 0) : 0;
         const dailyEarning = bal.savings * (weightedApy / 100) / 365;
         printKeyValue("Savings", `${formatUsd2(bal.savings)}  ${pc3.dim(`(earning ${weightedApy.toFixed(2)}% APY)`)}`);
         if (bal.debt > 0.01) {
-          const borrowApy = borrows.length > 0 ? borrows.reduce((sum, p) => sum + p.amount * p.apy, 0) / borrows.reduce((sum, p) => sum + p.amount, 0) : 0;
+          const borrowApy = borrows.length > 0 ? borrows.reduce((sum, p) => sum + (p.amountUsd ?? p.amount) * p.apy, 0) / borrows.reduce((sum, p) => sum + (p.amountUsd ?? p.amount), 0) : 0;
           printKeyValue("Credit", `${pc3.red(`-${formatUsd2(bal.debt)}`)}  ${pc3.dim(`(${borrowApy.toFixed(2)}% APY)`)}`);
         }
         if (bal.investment > 0.01) {
@@ -843,7 +843,7 @@ function registerRates(program2) {
 
 // src/commands/positions.ts
 import pc6 from "picocolors";
-import { T2000 as T200015, formatUsd as formatUsd8 } from "@t2000/sdk";
+import { T2000 as T200015, formatUsd as formatUsd8, formatAssetAmount } from "@t2000/sdk";
 function registerPositions(program2) {
   program2.command("positions").description("Show savings & borrow positions across all protocols and assets").option("--key <path>", "Key file path").action(async (opts) => {
     try {
@@ -875,9 +875,10 @@ function registerPositions(program2) {
           printDivider();
           for (const pos of saves) {
             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 usd = formatUsd8(pos.amountUsd ?? pos.amount);
+            printKeyValue(pos.protocol, `${formatAssetAmount(pos.amount, pos.asset)} ${pos.asset} (${usd}) @ ${pos.apy.toFixed(2)}% APY${earning}`);
           }
-          const totalSaved = saves.reduce((s, p) => s + p.amount, 0);
+          const totalSaved = saves.reduce((s, p) => s + (p.amountUsd ?? p.amount), 0);
           if (saves.length > 1) {
             printKeyValue("Total", formatUsd8(totalSaved));
           }
@@ -890,9 +891,10 @@ function registerPositions(program2) {
           printLine(pc6.bold("Borrows"));
           printDivider();
           for (const pos of borrows) {
-            printKeyValue(pos.protocol, `${formatUsd8(pos.amount)} ${pos.asset} @ ${pos.apy.toFixed(2)}% APY`);
+            const usd = formatUsd8(pos.amountUsd ?? pos.amount);
+            printKeyValue(pos.protocol, `${formatAssetAmount(pos.amount, pos.asset)} ${pos.asset} (${usd}) @ ${pos.apy.toFixed(2)}% APY`);
           }
-          const totalBorrowed = borrows.reduce((s, p) => s + p.amount, 0);
+          const totalBorrowed = borrows.reduce((s, p) => s + (p.amountUsd ?? p.amount), 0);
           if (borrows.length > 1) {
             printKeyValue("Total", formatUsd8(totalBorrowed));
           }
@@ -907,7 +909,7 @@ function registerPositions(program2) {
 
 // src/commands/earnings.ts
 import pc7 from "picocolors";
-import { T2000 as T200016, formatUsd as formatUsd9 } from "@t2000/sdk";
+import { T2000 as T200016, formatUsd as formatUsd9, formatAssetAmount as formatAssetAmount2 } from "@t2000/sdk";
 function registerEarnings(program2) {
   program2.command("earnings").description("Show yield earned to date").option("--key <path>", "Key file path").action(async (opts) => {
     try {
@@ -924,7 +926,7 @@ function registerEarnings(program2) {
       printKeyValue("Total Saved", formatUsd9(result.supplied));
       if (savePositions.length > 0) {
         for (const p of savePositions) {
-          printLine(`  ${pc7.dim("\u2022")} ${formatUsd9(p.amount)} ${p.asset} on ${p.protocol} @ ${p.apy.toFixed(2)}% APY`);
+          printLine(`  ${pc7.dim("\u2022")} ${formatAssetAmount2(p.amount, p.asset)} ${p.asset} (${formatUsd9(p.amountUsd ?? p.amount)}) on ${p.protocol} @ ${p.apy.toFixed(2)}% APY`);
         }
       }
       printKeyValue("Blended APY", `${result.currentApy.toFixed(2)}%`);
@@ -939,7 +941,7 @@ function registerEarnings(program2) {
 
 // src/commands/fundStatus.ts
 import pc8 from "picocolors";
-import { T2000 as T200017, formatUsd as formatUsd10 } from "@t2000/sdk";
+import { T2000 as T200017, formatUsd as formatUsd10, formatAssetAmount as formatAssetAmount3 } from "@t2000/sdk";
 function registerFundStatus(program2) {
   program2.command("fund-status").description("Full savings summary").option("--key <path>", "Key file path").action(async (opts) => {
     try {
@@ -962,7 +964,7 @@ function registerFundStatus(program2) {
       printKeyValue("Total Saved", formatUsd10(result.supplied));
       if (savePositions.length > 0) {
         for (const p of savePositions) {
-          printLine(`  ${pc8.dim("\u2022")} ${formatUsd10(p.amount)} ${p.asset} on ${p.protocol} @ ${p.apy.toFixed(2)}% APY`);
+          printLine(`  ${pc8.dim("\u2022")} ${formatAssetAmount3(p.amount, p.asset)} ${p.asset} (${formatUsd10(p.amountUsd ?? p.amount)}) on ${p.protocol} @ ${p.apy.toFixed(2)}% APY`);
         }
       }
       printKeyValue("Blended APY", `${result.apy.toFixed(2)}%`);
@@ -2202,7 +2204,7 @@ function registerContacts(program2) {
 
 // src/commands/invest.ts
 import pc13 from "picocolors";
-import { T2000 as T200024, formatUsd as formatUsd15, formatAssetAmount, INVESTMENT_ASSETS as INVESTMENT_ASSETS2 } from "@t2000/sdk";
+import { T2000 as T200024, formatUsd as formatUsd15, formatAssetAmount as formatAssetAmount4, INVESTMENT_ASSETS as INVESTMENT_ASSETS2 } from "@t2000/sdk";
 function registerInvest(program2) {
   const investCmd = program2.command("invest").description("Buy or sell investment assets");
   investCmd.command("buy <amount> <asset>").description("Invest USD amount in an asset").option("--key <path>", "Key file path").option("--slippage <pct>", "Max slippage percent", "3").action(async (amount, asset, opts) => {
@@ -2226,9 +2228,9 @@ function registerInvest(program2) {
       }
       printBlank();
       const sym = asset.toUpperCase();
-      printSuccess(`Bought ${formatAssetAmount(result.amount, sym)} ${sym} at ${formatUsd15(result.price)}`);
+      printSuccess(`Bought ${formatAssetAmount4(result.amount, sym)} ${sym} at ${formatUsd15(result.price)}`);
       printKeyValue("Invested", formatUsd15(result.usdValue));
-      printKeyValue("Portfolio", `${formatAssetAmount(result.position.totalAmount, sym)} ${sym} (avg ${formatUsd15(result.position.avgPrice)})`);
+      printKeyValue("Portfolio", `${formatAssetAmount4(result.position.totalAmount, sym)} ${sym} (avg ${formatUsd15(result.position.avgPrice)})`);
       printKeyValue("Tx", explorerUrl(result.tx));
       printBlank();
     } catch (error) {
@@ -2260,7 +2262,7 @@ function registerInvest(program2) {
       }
       printBlank();
       const sym = asset.toUpperCase();
-      printSuccess(`Sold ${formatAssetAmount(result.amount, sym)} ${sym} at ${formatUsd15(result.price)}`);
+      printSuccess(`Sold ${formatAssetAmount4(result.amount, sym)} ${sym} at ${formatUsd15(result.price)}`);
       printKeyValue("Proceeds", formatUsd15(result.usdValue));
       if (result.realizedPnL !== void 0) {
         const pnlColor = result.realizedPnL >= 0 ? pc13.green : pc13.red;
@@ -2268,7 +2270,7 @@ function registerInvest(program2) {
         printKeyValue("Realized P&L", pnlColor(`${pnlSign}${formatUsd15(result.realizedPnL)}`));
       }
       if (result.position.totalAmount > 0) {
-        printKeyValue("Remaining", `${formatAssetAmount(result.position.totalAmount, sym)} ${sym} (avg ${formatUsd15(result.position.avgPrice)})`);
+        printKeyValue("Remaining", `${formatAssetAmount4(result.position.totalAmount, sym)} ${sym} (avg ${formatUsd15(result.position.avgPrice)})`);
       }
       printKeyValue("Tx", explorerUrl(result.tx));
       printBlank();
@@ -2294,7 +2296,7 @@ function registerInvest(program2) {
         printSuccess(`${sym} is already fully earning via ${result.protocol} (${result.apy.toFixed(1)}% APY)`);
       } else {
         printSuccess(`${sym} deposited into ${result.protocol} (${result.apy.toFixed(1)}% APY)`);
-        printKeyValue("Amount", `${formatAssetAmount(result.amount, sym)} ${sym}`);
+        printKeyValue("Amount", `${formatAssetAmount4(result.amount, sym)} ${sym}`);
         printKeyValue("Protocol", result.protocol);
         printKeyValue("APY", `${result.apy.toFixed(2)}%`);
         printKeyValue("Tx", explorerUrl(result.tx));
@@ -2317,7 +2319,7 @@ function registerInvest(program2) {
       }
       printBlank();
       const sym = asset.toUpperCase();
-      printSuccess(`Withdrew ${formatAssetAmount(result.amount, sym)} ${sym} from ${result.protocol}`);
+      printSuccess(`Withdrew ${formatAssetAmount4(result.amount, sym)} ${sym} from ${result.protocol}`);
       printKeyValue("Status", `${sym} remains in investment portfolio (locked)`);
       printKeyValue("Tx", explorerUrl(result.tx));
       printBlank();
@@ -2359,7 +2361,7 @@ function registerInvest(program2) {
         printSeparator();
         for (const m of result.moves) {
           printLine(`  ${m.asset}: ${m.fromProtocol} (${m.oldApy.toFixed(2)}%) \u2192 ${m.toProtocol} (${m.newApy.toFixed(2)}%)`);
-          printKeyValue("Amount", `${formatAssetAmount(m.amount, m.asset)} ${m.asset}`);
+          printKeyValue("Amount", `${formatAssetAmount4(m.amount, m.asset)} ${m.asset}`);
           printKeyValue("APY gain", `+${(m.newApy - m.oldApy).toFixed(2)}%`);
           if (m.txDigests.length > 0) {
             printKeyValue("Tx", explorerUrl(m.txDigests[m.txDigests.length - 1]));
@@ -2428,7 +2430,7 @@ function registerInvest(program2) {
         printHeader(`Strategy: ${name} \u2014 Dry Run (${formatUsd15(parsed)})`);
         printSeparator();
         for (const buy of result.buys) {
-          printKeyValue(buy.asset, `${formatUsd15(buy.usdAmount)} \u2192 ~${formatAssetAmount(buy.amount, buy.asset)} ${buy.asset} @ ${formatUsd15(buy.price)}`);
+          printKeyValue(buy.asset, `${formatUsd15(buy.usdAmount)} \u2192 ~${formatAssetAmount4(buy.amount, buy.asset)} ${buy.asset} @ ${formatUsd15(buy.price)}`);
         }
         printSeparator();
         printInfo("Run without --dry-run to execute");
@@ -2438,7 +2440,7 @@ function registerInvest(program2) {
         printSuccess(`Invested ${formatUsd15(parsed)} in ${name} strategy`);
         printSeparator();
         for (const buy of result.buys) {
-          printKeyValue(buy.asset, `${formatAssetAmount(buy.amount, buy.asset)} @ ${formatUsd15(buy.price)}`);
+          printKeyValue(buy.asset, `${formatAssetAmount4(buy.amount, buy.asset)} @ ${formatUsd15(buy.price)}`);
         }
         printSeparator();
         printKeyValue("Total invested", formatUsd15(result.totalInvested));
@@ -2470,7 +2472,7 @@ function registerInvest(program2) {
       for (const sell of result.sells) {
         const pnlColor = sell.realizedPnL >= 0 ? pc13.green : pc13.red;
         const pnlSign = sell.realizedPnL >= 0 ? "+" : "";
-        printKeyValue(sell.asset, `${formatAssetAmount(sell.amount, sell.asset)} \u2192 ${formatUsd15(sell.usdValue)}  ${pnlColor(`${pnlSign}${formatUsd15(sell.realizedPnL)}`)}`);
+        printKeyValue(sell.asset, `${formatAssetAmount4(sell.amount, sell.asset)} \u2192 ${formatUsd15(sell.usdValue)}  ${pnlColor(`${pnlSign}${formatUsd15(sell.realizedPnL)}`)}`);
       }
       if (result.failed && result.failed.length > 0) {
         for (const f of result.failed) {
@@ -2511,7 +2513,7 @@ function registerInvest(program2) {
           const pnlSign = pos.unrealizedPnL >= 0 ? "+" : "";
           printKeyValue(
             pos.asset,
-            `${formatAssetAmount(pos.totalAmount, pos.asset)}  ${formatUsd15(pos.currentValue)}  ${pnlColor(`${pnlSign}${formatUsd15(pos.unrealizedPnL)}`)}  ${driftColor(`${actual.toFixed(0)}% / ${target}% target`)}`
+            `${formatAssetAmount4(pos.totalAmount, pos.asset)}  ${formatUsd15(pos.currentValue)}  ${pnlColor(`${pnlSign}${formatUsd15(pos.unrealizedPnL)}`)}  ${driftColor(`${actual.toFixed(0)}% / ${target}% target`)}`
           );
         }
         printSeparator();
@@ -2539,7 +2541,7 @@ function registerInvest(program2) {
         printSeparator();
         for (const t of result.trades) {
           const action = t.action === "buy" ? pc13.green("BUY") : pc13.red("SELL");
-          printKeyValue(t.asset, `${action} ${formatUsd15(t.usdAmount)} (${formatAssetAmount(t.amount, t.asset)})`);
+          printKeyValue(t.asset, `${action} ${formatUsd15(t.usdAmount)} (${formatAssetAmount4(t.amount, t.asset)})`);
         }
         printSeparator();
         printInfo("Weights: " + Object.entries(result.afterWeights).map(([a, w]) => `${a} ${w.toFixed(0)}%`).join(", "));
@@ -2738,12 +2740,12 @@ function registerInvest(program2) {
 
 // src/commands/portfolio.ts
 import pc14 from "picocolors";
-import { T2000 as T200025, formatUsd as formatUsd16, formatAssetAmount as formatAssetAmount2 } from "@t2000/sdk";
+import { T2000 as T200025, formatUsd as formatUsd16, formatAssetAmount as formatAssetAmount5 } from "@t2000/sdk";
 function printPositionLine(pos, rewardKeys) {
   if (pos.currentPrice === 0 && pos.totalAmount > 0) {
     printKeyValue(
       pos.asset,
-      `${formatAssetAmount2(pos.totalAmount, pos.asset)}    Avg: ${formatUsd16(pos.avgPrice)}    Now: ${pc14.yellow("unavailable")}`
+      `${formatAssetAmount5(pos.totalAmount, pos.asset)}    Avg: ${formatUsd16(pos.avgPrice)}    Now: ${pc14.yellow("unavailable")}`
     );
   } else {
     const pnlColor = pos.unrealizedPnL >= 0 ? pc14.green : pc14.red;
@@ -2756,7 +2758,7 @@ function printPositionLine(pos, rewardKeys) {
     }
     printKeyValue(
       pos.asset,
-      `${formatAssetAmount2(pos.totalAmount, pos.asset)}    Avg: ${formatUsd16(pos.avgPrice)}    Now: ${formatUsd16(pos.currentPrice)}    ${pnlColor(`${pnlSign}${formatUsd16(pos.unrealizedPnL)} (${pnlSign}${pos.unrealizedPnLPct.toFixed(1)}%)`)}${yieldSuffix}`
+      `${formatAssetAmount5(pos.totalAmount, pos.asset)}    Avg: ${formatUsd16(pos.avgPrice)}    Now: ${formatUsd16(pos.currentPrice)}    ${pnlColor(`${pnlSign}${formatUsd16(pos.unrealizedPnL)} (${pnlSign}${pos.unrealizedPnLPct.toFixed(1)}%)`)}${yieldSuffix}`
     );
   }
 }