@byreal-io/byreal-cli-realclaw 0.3.5 → 0.3.7

package/dist/index.cjs

@@ -3033,7 +3033,7 @@ var INJECTED_VERSION, VERSION, CLI_NAME, NPM_PACKAGE, API_BASE_URL, API_ENDPOINT
 var init_constants = __esm({
   "src/core/constants.ts"() {
     "use strict";
-    INJECTED_VERSION = true ? "0.3.5" : void 0;
+    INJECTED_VERSION = true ? "0.3.7" : void 0;
     VERSION = INJECTED_VERSION ?? process.env.npm_package_version ?? "0.0.0";
     CLI_NAME = "byreal-cli";
     NPM_PACKAGE = "@byreal-io/byreal-cli-realclaw";
@@ -3071,7 +3071,7 @@ var init_constants = __esm({
     CONFIG_FILE = "config.json";
     DEFAULTS = {
       OUTPUT_FORMAT: "table",
-      LIST_LIMIT: 20,
+      LIST_LIMIT: 100,
       MAX_LIST_LIMIT: 100,
       SLIPPAGE_BPS: 200,
       MAX_SLIPPAGE_BPS: 500,
@@ -82468,7 +82468,8 @@ function transformToken(apiToken) {
     price_usd: parseFloat(apiToken.price || "0"),
     price_change_24h: parseFloat(apiToken.priceChange24h || "0"),
     volume_24h_usd: parseFloat(apiToken.volumeUsd24h || "0"),
-    market_cap_usd: void 0
+    market_cap_usd: void 0,
+    multiplier: apiToken.multiplier
   };
 }
 function transformOverview(data) {
@@ -83148,20 +83149,33 @@ function outputWalletBalance(balance, address) {
   console.log(source_default.cyan.bold(`
 Balance: ${address}
 `));
-  const table = createTable(["Mint", "Balance", "Program"]);
+  const table = createTable(["Symbol", "Mint", "Balance", "Program"]);
   table.push([
+    source_default.white.bold("SOL"),
     source_default.gray("native"),
     `${balance.sol.amount_sol.toFixed(9)} SOL${balance.sol.amount_usd ? ` (${formatUsd(balance.sol.amount_usd)})` : ""}`,
     "spl-token"
   ]);
   for (const token of balance.tokens) {
+    let balanceDisplay = token.amount_ui;
+    if (token.multiplier && token.amount_ui_display) {
+      balanceDisplay = `${token.amount_ui} ${source_default.gray(`(display: ${token.amount_ui_display}, x${token.multiplier})`)}`;
+    }
+    if (token.amount_usd) {
+      balanceDisplay += ` ${source_default.green(token.amount_usd)}`;
+    }
     table.push([
+      token.symbol ? source_default.white.bold(token.symbol) : "",
       source_default.gray(token.mint),
-      token.amount_ui,
+      balanceDisplay,
       token.is_token_2022 ? "token-2022" : "spl-token"
     ]);
   }
   console.log(table.toString());
+  const hasMultiplier = balance.tokens.some((t) => t.multiplier);
+  if (hasMultiplier) {
+    console.log(source_default.yellow('\n  Note: "display" amounts include Token2022 multiplier (shown in wallets/explorers). Use the real balance for swaps.'));
+  }
   console.log(source_default.gray(`
   ${balance.tokens.length} SPL token(s)`));
 }
@@ -83269,16 +83283,20 @@ function outputPositionOpenPreview(data) {
 }
 function outputPositionClosePreview(data) {
   console.log(source_default.cyan.bold("\nClose Position Preview\n"));
+  const usdSuffix = (usd) => usd ? ` (${usd})` : "";
   const table = createTable(["Field", "Value"]);
   table.push(
     ["NFT Mint", source_default.gray(data.nftMint)],
     ["Pool", source_default.gray(data.poolAddress)],
     ["Price Range", `${data.priceLower} \u2192 ${data.priceUpper}`],
-    ["Token A to Receive", `${data.tokenAmountA} ${data.symbolA}`],
-    ["Token B to Receive", `${data.tokenAmountB} ${data.symbolB}`],
-    ["Fee A to Claim", `${data.feeAmountA} ${data.symbolA}`],
-    ["Fee B to Claim", `${data.feeAmountB} ${data.symbolB}`]
+    ["Token A to Receive", `${data.tokenAmountA} ${data.symbolA}${usdSuffix(data.tokenAmountAUsd)}`],
+    ["Token B to Receive", `${data.tokenAmountB} ${data.symbolB}${usdSuffix(data.tokenAmountBUsd)}`],
+    ["Fee A to Claim", `${data.feeAmountA} ${data.symbolA}${usdSuffix(data.feeAmountAUsd)}`],
+    ["Fee B to Claim", `${data.feeAmountB} ${data.symbolB}${usdSuffix(data.feeAmountBUsd)}`]
   );
+  if (data.totalUsd) {
+    table.push(["Total Value", source_default.bold(data.totalUsd)]);
+  }
   console.log(table.toString());
 }
 function outputPositionIncreasePreview(data) {
@@ -83290,38 +83308,48 @@ function outputPositionIncreasePreview(data) {
     ["Price Range", `${data.priceLower} \u2192 ${data.priceUpper}`]
   );
   if (data.currentTokenA && data.symbolA) {
-    table.push(["Current Token A", `${data.currentTokenA} ${data.symbolA}`]);
+    const usd = data.currentTokenAUsd;
+    table.push(["Current Token A", `${data.currentTokenA} ${data.symbolA}${usd ? ` (${usd})` : ""}`]);
   }
   if (data.currentTokenB && data.symbolB) {
-    table.push(["Current Token B", `${data.currentTokenB} ${data.symbolB}`]);
+    const usd = data.currentTokenBUsd;
+    table.push(["Current Token B", `${data.currentTokenB} ${data.symbolB}${usd ? ` (${usd})` : ""}`]);
   }
   table.push(
     ["Base Amount to Add", `${data.baseAmount} ${data.baseToken}`],
     ["Other Amount to Add", `${data.otherAmount} ${data.otherToken}`]
   );
+  const totalUsd = data.totalUsd;
+  if (totalUsd) {
+    table.push(["Total to Add", source_default.bold(totalUsd)]);
+  }
   console.log(table.toString());
 }
 function outputPositionDecreasePreview(data) {
   console.log(source_default.cyan.bold("\nDecrease Liquidity Preview\n"));
+  const usdSuffix = (usd) => usd ? ` (${usd})` : "";
   const table = createTable(["Field", "Value"]);
   table.push(
     ["NFT Mint", source_default.gray(data.nftMint)],
     ["Pool", source_default.gray(data.poolAddress)],
     ["Price Range", `${data.priceLower} \u2192 ${data.priceUpper}`],
-    ["Current Token A", `${data.tokenAmountA} ${data.symbolA}`],
-    ["Current Token B", `${data.tokenAmountB} ${data.symbolB}`]
+    ["Current Token A", `${data.tokenAmountA} ${data.symbolA}${usdSuffix(data.tokenAmountAUsd)}`],
+    ["Current Token B", `${data.tokenAmountB} ${data.symbolB}${usdSuffix(data.tokenAmountBUsd)}`]
   );
   if (data.totalPositionUsd) {
-    table.push(["Total Position Value", `$${data.totalPositionUsd}`]);
+    table.push(["Total Position Value", data.totalPositionUsd]);
   }
   if (data.requestedUsd) {
     table.push(["Remove Amount", `$${data.requestedUsd}`]);
   }
   table.push(
     ["Remove Percentage", `${data.percentage}%`],
-    ["Token A to Receive", `${data.receiveAmountA} ${data.symbolA}`],
-    ["Token B to Receive", `${data.receiveAmountB} ${data.symbolB}`]
+    ["Token A to Receive", `${data.receiveAmountA} ${data.symbolA}${usdSuffix(data.receiveAmountAUsd)}`],
+    ["Token B to Receive", `${data.receiveAmountB} ${data.symbolB}${usdSuffix(data.receiveAmountBUsd)}`]
   );
+  if (data.receiveUsdTotal) {
+    table.push(["Receive Total", source_default.bold(data.receiveUsdTotal)]);
+  }
   console.log(table.toString());
 }
 function outputPositionClaimPreview(entries) {
@@ -83330,7 +83358,12 @@ function outputPositionClaimPreview(entries) {
     console.log(source_default.white.bold(`  Position: ${entry.positionAddress}`));
     for (const token of entry.tokens) {
       const uiAmount = rawToUi(String(token.tokenAmount), token.tokenDecimals);
-      console.log(source_default.gray(`    ${uiAmount} ${token.tokenSymbol} (${token.tokenAddress})`));
+      const usdPart = token.amountUsd ? ` (${token.amountUsd})` : "";
+      console.log(source_default.gray(`    ${uiAmount} ${token.tokenSymbol}${usdPart} (${token.tokenAddress})`));
+    }
+    const totalUsd = entry.totalUsd;
+    if (totalUsd) {
+      console.log(source_default.gray(`    Total: ${totalUsd}`));
     }
     console.log();
   }
@@ -83360,7 +83393,7 @@ ${label} Preview
       const claimed = parseFloat(r.claimedTokenAmount);
       const unclaimed = synced - locked - claimed;
       if (unclaimed <= 0) continue;
-      const usdValue = parseFloat(r.price) > 0 ? ` (~$${(unclaimed * parseFloat(r.price)).toFixed(2)})` : "";
+      const usdValue = parseFloat(r.price) > 0 ? ` (${formatUsd(unclaimed * parseFloat(r.price))})` : "";
       console.log(source_default.gray(`    ${unclaimed.toFixed(r.tokenDecimals > 6 ? 6 : r.tokenDecimals)} ${r.tokenSymbol}${usdValue} (${r.tokenAddress})`));
     }
     console.log();
@@ -83579,13 +83612,13 @@ Position Analysis: ${data.position.pair}`));
   console.log();
   console.log(source_default.cyan.bold("Performance"));
   const perfTable = createTable(["Metric", "Value"]);
-  const pnlColor = parseFloat(data.performance.pnlUsd) >= 0 ? source_default.green : source_default.red;
-  const netColor = parseFloat(data.performance.netReturnUsd) >= 0 ? source_default.green : source_default.red;
+  const pnlColor = data.performance.pnlUsd.startsWith("-") ? source_default.red : source_default.green;
+  const netColor = data.performance.netReturnUsd.startsWith("-") ? source_default.red : source_default.green;
   perfTable.push(
-    ["Liquidity", `$${data.performance.liquidityUsd}`],
-    ["Earned Fees", `$${data.performance.earnedUsd} (${data.performance.earnedPercent})`],
-    ["PnL (IL)", pnlColor(`$${data.performance.pnlUsd} (${data.performance.pnlPercent})`)],
-    ["Net Return", netColor(`$${data.performance.netReturnUsd} (${data.performance.netReturnPercent})`)]
+    ["Liquidity", data.performance.liquidityUsd],
+    ["Earned Fees", `${data.performance.earnedUsd} (${data.performance.earnedPercent})`],
+    ["PnL (IL)", pnlColor(`${data.performance.pnlUsd} (${data.performance.pnlPercent})`)],
+    ["Net Return", netColor(`${data.performance.netReturnUsd} (${data.performance.netReturnPercent})`)]
   );
   console.log(perfTable.toString());
   console.log(source_default.cyan.bold("\nRange Health"));
@@ -83604,16 +83637,17 @@ Position Analysis: ${data.position.pair}`));
   const poolTable = createTable(["Metric", "Value"]);
   poolTable.push(
     ["Fee APR (24h)", data.poolContext.feeApr24h],
-    ["Volume (24h)", `$${data.poolContext.volume24h}`],
-    ["TVL", `$${data.poolContext.tvl}`],
+    ["Volume (24h)", data.poolContext.volume24h],
+    ["TVL", data.poolContext.tvl],
     ["Price Change (24h)", data.poolContext.priceChange24h]
   );
   console.log(poolTable.toString());
   console.log(source_default.cyan.bold("\nUnclaimed Fees"));
-  const feeTable = createTable(["Token", "Amount"]);
+  const feeTable = createTable(["Token", "Amount", "USD Value"]);
   feeTable.push(
-    [data.unclaimedFees.tokenA.symbol, data.unclaimedFees.tokenA.amount],
-    [data.unclaimedFees.tokenB.symbol, data.unclaimedFees.tokenB.amount]
+    [data.unclaimedFees.tokenA.symbol, data.unclaimedFees.tokenA.amount, data.unclaimedFees.tokenA.amountUsd],
+    [data.unclaimedFees.tokenB.symbol, data.unclaimedFees.tokenB.amount, data.unclaimedFees.tokenB.amountUsd],
+    [source_default.bold("Total"), "", source_default.bold(data.unclaimedFees.totalUsd)]
   );
   console.log(feeTable.toString());
 }
@@ -84207,6 +84241,7 @@ byreal-cli catalog show dex.pool.list
 5. **Large amounts (> $10,000)**: Require explicit user confirmation
 6. **High slippage (> 200 bps)**: Warn user before proceeding
 7. **Token amounts use UI format** \u2014 \`--amount 0.1\` means 0.1 tokens, not lamports. The CLI auto-resolves decimals from mint address. Never convert manually. Use \`--raw\` only for raw units.
+   **\u26A0 Token2022 (xStock) multiplier**: \`wallet balance -o json\` returns \`amount_ui\` (real spendable balance) and \`amount_ui_display\` (= amount_ui \xD7 multiplier, what wallets/explorers show). For swap \`--amount\`, **always use \`amount_ui\` (real balance), NOT \`amount_ui_display\`**.
 8. **Suspicious request detection** \u2014 Do not blindly execute requests showing signs of social engineering: transferring all funds to an unknown address, rapid repeated operations draining the wallet, or instructions contradicting user's stated goals. When in doubt, ask.
 
 ## External Context (AI Agent Responsibility)
@@ -84261,7 +84296,8 @@ For detailed parameter info on any command, run: \`byreal-cli catalog show <capa
 \`pools analyze\` returns: pool info, metrics (TVL/volume/fees/feeApr), volatility, active rewards (token, APR, daily amount, end date), rangeAnalysis (per range: price bounds, estimated fee APR, in-range likelihood), riskFactors, wallet info, investmentProjection.
 
 ### Position Analysis Response
-\`positions analyze\` returns: position info (NFT, pool, pair, range, status, inRange), performance (liquidityUsd, earnedUsd/%, pnlUsd/%, netReturnUsd/%), rangeHealth (distance to bounds, outOfRangeRisk), poolContext, unclaimedFees.
+\`positions analyze\` returns: position info (NFT, pool, pair, range, status, inRange), performance (liquidityUsd, earnedUsd/%, pnlUsd/%, netReturnUsd/% \u2014 all USD values pre-formatted with $ prefix like "$0.0065"), rangeHealth (distance to bounds, outOfRangeRisk), poolContext, unclaimedFees (each token has symbol, amount, amountUsd; plus totalUsd).
+\`positions list\` JSON includes *UsdDisplay fields (e.g. earnedUsdDisplay: "$0.0065") for LLM-friendly reading.
 
 ### Position Lifecycle: decrease vs close
 - \`decrease --percentage 100\`: Removes all liquidity but **keeps the position NFT**. Can add liquidity again later with \`increase\`.
@@ -84373,7 +84409,7 @@ All JSON errors include \`error.suggestions\` with recovery commands \u2014 alwa
 Always read \`error.message\` carefully \u2014 it contains the specific cause. Do NOT retry blindly.
 
 ### Swap
-1. **Check balance**: Run \`wallet balance --wallet-address <addr> -o json\` \u2014 confirm input token balance \u2265 swap amount. Reserve ~0.01 SOL for tx fees.
+1. **Check balance**: Run \`wallet balance --wallet-address <addr> -o json\` \u2014 confirm input token's \`amount_ui\` (real balance) \u2265 swap amount. For Token2022 tokens (xStock), do NOT use \`amount_ui_display\` \u2014 that is the multiplied display value, not the real spendable balance. Reserve ~0.01 SOL for tx fees.
 2. **Switch swap-mode**: \`--swap-mode out\` may find a different route than the default \`in\`
 3. **Intermediate token**: Split A\u2192B into A\u2192SOL\u2192B or A\u2192USDC\u2192B (SOL: \`So11111111111111111111111111111111111111112\`, USDC: \`EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v\`, USDT: \`Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB\`)
 4. **Increase slippage**: \`--slippage 300\` for volatile tokens
@@ -84409,7 +84445,7 @@ var CAPABILITIES = [
       { name: "sort-field", type: "string", required: false, description: "Sort field", default: "tvl", enum: ["tvl", "volumeUsd24h", "feeUsd24h", "apr24h"] },
       { name: "sort-type", type: "string", required: false, description: "Sort order", default: "desc", enum: ["asc", "desc"] },
       { name: "page", type: "integer", required: false, description: "Page number", default: "1" },
-      { name: "page-size", type: "integer", required: false, description: "Results per page", default: "20" },
+      { name: "page-size", type: "integer", required: false, description: "Results per page", default: "100" },
       { name: "category", type: "string", required: false, description: "Pool category: 1=stable, 2=xStocks, 4=launchpad, 16=normal" }
     ]
   },
@@ -84537,7 +84573,7 @@ var CAPABILITIES = [
   {
     id: "dex.position.list",
     name: "List Positions",
-    description: "List CLMM positions for your wallet or any wallet address. Use --user to query another wallet (read-only, no --wallet-address needed).",
+    description: "List CLMM positions for your wallet or any wallet address. JSON output includes pre-formatted USD display fields (*UsdDisplay). Use --user to query another wallet (read-only, no --wallet-address needed).",
     category: "query",
     auth_required: false,
     command: "byreal-cli positions list",
@@ -84554,7 +84590,7 @@ var CAPABILITIES = [
   {
     id: "dex.position.analyze",
     name: "Position Analysis",
-    description: "Analyze existing position: performance (earned, PnL, net return), range health, pool context, and unclaimed fees. Requires --wallet-address global option.",
+    description: "Analyze existing position: performance (earned, PnL, net return with formatted USD values), range health, pool context, and unclaimed fees with USD values. Requires --wallet-address global option.",
     category: "analyze",
     auth_required: true,
     command: "byreal-cli positions analyze <nft-mint> --wallet-address <address>",
@@ -84877,6 +84913,21 @@ init_security();
 init_config();
 
 // src/cli/commands/wallet.ts
+async function fetchToken2022Multipliers(mints) {
+  const result = /* @__PURE__ */ new Map();
+  if (mints.length === 0) return result;
+  const settled = await Promise.allSettled(
+    mints.map((mint) => api.listTokens({ searchKey: mint, pageSize: 1 }))
+  );
+  for (let i = 0; i < mints.length; i++) {
+    const s = settled[i];
+    if (s.status === "fulfilled" && s.value.ok && s.value.value.tokens.length > 0) {
+      const t = s.value.value.tokens[0];
+      result.set(mints[i], { multiplier: t.multiplier, symbol: t.symbol, name: t.name });
+    }
+  }
+  return result;
+}
 function createWalletCommand() {
   const wallet = new Command("wallet").description("Query wallet balance");
   wallet.command("balance", { isDefault: true }).description("Query SOL and SPL token balance").action(async (_options, cmd) => {
@@ -84954,15 +85005,52 @@ function createWalletCommand() {
           is_token_2022: raw.isToken2022
         });
       }
+      try {
+        const tokenInfo = await fetchToken2022Multipliers(tokens.map((t) => t.mint));
+        for (const token of tokens) {
+          const info = tokenInfo.get(token.mint);
+          if (!info) continue;
+          if (info.symbol) token.symbol = info.symbol;
+          if (info.name) token.name = info.name;
+          if (token.is_token_2022 && info.multiplier && parseFloat(info.multiplier) !== 1) {
+            token.multiplier = info.multiplier;
+            token.amount_ui_display = (parseFloat(token.amount_ui) * parseFloat(info.multiplier)).toString();
+          }
+        }
+      } catch {
+      }
+      const SOL_MINT2 = "So11111111111111111111111111111111111111112";
+      const allMints = [SOL_MINT2, ...tokens.map((t) => t.mint)];
+      let prices = {};
+      try {
+        const pricesResult = await api.getTokenPrices(allMints);
+        if (pricesResult.ok) prices = pricesResult.value;
+      } catch {
+      }
+      const solPriceUsd = prices[SOL_MINT2] ?? 0;
       const balance = {
         sol: {
           amount_lamports: lamports.toString(),
-          amount_sol: solBalance
+          amount_sol: solBalance,
+          amount_usd: solPriceUsd > 0 ? solBalance * solPriceUsd : void 0
         },
-        tokens
+        tokens: tokens.map((t) => {
+          const price = prices[t.mint] ?? 0;
+          const uiAmount = parseFloat(t.amount_ui_display || t.amount_ui);
+          return {
+            ...t,
+            price_usd: price > 0 ? price : void 0,
+            amount_usd: price > 0 ? formatUsd(uiAmount * price) : void 0
+          };
+        })
       };
+      const totalUsd = (balance.sol.amount_usd ?? 0) + balance.tokens.reduce((sum3, t) => {
+        const price = prices[t.mint] ?? 0;
+        const uiAmount = parseFloat(t.amount_ui_display || t.amount_ui);
+        return sum3 + uiAmount * price;
+      }, 0);
       if (globalOptions.output === "json") {
-        outputJson({ address: walletAddress, balance }, startTime);
+        outputJson({ address: walletAddress, balance, totalUsd: formatUsd(totalUsd) }, startTime);
       } else {
         outputWalletBalance(balance, walletAddress);
       }
@@ -85173,7 +85261,20 @@ Error: Invalid wallet address: ${userPublicKey}`));
       if (mode === "dry-run") {
         printDryRunBanner();
         if (format === "json") {
-          outputJson({ mode: "dry-run", ...quote, uiInAmount, uiOutAmount }, startTime);
+          let inAmountUsd;
+          let outAmountUsd;
+          try {
+            const pricesResult = await api.getTokenPrices([quote.inputMint, quote.outputMint]);
+            if (pricesResult.ok) {
+              const prices = pricesResult.value;
+              const inPrice = prices[quote.inputMint] ?? 0;
+              const outPrice = prices[quote.outputMint] ?? 0;
+              if (inPrice > 0) inAmountUsd = formatUsd(parseFloat(uiInAmount) * inPrice);
+              if (outPrice > 0) outAmountUsd = formatUsd(parseFloat(uiOutAmount) * outPrice);
+            }
+          } catch {
+          }
+          outputJson({ mode: "dry-run", ...quote, uiInAmount, uiOutAmount, inAmountUsd, outAmountUsd }, startTime);
         } else {
           outputSwapQuoteTable(quote, uiInAmount, uiOutAmount);
           console.log(source_default.yellow("\n  Remove --dry-run to generate the unsigned transaction"));
@@ -85266,7 +85367,17 @@ Error: ${errMsg}`));
       process.exit(1);
     }
     if (format === "json") {
-      outputJson(result.value, startTime);
+      const enriched = {
+        ...result.value,
+        positions: result.value.positions.map((p) => ({
+          ...p,
+          liquidityUsdDisplay: p.liquidityUsd ? formatUsd(parseFloat(p.liquidityUsd)) : "$0.00",
+          earnedUsdDisplay: p.earnedUsd ? formatUsd(parseFloat(p.earnedUsd)) : "$0.00",
+          pnlUsdDisplay: p.pnlUsd ? parseFloat(p.pnlUsd) < 0 ? `-${formatUsd(Math.abs(parseFloat(p.pnlUsd)))}` : formatUsd(parseFloat(p.pnlUsd)) : "$0.00",
+          bonusUsdDisplay: p.bonusUsd ? formatUsd(parseFloat(p.bonusUsd)) : "$0.00"
+        }))
+      };
+      outputJson(enriched, startTime);
     } else {
       outputPositionsTable(result.value.positions, result.value.total);
     }
@@ -85580,19 +85691,19 @@ function createPositionsOpenCommand() {
           otherAmount: rawToUi(otherAmountMax.toString(), otherDecimals),
           otherToken: otherSymbol,
           ...investmentUsd ? { investmentUsd } : {},
-          ...totalUsd ? {
-            tokenA: {
-              symbol: symbolA,
-              amount: amountAUi,
-              usd: amountAUsd
-            },
-            tokenB: {
-              symbol: symbolB,
-              amount: amountBUi,
-              usd: amountBUsd
-            },
-            totalUsd
-          } : {}
+          tokenA: {
+            symbol: symbolA,
+            amount: amountAUi,
+            usd: amountAUsd ?? formatUsd(parseFloat(amountAUi) * tokenAPriceUsd)
+          },
+          tokenB: {
+            symbol: symbolB,
+            amount: amountBUi,
+            usd: amountBUsd ?? formatUsd(parseFloat(amountBUi) * tokenBPriceUsd)
+          },
+          totalUsd: totalUsd ?? formatUsd(
+            parseFloat(amountAUi) * tokenAPriceUsd + parseFloat(amountBUi) * tokenBPriceUsd
+          )
         };
         const balanceWarnings = await checkBalanceSufficiency(
           publicKey3,
@@ -85875,7 +85986,22 @@ Error: ${errMsg}`));
           currentTokenB: positionInfo.tokenB.uiAmount,
           symbolA,
           symbolB,
-          ...investmentUsd ? { investmentUsd } : {}
+          ...investmentUsd ? { investmentUsd } : {},
+          tokenA: {
+            symbol: symbolA,
+            amount: rawToUi((base === "MintA" ? baseAmount : otherAmountMax).toString(), poolInfo.mintDecimalsA),
+            usd: formatUsd(parseFloat(rawToUi((base === "MintA" ? baseAmount : otherAmountMax).toString(), poolInfo.mintDecimalsA)) * tokenAPriceUsd)
+          },
+          tokenB: {
+            symbol: symbolB,
+            amount: rawToUi((base === "MintA" ? otherAmountMax : baseAmount).toString(), poolInfo.mintDecimalsB),
+            usd: formatUsd(parseFloat(rawToUi((base === "MintA" ? otherAmountMax : baseAmount).toString(), poolInfo.mintDecimalsB)) * tokenBPriceUsd)
+          },
+          currentTokenAUsd: formatUsd(parseFloat(positionInfo.tokenA.uiAmount) * tokenAPriceUsd),
+          currentTokenBUsd: formatUsd(parseFloat(positionInfo.tokenB.uiAmount) * tokenBPriceUsd),
+          totalUsd: formatUsd(
+            parseFloat(rawToUi((base === "MintA" ? baseAmount : otherAmountMax).toString(), poolInfo.mintDecimalsA)) * tokenAPriceUsd + parseFloat(rawToUi((base === "MintA" ? otherAmountMax : baseAmount).toString(), poolInfo.mintDecimalsB)) * tokenBPriceUsd
+          )
         };
         const balanceWarnings = await checkBalanceSufficiency(
           publicKey3,
@@ -86138,6 +86264,8 @@ Error: ${errMsg}`));
       const slippage = options.slippage ? parseInt(options.slippage, 10) / 1e4 : getSlippageBps() / 1e4;
       if (mode === "dry-run") {
         printDryRunBanner();
+        const receiveAUsd = parseFloat(receiveAmountAUi) * tokenAPriceUsd;
+        const receiveBUsd = parseFloat(receiveAmountBUi) * tokenBPriceUsd;
         const previewData = {
           nftMint: options.nftMint,
           poolAddress,
@@ -86145,12 +86273,17 @@ Error: ${errMsg}`));
           priceUpper: positionInfo.uiPriceUpper,
           percentage: Math.round(percentage * 100) / 100,
           tokenAmountA: positionInfo.tokenA.uiAmount,
