@palmyr/cli 1.3.0 → 1.3.1

package/dist/wallet-brief-llm.js

@@ -40,9 +40,11 @@ function buildPrompt(p) {
         p.exitPlan.timeLimit ? `timeLimit=${p.exitPlan.timeLimit}` : null,
         p.exitPlan.holdIf ? `holdIf=${p.exitPlan.holdIf}` : null,
     ].filter(Boolean).join(' | ') || 'none';
-    // Phase 5b — chain-aware realized PnL formatting.
-    const realized = p.chain === 'solana' ? p.pnl.realizedSol : p.pnl.realizedEth;
-    const unit = p.chain === 'solana' ? 'SOL' : 'ETH';
+    // Read canonical asset-tagged PnL — the field reflects what the position
+    // was actually funded in (USDC for USDC-funded positions, not the chain's
+    // native asset).
+    const realized = p.pnl.realized?.amount ?? 0;
+    const unit = p.pnl.realized?.asset ?? (p.chain === 'solana' ? 'SOL' : 'ETH');
     return `You are reviewing a ${p.chain === 'base' ? 'Base' : 'Solana'} trading position. The trader entered with this plain-string thesis:
 
 THESIS: ${p.thesis}

package/dist/wallet-brief-llm.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-brief-llm.js","sourceRoot":"","sources":["../wallet-brief-llm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wallet-brief-llm.js","sourceRoot":"","sources":["../wallet-brief-llm.ts"],"names":[],"mappings":"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"}

package/dist/wallet-daemon.js

@@ -54,9 +54,13 @@ export function formatTriggerReason(fire) {
             return `auto: timeLimit fired; selling 100%`;
         }
         case 'trailingStop': {
-            const peak = fire.peakPct !== undefined ? `peak ${fire.peakPct.toFixed(2)}%` : 'peak ?';
-            const drop = fire.thresholdPct !== undefined ? `${fire.thresholdPct.toFixed(2)}%` : '?%';
-            return `auto: trailingStop fired at ${pct} (${peak} - drop ≥ ${drop}); selling 100%`;
+            const allowedDrop = fire.thresholdPct !== undefined ? `${fire.thresholdPct.toFixed(2)}%` : '?%';
+            if (fire.peakPct !== undefined) {
+                const drawdown = (fire.peakPct - fire.currentPct).toFixed(2);
+                const peakSigned = `${fire.peakPct >= 0 ? '+' : ''}${fire.peakPct.toFixed(2)}%`;
+                return `auto: trailingStop fired: drop ${drawdown}% from peak ${peakSigned} > ${allowedDrop} allowed; selling 100%`;
+            }
+            return `auto: trailingStop fired at ${pct}; drop allowed ${allowedDrop}; selling 100%`;
         }
         case 'thesis_falsified': {
             const verdict = fire.llmVerdict ?? 'no';

package/dist/wallet-daemon.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-daemon.js","sourceRoot":"","sources":["../wallet-daemon.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wallet-daemon.js","sourceRoot":"","sources":["../wallet-daemon.ts"],"names":[],"mappings":"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"}

package/dist/wallet-trading.d.ts

@@ -96,36 +96,41 @@ export interface SolanaSell {
     time: string;
     tokensIn: string;
     tokensInRaw: string;
-    /** Display string. Holds "0.300000 SOL" for native sells, "5.00 USDC" for USDC sells. */
-    solOut: string;
-    /** Raw output. Lamports for SOL exits, 6-dec raw for USDC exits. Both fit JS Number for realistic sizes. */
-    solOutRaw: number;
     percentRequested: number;
-    /** Realized PnL in the position's `inputAsset` (SOL or USDC). Field name kept for back-compat. */
-    realizedSol: number;
     reason: string;
     feeLamports?: number;
     tipLamports?: number;
     slippageBpsUsed?: number;
     protectedExec?: boolean;
     forensics?: FillForensics;
-    /** USDC-aware: the asset this sell exited to. Missing on legacy sells; treated as 'SOL'. */
-    outputAsset?: SolanaInputAsset;
-    /** Realized output (asset-tagged). `solOut` / `solOutRaw` are back-compat aliases. */
-    output?: AssetAmount;
-    /** Realized PnL for this sell (asset-tagged). `realizedSol` is a back-compat alias. */
-    realized?: AssetPnl;
+    /** Asset this sell exited to (mirrors entry.inputAsset). */
+    outputAsset: SolanaInputAsset;
+    /** Realized output (asset-tagged). Holds USDC values on USDC exits — name no longer chain-typed. */
+    output: AssetAmount;
+    /** Realized PnL for this sell (asset-tagged). */
+    realized: AssetPnl;
+    /**
+     * @deprecated Read `output.display` / `output.raw` / `realized.amount` instead.
+     * Optional only so legacy position files on disk (pre-canonical) still parse;
+     * new sells no longer set these.
+     */
+    solOut?: string;
+    /** @deprecated Use `output.raw`. */
+    solOutRaw?: number;
+    /** @deprecated Use `realized.amount`. */
+    realizedSol?: number;
 }
 export interface SolanaPnl {
-    /** Realized PnL in the position's input asset (SOL or USDC). Field name kept for back-compat with legacy SOL positions. */
-    realizedSol: number;
-    unrealizedSol: number;
     unrealizedPct: number;
     lastPricedAt: string | null;
     /** Realized PnL across all sells (asset-tagged). */
-    realized?: AssetPnl;
+    realized: AssetPnl;
     /** Mark-to-market unrealized PnL (asset-tagged). */
-    unrealized?: AssetPnl;
+    unrealized: AssetPnl;
+    /** @deprecated Use `realized.amount`. */
+    realizedSol?: number;
+    /** @deprecated Use `unrealized.amount`. */
+    unrealizedSol?: number;
 }
 export interface SolanaPositionFile {
     chain: 'solana';
@@ -167,35 +172,40 @@ export interface BaseSell {
     time: string;
     tokensIn: string;
     tokensInRaw: string;
-    /** Display string: "0.005000 ETH" or "5.00 USDC". Field name kept for back-compat. */
-    ethOut: string;
-    /** Raw output. Wei for ETH exits, 6-dec raw for USDC exits. Both kept as string for u256 safety. */
-    ethOutRawWei: string;
     percentRequested: number;
-    /** Realized PnL in the position's input asset (ETH or USDC). Field name kept for back-compat. */
-    realizedEth: number;
     reason: string;
     feeWei?: string;
     slippageBpsUsed?: number;
     protectedExec?: boolean;
     forensics?: FillForensics;
-    /** USDC-aware: asset this sell exited to. Missing on legacy sells; treated as 'ETH'. */
-    outputAsset?: BaseInputAsset;
-    /** Realized output (asset-tagged). `ethOut` / `ethOutRawWei` are back-compat aliases. */
-    output?: AssetAmount;
-    /** Realized PnL for this sell (asset-tagged). `realizedEth` is a back-compat alias. */
-    realized?: AssetPnl;
+    /** Asset this sell exited to (mirrors entry.inputAsset). */
+    outputAsset: BaseInputAsset;
+    /** Realized output (asset-tagged). Holds USDC values on USDC exits — name no longer chain-typed. */
+    output: AssetAmount;
+    /** Realized PnL for this sell (asset-tagged). */
+    realized: AssetPnl;
+    /**
+     * @deprecated Read `output.display` / `output.raw` / `realized.amount` instead.
+     * Optional only so legacy position files on disk (pre-canonical) still parse;
+     * new sells no longer set these.
+     */
+    ethOut?: string;
+    /** @deprecated Use `output.raw`. */
+    ethOutRawWei?: string;
+    /** @deprecated Use `realized.amount`. */
+    realizedEth?: number;
 }
 export interface BasePnl {
-    /** Realized PnL in the position's input asset (ETH or USDC). Field name kept for back-compat. */
-    realizedEth: number;
-    unrealizedEth: number;
     unrealizedPct: number;
     lastPricedAt: string | null;
     /** Realized PnL across all sells (asset-tagged). */
-    realized?: AssetPnl;
+    realized: AssetPnl;
     /** Mark-to-market unrealized PnL (asset-tagged). */
-    unrealized?: AssetPnl;
+    unrealized: AssetPnl;
+    /** @deprecated Use `realized.amount`. */
+    realizedEth?: number;
+    /** @deprecated Use `unrealized.amount`. */
+    unrealizedEth?: number;
 }
 export interface BasePositionFile {
     chain: 'base';
@@ -497,9 +507,6 @@ export interface SellBaseResult {
     txHash: string;
     tokensIn: string;
     tokensInRaw: string;
-    ethOut: string;
-    ethOutRawWei: string;
-    realizedEth: number;
     positionStatus: 'open' | 'closed';
     wallet: string;
     mint: string;
@@ -519,9 +526,9 @@ export interface SellBaseResult {
      * on partial sells of a drifted position.
      */
     reconcileDriftRaw?: string;
-    /** Canonical, asset-tagged output. Preferred over `ethOut`/`ethOutRawWei`. */
+    /** Canonical, asset-tagged output. */
     output: AssetAmount;
-    /** Canonical, asset-tagged realized PnL for this sell. Preferred over `realizedEth`. */
+    /** Canonical, asset-tagged realized PnL for this sell. */
     realized: AssetPnl;
 }
 export declare function sellBase(opts: SellBaseOpts): Promise<SellBaseResult>;
@@ -607,9 +614,6 @@ export interface SellResult {
     txSignature: string;
     tokensIn: string;
     tokensInRaw: string;
-    solOut: string;
-    solOutRaw: number;
-    realizedSol: number;
     positionStatus: 'open' | 'closed';
     wallet: string;
     mint: string;
@@ -622,9 +626,9 @@ export interface SellResult {
     slippageSource: 'user' | 'dexscreener' | 'fallback';
     protectedExec: boolean;
     forensics?: FillForensics;
-    /** Canonical, asset-tagged output. Preferred over `solOut`/`solOutRaw`. */
+    /** Canonical, asset-tagged output. */
     output: AssetAmount;
-    /** Canonical, asset-tagged realized PnL for this sell. Preferred over `realizedSol`. */
+    /** Canonical, asset-tagged realized PnL for this sell. */
     realized: AssetPnl;
 }
 export declare function sell(opts: SellOpts): Promise<SellResult>;

package/dist/wallet-trading.js

@@ -194,28 +194,37 @@ export function normalizePosition(p) {
         }
         for (const s of p.sells) {
             if (!s.outputAsset)
-                s.outputAsset = p.entry.inputAsset;
-            // Back-fill canonical fields for sells written by pre-canonical CLIs.
-            // Raw output: lamports for SOL, 6-dec raw for USDC.
-            if (!s.output) {
-                const outAsset = s.outputAsset ?? p.entry.inputAsset;
+                s.outputAsset = p.entry.inputAsset ?? 'SOL';
+            // Back-fill canonical fields from legacy `solOut*` / `realizedSol` if the
+            // file pre-dates the canonical schema, then strip the legacy fields so
+            // they don't get re-emitted on the next write.
+            if (!s.output && s.solOutRaw !== undefined && s.solOut !== undefined) {
                 s.output = {
-                    asset: outAsset,
+                    asset: s.outputAsset,
                     raw: String(s.solOutRaw),
                     display: s.solOut,
                 };
             }
-            if (!s.realized) {
-                s.realized = { asset: s.outputAsset ?? p.entry.inputAsset, amount: s.realizedSol };
+            if (!s.realized && s.realizedSol !== undefined) {
+                s.realized = { asset: s.outputAsset, amount: s.realizedSol };
             }
+            delete s.solOut;
+            delete s.solOutRaw;
+            delete s.realizedSol;
         }
-        // Back-fill pnl.realized/unrealized for legacy files.
-        if (!p.pnl.realized) {
+        if (!p.pnl.realized && p.pnl.realizedSol !== undefined) {
             p.pnl.realized = { asset: p.entry.inputAsset, amount: p.pnl.realizedSol };
         }
-        if (!p.pnl.unrealized) {
+        if (!p.pnl.unrealized && p.pnl.unrealizedSol !== undefined) {
             p.pnl.unrealized = { asset: p.entry.inputAsset, amount: p.pnl.unrealizedSol };
         }
+        // Guarantee canonical pnl shape exists for downstream readers.
+        if (!p.pnl.realized)
+            p.pnl.realized = { asset: p.entry.inputAsset, amount: 0 };
+        if (!p.pnl.unrealized)
+            p.pnl.unrealized = { asset: p.entry.inputAsset, amount: 0 };
+        delete p.pnl.realizedSol;
+        delete p.pnl.unrealizedSol;
     }
     else {
         if (!p.entry.inputAsset)
@@ -227,24 +236,33 @@ export function normalizePosition(p) {
         }
         for (const s of p.sells) {
             if (!s.outputAsset)
-                s.outputAsset = p.entry.inputAsset;
-            if (!s.output) {
+                s.outputAsset = p.entry.inputAsset ?? 'ETH';
+            if (!s.output && s.ethOutRawWei !== undefined && s.ethOut !== undefined) {
                 s.output = {
-                    asset: s.outputAsset ?? p.entry.inputAsset,
+                    asset: s.outputAsset,
                     raw: s.ethOutRawWei,
                     display: s.ethOut,
                 };
             }
-            if (!s.realized) {
-                s.realized = { asset: s.outputAsset ?? p.entry.inputAsset, amount: s.realizedEth };
+            if (!s.realized && s.realizedEth !== undefined) {
+                s.realized = { asset: s.outputAsset, amount: s.realizedEth };
             }
+            delete s.ethOut;
+            delete s.ethOutRawWei;
+            delete s.realizedEth;
         }
-        if (!p.pnl.realized) {
+        if (!p.pnl.realized && p.pnl.realizedEth !== undefined) {
             p.pnl.realized = { asset: p.entry.inputAsset, amount: p.pnl.realizedEth };
         }
-        if (!p.pnl.unrealized) {
+        if (!p.pnl.unrealized && p.pnl.unrealizedEth !== undefined) {
             p.pnl.unrealized = { asset: p.entry.inputAsset, amount: p.pnl.unrealizedEth };
         }
+        if (!p.pnl.realized)
+            p.pnl.realized = { asset: p.entry.inputAsset, amount: 0 };
+        if (!p.pnl.unrealized)
+            p.pnl.unrealized = { asset: p.entry.inputAsset, amount: 0 };
+        delete p.pnl.realizedEth;
+        delete p.pnl.unrealizedEth;
     }
     return p;
 }
@@ -857,8 +875,6 @@ export async function buyBase(opts) {
         riskFlags: opts.riskFlags ?? [],
         sells: [],
         pnl: {
-            realizedEth: 0,
-            unrealizedEth: 0,
             unrealizedPct: 0,
             lastPricedAt: null,
             realized: { asset: inputAsset, amount: 0 },
@@ -994,7 +1010,7 @@ export async function sellBase(opts) {
     // Entry cost = entry amount + gas fee (ETH-only — fee was paid in ETH at swap time;
     // for USDC entries we treat gas as small and ignore it in the USDC accounting).
     const entryRawStr = position.entry.amountInRaw ?? position.entry.amountInRawWei;
-    let realizedEth;
+    let realizedAmount;
     const inputAsset = position.entry.inputAsset ?? 'ETH';
     if (inputAsset === 'ETH' && outputAsset === 'ETH') {
         const entryAmountWei = BigInt(entryRawStr);
@@ -1004,18 +1020,18 @@ export async function sellBase(opts) {
         const sellFeeWei = BigInt(swap.feeWei);
         const proceedsNetWei = BigInt(outRaw) - sellFeeWei;
         const realizedWei = proceedsNetWei - costWei;
-        realizedEth = Number(realizedWei) / 1e18;
+        realizedAmount = Number(realizedWei) / 1e18;
     }
     else if (inputAsset === 'USDC' && outputAsset === 'USDC') {
         // USDC in, USDC out — fees were ETH but we don't subtract them from USDC PnL.
         const entryUsdc = BigInt(entryRawStr);
         const costUsdc = (entryUsdc * tokensToSellRaw) / totalRaw;
         const realized6 = BigInt(outRaw) - costUsdc;
-        realizedEth = Number(realized6) / 1e6; // realizedEth field reused for USDC value
+        realizedAmount = Number(realized6) / 1e6;
     }
     else {
-        // Mixed in/out (rare — shouldn't happen with symmetric exit). Best-effort: native units.
-        realizedEth = 0;
+        // Mixed in/out (rare — shouldn't happen with symmetric exit). Best-effort.
+        realizedAmount = 0;
     }
     const nowIso = new Date().toISOString();
     position.sells.push({
@@ -1023,32 +1039,25 @@ export async function sellBase(opts) {
         time: nowIso,
         tokensIn: tokensInDisplay,
         tokensInRaw: tokensToSellRaw.toString(),
-        ethOut: outDisplay,
-        ethOutRawWei: outRaw,
         percentRequested: opts.percent,
-        realizedEth,
         reason: opts.reason.trim(),
         feeWei: swap.feeWei,
         slippageBpsUsed: slippageBps,
         protectedExec: !!opts.protectedExec,
         outputAsset,
-        // Canonical, asset-tagged accounting — preferred over legacy `ethOut*` fields.
         output: { asset: outputAsset, raw: outRaw, display: outDisplay },
-        realized: { asset: outputAsset, amount: realizedEth },
+        realized: { asset: outputAsset, amount: realizedAmount },
     });
-    position.pnl.realizedEth = position.sells.reduce((a, s) => a + s.realizedEth, 0);
-    position.pnl.realized = { asset: position.entry.inputAsset ?? 'ETH', amount: position.pnl.realizedEth };
+    const totalRealized = position.sells.reduce((a, s) => a + (s.realized?.amount ?? 0), 0);
+    position.pnl.realized = { asset: position.entry.inputAsset ?? 'ETH', amount: totalRealized };
     // Position closes when (a) the user explicitly sold 100% — even if the
     // on-chain balance was less than the book amount due to drift — or (b) the
-    // sum of recorded sells exceeds the book entry amount. Both paths land at
-    // status='closed', and we account for any drift between book and chain so
-    // partial sells of a drifted balance still close correctly when fully exited.
+    // sum of recorded sells exceeds the book entry amount.
     const newSoldRaw = soldRaw + tokensToSellRaw;
     const fullyExited = opts.percent >= 100 ||
         newSoldRaw + reconcileDriftRaw >= totalRaw;
     if (fullyExited) {
         position.status = 'closed';
-        position.pnl.unrealizedEth = 0;
         position.pnl.unrealizedPct = 0;
         position.pnl.unrealized = { asset: position.entry.inputAsset ?? 'ETH', amount: 0 };
     }
@@ -1063,9 +1072,6 @@ export async function sellBase(opts) {
         txHash: swap.txHash,
         tokensIn: tokensInDisplay,
         tokensInRaw: tokensToSellRaw.toString(),
-        ethOut: outDisplay,
-        ethOutRawWei: outRaw,
-        realizedEth,
         positionStatus: position.status,
         wallet: signer.address,
         mint: opts.ca,
@@ -1078,7 +1084,7 @@ export async function sellBase(opts) {
         outputAsset,
         reconcileDriftRaw: reconcileDriftRaw === 0n ? undefined : reconcileDriftRaw.toString(),
         output: { asset: outputAsset, raw: outRaw, display: outDisplay },
-        realized: { asset: outputAsset, amount: realizedEth },
+        realized: { asset: outputAsset, amount: realizedAmount },
     };
 }
 export async function syncBase(opts = {}) {
@@ -1134,7 +1140,6 @@ export async function syncBase(opts = {}) {
                 unrealizedPct = remainingCost > 0n
                     ? (Number(diff) / Number(remainingCost)) * 100
                     : 0;
-                p.pnl.unrealizedEth = unrealizedEth;
                 p.pnl.unrealizedPct = unrealizedPct;
                 p.pnl.lastPricedAt = nowIso;
                 p.pnl.unrealized = { asset: p.entry.inputAsset ?? 'ETH', amount: unrealizedEth };
@@ -1144,7 +1149,6 @@ export async function syncBase(opts = {}) {
             }
         }
         else {
-            p.pnl.unrealizedEth = 0;
             p.pnl.unrealizedPct = 0;
             p.pnl.unrealized = { asset: p.entry.inputAsset ?? 'ETH', amount: 0 };
         }
@@ -1303,8 +1307,6 @@ export async function buy(opts) {
         riskFlags: opts.riskFlags ?? [],
         sells: [],
         pnl: {
-            realizedSol: 0,
-            unrealizedSol: 0,
             unrealizedPct: 0,
             lastPricedAt: null,
             realized: { asset: inputAsset, amount: 0 },
@@ -1468,10 +1470,7 @@ export async function sell(opts) {
         time: nowIso,
         tokensIn: tokensInDisplay,
         tokensInRaw: tokensToSellRaw.toString(),
-        solOut: solOutDisplay,
-        solOutRaw,
         percentRequested: opts.percent,
-        realizedSol,
         reason: opts.reason.trim(),
         feeLamports,
         tipLamports,
@@ -1479,16 +1478,14 @@ export async function sell(opts) {
         protectedExec: !!opts.protectedExec,
         forensics,
         outputAsset,
-        // Canonical, asset-tagged accounting — preferred over legacy `solOut*` fields.
         output: { asset: outputAsset, raw: String(solOutRaw), display: solOutDisplay },
         realized: { asset: outputAsset, amount: realizedSol },
     });
-    position.pnl.realizedSol = position.sells.reduce((a, s) => a + s.realizedSol, 0);
-    position.pnl.realized = { asset: position.entry.inputAsset ?? 'SOL', amount: position.pnl.realizedSol };
+    const totalRealized = position.sells.reduce((a, s) => a + (s.realized?.amount ?? 0), 0);
+    position.pnl.realized = { asset: position.entry.inputAsset ?? 'SOL', amount: totalRealized };
     const newSoldRaw = soldRaw + tokensToSellRaw;
     if (newSoldRaw >= totalRaw) {
         position.status = 'closed';
-        position.pnl.unrealizedSol = 0;
         position.pnl.unrealizedPct = 0;
         position.pnl.unrealized = { asset: position.entry.inputAsset ?? 'SOL', amount: 0 };
     }
@@ -1521,9 +1518,6 @@ export async function sell(opts) {
         txSignature: swap.txSignature,
         tokensIn: tokensInDisplay,
         tokensInRaw: tokensToSellRaw.toString(),
-        solOut: solOutDisplay,
-        solOutRaw,
-        realizedSol,
         positionStatus: position.status,
         wallet: signer.address,
         mint: opts.ca,
@@ -1594,7 +1588,6 @@ export async function sync(opts = {}) {
                     unrealizedSol = usdcOut - remCost; // field name kept; holds USDC realized for USDC positions
                     unrealizedPct = remCost > 0 ? (unrealizedSol / remCost) * 100 : 0;
                 }
-                p.pnl.unrealizedSol = unrealizedSol;
                 p.pnl.unrealizedPct = unrealizedPct;
                 p.pnl.lastPricedAt = nowIso;
                 p.pnl.unrealized = { asset: p.entry.inputAsset ?? 'SOL', amount: unrealizedSol };
@@ -1604,7 +1597,6 @@ export async function sync(opts = {}) {
             }
         }
         else {
-            p.pnl.unrealizedSol = 0;
             p.pnl.unrealizedPct = 0;
             p.pnl.unrealized = { asset: p.entry.inputAsset ?? 'SOL', amount: 0 };
         }
@@ -1793,27 +1785,31 @@ export async function computePnl(opts = {}) {
     let usdcRealized = 0, usdcUnrealized = 0, usdcCount = 0;
     for (const p of solanaPositions) {
         const asset = p.entry.inputAsset ?? 'SOL';
+        const realized = p.pnl.realized?.amount ?? 0;
+        const unrealized = p.pnl.unrealized?.amount ?? 0;
         if (asset === 'USDC') {
-            usdcRealized += p.pnl.realizedSol; // field name kept for back-compat; value is USDC
-            usdcUnrealized += p.pnl.unrealizedSol;
+            usdcRealized += realized;
+            usdcUnrealized += unrealized;
             usdcCount += 1;
         }
         else {
-            solRealized += p.pnl.realizedSol;
-            solUnrealized += p.pnl.unrealizedSol;
+            solRealized += realized;
+            solUnrealized += unrealized;
             solCount += 1;
         }
     }
     for (const p of basePositions) {
         const asset = p.entry.inputAsset ?? 'ETH';
+        const realized = p.pnl.realized?.amount ?? 0;
+        const unrealized = p.pnl.unrealized?.amount ?? 0;
         if (asset === 'USDC') {
-            usdcRealized += p.pnl.realizedEth;
-            usdcUnrealized += p.pnl.unrealizedEth;
+            usdcRealized += realized;
+            usdcUnrealized += unrealized;
             usdcCount += 1;
         }
         else {
-            ethRealized += p.pnl.realizedEth;
-            ethUnrealized += p.pnl.unrealizedEth;
+            ethRealized += realized;
+            ethUnrealized += unrealized;
             ethCount += 1;
         }
     }
@@ -1863,8 +1859,8 @@ export async function computePnl(opts = {}) {
                 entry = { key: displayKey, realized: 0, unrealized: 0, count: 0, unit: asset, chain: 'solana' };
                 map.set(key, entry);
             }
-            entry.realized += p.pnl.realizedSol;
-            entry.unrealized += p.pnl.unrealizedSol;
+            entry.realized += p.pnl.realized?.amount ?? 0;
+            entry.unrealized += p.pnl.unrealized?.amount ?? 0;
             entry.count += 1;
         }
         for (const p of basePositions) {
@@ -1876,8 +1872,8 @@ export async function computePnl(opts = {}) {
                 entry = { key: displayKey, realized: 0, unrealized: 0, count: 0, unit: asset, chain: 'base' };
                 map.set(key, entry);
             }
-            entry.realized += p.pnl.realizedEth;
-            entry.unrealized += p.pnl.unrealizedEth;
+            entry.realized += p.pnl.realized?.amount ?? 0;
+            entry.unrealized += p.pnl.unrealized?.amount ?? 0;
             entry.count += 1;
         }
         byGroup = Array.from(map.values());