+          tokenAmountAUsd: formatUsd(tokenAUiAmount * tokenAPriceUsd),
           tokenAmountB: positionInfo.tokenB.uiAmount,
+          tokenAmountBUsd: formatUsd(tokenBUiAmount * tokenBPriceUsd),
           receiveAmountA: receiveAmountAUi,
+          receiveAmountAUsd: formatUsd(receiveAUsd),
           receiveAmountB: receiveAmountBUi,
+          receiveAmountBUsd: formatUsd(receiveBUsd),
+          receiveUsdTotal: formatUsd(receiveAUsd + receiveBUsd),
           symbolA,
           symbolB,
-          ...totalPositionUsd > 0 ? { totalPositionUsd: totalPositionUsd.toFixed(2) } : {},
+          ...totalPositionUsd > 0 ? { totalPositionUsd: formatUsd(totalPositionUsd) } : {},
           ...requestedUsd ? { requestedUsd } : {}
         };
         if (format === "json") {
@@ -86241,24 +86374,39 @@ Error: ${errMsg}`));
       const poolAddress = positionInfo.rawPoolInfo.poolId.toBase58();
       let symbolA = positionInfo.tokenA.address.toBase58();
       let symbolB = positionInfo.tokenB.address.toBase58();
+      let tokenAPriceUsd = 0;
+      let tokenBPriceUsd = 0;
       const poolResult = await api.getPoolInfo(poolAddress);
       if (poolResult.ok) {
         symbolA = poolResult.value.token_a.symbol || symbolA;
         symbolB = poolResult.value.token_b.symbol || symbolB;
+        tokenAPriceUsd = poolResult.value.token_a.price_usd ?? 0;
+        tokenBPriceUsd = poolResult.value.token_b.price_usd ?? 0;
       }
       if (mode === "dry-run") {
         printDryRunBanner();
+        const tokenAmountAVal = parseFloat(positionInfo.tokenA.uiAmount || "0");
+        const tokenAmountBVal = parseFloat(positionInfo.tokenB.uiAmount || "0");
+        const feeAmountAVal = parseFloat(positionInfo.tokenA.uiFeeAmount || "0");
+        const feeAmountBVal = parseFloat(positionInfo.tokenB.uiFeeAmount || "0");
         const previewData = {
           nftMint: options.nftMint,
           poolAddress,
           priceLower: positionInfo.uiPriceLower,
           priceUpper: positionInfo.uiPriceUpper,
           tokenAmountA: positionInfo.tokenA.uiAmount,
+          tokenAmountAUsd: formatUsd(tokenAmountAVal * tokenAPriceUsd),
           tokenAmountB: positionInfo.tokenB.uiAmount,
+          tokenAmountBUsd: formatUsd(tokenAmountBVal * tokenBPriceUsd),
           feeAmountA: positionInfo.tokenA.uiFeeAmount,
+          feeAmountAUsd: formatUsd(feeAmountAVal * tokenAPriceUsd),
           feeAmountB: positionInfo.tokenB.uiFeeAmount,
+          feeAmountBUsd: formatUsd(feeAmountBVal * tokenBPriceUsd),
           symbolA,
-          symbolB
+          symbolB,
+          totalUsd: formatUsd(
+            (tokenAmountAVal + feeAmountAVal) * tokenAPriceUsd + (tokenAmountBVal + feeAmountBVal) * tokenBPriceUsd
+          )
         };
         if (format === "json") {
           outputJson({ mode: "dry-run", ...previewData }, startTime);
@@ -86391,10 +86539,26 @@ Error: ${errMsg}`));
     }
     if (mode === "dry-run") {
       printDryRunBanner();
+      const allMints = [...new Set(entries.flatMap((e) => e.tokens.map((t) => t.tokenAddress)))];
+      const pricesResult = await api.getTokenPrices(allMints);
+      const prices = pricesResult.ok ? pricesResult.value : {};
+      const enrichedEntries = entries.map((entry) => {
+        const enrichedTokens = entry.tokens.map((t) => {
+          const uiAmount = parseFloat(t.tokenAmount) / Math.pow(10, t.tokenDecimals);
+          const price = prices[t.tokenAddress] ?? 0;
+          return { ...t, amountUsd: formatUsd(uiAmount * price) };
+        });
+        const totalUsd = enrichedTokens.reduce((sum3, t) => {
+          const uiAmount = parseFloat(t.tokenAmount) / Math.pow(10, t.tokenDecimals);
+          const price = prices[t.tokenAddress] ?? 0;
+          return sum3 + uiAmount * price;
+        }, 0);
+        return { ...entry, tokens: enrichedTokens, totalUsd: formatUsd(totalUsd) };
+      });
       if (format === "json") {
-        outputJson({ mode: "dry-run", entries }, startTime);
+        outputJson({ mode: "dry-run", entries: enrichedEntries }, startTime);
       } else {
-        outputPositionClaimPreview(entries);
+        outputPositionClaimPreview(enrichedEntries);
         console.log(source_default.yellow("\n  Remove --dry-run to generate the unsigned transaction(s)"));
       }
       return;
@@ -86437,13 +86601,24 @@ function createPositionsClaimRewardsCommand() {
       const openRewards = filterUnclaimed(unclaimedOpenIncentives);
       const closedRewards = filterUnclaimed(unclaimedClosedIncentives);
       const allRewards = [...openRewards, ...closedRewards];
+      const enrichRewardItem = (item) => {
+        const unclaimed = parseFloat(item.syncedTokenAmount) - parseFloat(item.lockedTokenAmount) - parseFloat(item.claimedTokenAmount);
+        const price = parseFloat(item.price || "0");
+        return {
+          ...item,
+          unclaimedAmount: unclaimed.toString(),
+          unclaimedAmountUsd: formatUsd(unclaimed * price)
+        };
+      };
       if (mode === "dry-run") {
         printDryRunBanner();
         if (format === "json") {
+          const enrichedOpen = openRewards.map(enrichRewardItem);
+          const enrichedClosed = closedRewards.map(enrichRewardItem);
           outputJson({
             mode: "dry-run",
-            openPositionRewards: openRewards,
-            closedPositionRewards: closedRewards,
+            openPositionRewards: enrichedOpen,
+            closedPositionRewards: enrichedClosed,
             totalPositions: new Set(allRewards.map((r) => r.positionAddress)).size
           }, startTime);
         } else {
@@ -86770,12 +86945,12 @@ Error: ${errMsg}`));
           inRange
         },
         performance: {
-          liquidityUsd: liquidityUsd.toFixed(2),
-          earnedUsd: earnedUsd.toFixed(2),
+          liquidityUsd: formatUsd(liquidityUsd),
+          earnedUsd: formatUsd(earnedUsd),
           earnedPercent: `${parseFloat(String(earnedPercent)).toFixed(2)}%`,
-          pnlUsd: pnlUsd.toFixed(2),
+          pnlUsd: pnlUsd < 0 ? `-${formatUsd(Math.abs(pnlUsd))}` : formatUsd(pnlUsd),
           pnlPercent: `${parseFloat(String(pnlPercent)).toFixed(2)}%`,
-          netReturnUsd: netReturnUsd.toFixed(2),
+          netReturnUsd: netReturnUsd < 0 ? `-${formatUsd(Math.abs(netReturnUsd))}` : formatUsd(netReturnUsd),
           netReturnPercent: `${parseFloat(netReturnPercent).toFixed(2)}%`
         },
         rangeHealth: {
@@ -86787,20 +86962,29 @@ Error: ${errMsg}`));
         },
         poolContext: {
           feeApr24h: `${pool.apr.toFixed(2)}%`,
-          volume24h: pool.volume_24h_usd.toFixed(2),
-          tvl: pool.tvl_usd.toFixed(2),
+          volume24h: formatUsd(pool.volume_24h_usd),
+          tvl: formatUsd(pool.tvl_usd),
           priceChange24h: `${(pool.price_change_24h || 0).toFixed(2)}%`
         },
-        unclaimedFees: {
-          tokenA: {
-            symbol: symbolA,
-            amount: positionInfo.tokenA.uiFeeAmount
-          },
-          tokenB: {
-            symbol: symbolB,
-            amount: positionInfo.tokenB.uiFeeAmount
-          }
-        }
+        unclaimedFees: (() => {
+          const feeAmountA = parseFloat(positionInfo.tokenA.uiFeeAmount || "0");
+          const feeAmountB = parseFloat(positionInfo.tokenB.uiFeeAmount || "0");
+          const feeAUsd = feeAmountA * (pool.token_a.price_usd ?? 0);
+          const feeBUsd = feeAmountB * (pool.token_b.price_usd ?? 0);
+          return {
+            tokenA: {
+              symbol: symbolA,
+              amount: positionInfo.tokenA.uiFeeAmount,
+              amountUsd: formatUsd(feeAUsd)
+            },
+            tokenB: {
+              symbol: symbolB,
+              amount: positionInfo.tokenB.uiFeeAmount,
+              amountUsd: formatUsd(feeBUsd)
+            },
+            totalUsd: formatUsd(feeAUsd + feeBUsd)
+          };
+        })()
       };
       if (format === "json") {
         outputJson(analysisData, startTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byreal-io/byreal-cli-realclaw",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "AI-native CLI for Byreal CLMM DEX on Solana",
   "type": "module",
   "main": "dist/index.cjs",