dexterm-cli 0.1.6 → 0.1.7

package/dist/packages/cli/src/live/trade.js

@@ -5,14 +5,14 @@
 // feed. Both go through the data layer's rate limiter + budget meter; neither signs, holds a key, or
 // sends a transaction — the only trade op is `executor.execute`, a TradeExecutor the UI holds behind
 // an interface (acceptance (d)).
-import { SOL_MINT, lamportsToSol, rawToTokens, positionPnl, shortPubkey, LiveLedger, withPriority, } from '../../../data/src/index.js';
-import { openTicket, ticketKey, toOrder, orderValid, buyNotionalSol, capPreflight, devnetMintWarning, DEFAULT_TYPEBACK_THRESHOLD_SOL, } from "../trade.js";
-/** task-1368: bounds on the signer's "retry in Ns" before the ticket retries a rate-limited plan by itself. */
+import { SOL_MINT, lamportsToSol, rawToTokens, positionPnl, withPriority, } from '../../../data/src/index.js';
+import { openTicket, ticketKey, toOrder, orderValid, buyNotionalSol, DEFAULT_TYPEBACK_THRESHOLD_SOL, } from "../trade.js";
+/** task-1368: bounds on a rate-limit wait ("retry in Ns"). */
 export const RETRY_MIN_MS = 1_000;
 export const RETRY_MAX_MS = 120_000;
-/** When the signer said rate-limited but gave no wait (an older signer), retry after this. */
+/** When a rate-limit error gave no wait, assume this. */
 export const RETRY_DEFAULT_MS = 10_000;
-/** The signer's rate-limit refusal, if that is what `e` is: the honest wait and its own line. */
+/** A rate-limit error, if that is what `e` is: the honest wait and its own line. */
 export function rateLimitOf(e) {
     if (!(e instanceof Error))
         return null;
@@ -25,14 +25,6 @@ export function rateLimitOf(e) {
     const ms = typeof given === 'number' && Number.isFinite(given) && given > 0 ? given : parsed ? Number(parsed[1]) * 1000 : RETRY_DEFAULT_MS;
     return { ms: Math.min(RETRY_MAX_MS, Math.max(RETRY_MIN_MS, ms)), message: plain };
 }
-/** A signer QuoteView → the SwapQuote shape the preview fill and the ticket already understand. */
-export function quoteFromView(v) {
-    return {
-        inputMint: v.inputMint, outputMint: v.outputMint, inAmount: BigInt(v.inAmountRaw), outAmount: BigInt(v.outAmountRaw), otherAmountThreshold: BigInt(v.minOutRaw),
-        mode: 'ExactIn', slippageBps: v.slippageBps, priceImpactPct: v.priceImpactPct, route: [...v.route], platformFeeBps: null, platformFeeAmount: null,
-        usdValue: v.usdValue, contextSlot: null, source: 'jupiter-swap', fetchedAt: v.fetchedAt,
-    };
-}
 /** Default bound on the confirm-time quote: after this the ticket errors instead of hanging. */
 export const CONFIRM_QUOTE_TIMEOUT_MS = 8_000;
 /** A live PAPER trade ticket over one mint. */
@@ -57,21 +49,7 @@ export class TradeTicketLive {
     confirmAbort = null;
     /** Set when the user cancels (esc) during `filling`, so confirm() leaves the ticket in editing. */
     cancelled = false;
-    // ---- LIVE (task-1328)
-    liveDeps;
-    livePositionRaw;
     onSettled;
-    signerStatus = null;
-    livePlan = null;
-    liveOutcome = null;
-    liveError = null;
-    liveProbe = false;
-    planSeq = 0;
-    // ---- task-1368: rate-limited plan → wait + auto-retry (never an error phase); the signer's SOL/USD for the preflight
-    liveRetryAt = null;
-    liveRetryMsg = null;
-    retryTimer = null;
-    liveSolUsd = null;
     constructor(dl, wallet, exec, seed, opts = {}) {
         this.dl = dl;
         this.wallet = wallet;
@@ -80,8 +58,6 @@ export class TradeTicketLive {
         this.onChange = opts.onChange ?? (() => { });
         this.threshold = opts.typebackThresholdSol ?? DEFAULT_TYPEBACK_THRESHOLD_SOL;
         this.confirmTimeoutMs = opts.confirmQuoteTimeoutMs ?? CONFIRM_QUOTE_TIMEOUT_MS;
-        this.liveDeps = opts.live ?? null;
-        this.livePositionRaw = opts.livePositionRaw ?? (() => 0n);
         this.onSettled = opts.onSettled ?? null;
         this.decimalsKnown = typeof seed.decimals === 'number' && Number.isFinite(seed.decimals) && seed.decimals > 0;
         this.ticket = openTicket(seed);
@@ -89,278 +65,8 @@ export class TradeTicketLive {
         this.refreshQuote();
     }
     positionTokensRaw() {
-        if (this.ticket.mode === 'live')
-            return this.livePositionRaw(this.ticket.mint);
         return this.wallet.position(this.ticket.mint)?.tokensRaw ?? 0n;
     }
-    // ------------------------------------------------------------------------------------ LIVE (task-1328)
-    /** Is LIVE mode available right now? A reason string when not. */
-    liveUnavailable() {
-        if (!this.liveDeps)
-            return 'LIVE trading is not available in this run';
-        if (!this.liveDeps.linked())
-            return 'no wallet linked — /wallet link first';
-        const s = this.liveDeps.signer();
-        if (!s)
-            return 'the signer process is not available';
-        if (!s.alive)
-            return 'the signer process died — restart dexterm to trade live';
-        return null;
-    }
-    /**
-     * Flip PAPER ⇄ LIVE (the user's `L`). Entering LIVE reads the signer's status (its network + caps,
-     * which the banner shows — never the UI's own flags) and refuses when no wallet is linked or the
-     * signer is down. Leaving LIVE drops any plan.
-     */
-    setMode(mode) {
-        if (this.ticket.phase !== 'editing')
-            return;
-        if (mode === this.ticket.mode)
-            return;
-        if (mode === 'live') {
-            const why = this.liveUnavailable();
-            if (why) {
-                this.ticket.message = why;
-                this.onChange();
-                return;
-            }
-            this.ticket.mode = 'live';
-            this.liveOutcome = null;
-            this.liveError = null;
-            this.livePlan = null;
-            this.liveProbe = false;
-            this.ticket.message = 'LIVE: ⏎ builds the plan in the signer · Y on the plan signs in Phantom';
-            void this.refreshSignerStatus();
-        }
-        else {
-            this.dropPlan();
-            this.ticket.mode = 'paper';
-            this.liveProbe = false;
-            this.ticket.message = 'PAPER';
-        }
-        this.refreshQuote();
-        this.onChange();
-    }
-    /** Re-read the signer's status (network, caps, panic). Null when it cannot be reached. */
-    async refreshSignerStatus() {
-        const s = this.liveDeps?.signer() ?? null;
-        if (!s) {
-            this.signerStatus = null;
-            return null;
-        }
-        try {
-            this.signerStatus = await s.status();
-        }
-        catch (e) {
-            this.signerStatus = null;
-            this.liveError = msg(e);
-        }
-        this.onChange();
-        return this.signerStatus;
-    }
-    /** LIVE ⏎: ask the signer to quote → build → decode → simulate the plan for this order. */
-    async planLive() {
-        const s = this.liveDeps?.signer() ?? null;
-        const my = ++this.planSeq;
-        this.livePlan = null;
-        this.liveOutcome = null;
-        this.liveError = null;
-        this.clearRetryTimer();
-        this.liveRetryAt = null;
-        this.liveRetryMsg = null;
-        this.onChange();
-        try {
-            if (!s || !s.alive)
-                throw new Error(this.liveUnavailable() ?? 'signer unavailable');
-            const ctx = this.ctx();
-            const order = toOrder(this.ticket, ctx);
-            if (!this.liveProbe && !orderValid(this.ticket, ctx))
-                throw new Error('order is no longer valid');
-            const [plan, status] = await Promise.all([
-                this.liveProbe ? s.probe() : s.plan({ mint: order.mint, symbol: order.symbol, side: order.side, decimals: order.decimals, amountRaw: order.amountRaw.toString(), slippageBps: order.slippageBps }),
-                s.status().catch(() => null),
-            ]);
-            if (my !== this.planSeq) {
-                void s.drop(plan.hash).catch(() => { });
-                return;
-            } // cancelled meanwhile
-            this.signerStatus = status;
-            this.livePlan = plan;
-            if (this.ticket.phase === 'planning')
-                this.ticket.phase = 'plan';
-        }
-        catch (e) {
-            if (my !== this.planSeq)
-                return;
-            // task-1368: Jupiter rate limiting is NOT a dead end. The ticket stays in `planning`, shows the signer's own
-            // line with the countdown, retries by itself when the wait is over, and `r` retries now / esc cancels.
-            const rl = this.ticket.phase === 'planning' ? rateLimitOf(e) : null;
-            if (rl) {
-                this.liveRetryAt = this.now() + rl.ms;
-                this.liveRetryMsg = rl.message;
-                this.ticket.message = `${rl.message} · r retries now · esc cancels`;
-                this.scheduleRetry(rl.ms, my);
-                return;
-            }
-            this.liveError = msg(e);
-            this.ticket.phase = 'error';
-            this.ticket.message = `plan failed: ${this.liveError}`;
-        }
-        finally {
-            this.onChange();
-        }
-    }
-    /** task-1368: the auto-retry after a rate-limited plan. Fires only if the ticket is still waiting on that very attempt. */
-    scheduleRetry(ms, seq) {
-        this.clearRetryTimer();
-        const h = setTimeout(() => {
-            this.retryTimer = null;
-            if (this.ticket.phase === 'planning' && this.planSeq === seq && this.liveRetryAt !== null)
-                void this.planLive();
-        }, Math.max(0, ms));
-        if (typeof h.unref === 'function')
-            h.unref();
-        this.retryTimer = h;
-    }
-    clearRetryTimer() {
-        if (this.retryTimer) {
-            clearTimeout(this.retryTimer);
-            this.retryTimer = null;
-        }
-    }
-    /** task-1368: `r` while rate limited — retry the plan now instead of waiting out the countdown. No-op otherwise. */
-    retryPlan() {
-        if (this.ticket.phase !== 'planning' || this.liveRetryAt === null)
-            return;
-        void this.planLive();
-    }
-    /** Ms until the automatic retry (0 when due, null when not waiting). */
-    retryInMs() {
-        return this.liveRetryAt === null ? null : Math.max(0, this.liveRetryAt - this.now());
-    }
-    /** LIVE Y on the plan: the signer re-checks caps, opens Phantom, verifies, re-simulates, submits. */
-    async confirmLive() {
-        const s = this.liveDeps?.signer() ?? null;
-        const plan = this.livePlan;
-        try {
-            if (!s || !s.alive)
-                throw new Error(this.liveUnavailable() ?? 'signer unavailable');
-            if (!plan)
-                throw new Error('no plan to confirm');
-            const out = await s.confirm(plan.hash);
-            this.liveOutcome = out;
-            if (out.kind === 'filled') {
-                this.ticket.phase = 'filled';
-                this.ticket.message = null;
-                this.liveDeps?.onFill?.();
-            }
-            else if (out.kind === 'refused') {
-                this.ticket.phase = 'refused';
-                this.ticket.message = `${out.reason}: ${out.message}`;
-            }
-            else {
-                this.ticket.phase = 'error';
-                this.ticket.message = out.error;
-            }
-            // task-1340: the settled outcome (and only that) reaches the effects. `send-unknown` is deliberately
-            // excluded: the chain may still confirm it, so there is no verdict to show.
-            const settled = settledFromConfirm(out, this.ticket.symbol, this.ticket.mint, this.liveProbe);
-            if (settled)
-                this.settle(settled);
-        }
-        catch (e) {
-            this.liveError = msg(e);
-            this.ticket.phase = 'error';
-            this.ticket.message = `confirm failed: ${this.liveError}`;
-            this.settle({ status: 'failed', side: this.ticket.side, symbol: this.ticket.symbol, mint: this.ticket.mint, sig: null, solDelta: null, pnlSol: null, pnlPct: null, ledger: 'live', reason: this.liveError });
-        }
-        finally {
-            void this.refreshSignerStatus();
-            this.onChange();
-        }
-    }
-    /** Esc while planning: forget the in-flight plan (it is dropped when it lands), or stop a rate-limit wait. */
-    cancelPlan() {
-        if (this.ticket.phase !== 'planning')
-            return;
-        this.planSeq++;
-        this.clearRetryTimer();
-        this.liveRetryAt = null;
-        this.liveRetryMsg = null;
-        this.ticket.phase = 'editing';
-        this.ticket.message = 'plan cancelled';
-        this.onChange();
-    }
-    /**
-     * task-1368: the order's size against the signer's caps, priced at the SIGNER's SOL/USD (the preview quote carries
-     * it; the status does too). Null on PAPER, without signer status, or for the probe.
-     */
-    preflight() {
-        if (this.ticket.mode !== 'live' || this.liveProbe)
-            return null;
-        const st = this.signerStatus;
-        if (!st)
-            return null;
-        const sizeSol = this.ticket.side === 'buy'
-            ? buyNotionalSol(this.ticket, this.wallet.balance())
-            : (this.quote && this.quote.inputMint === this.ticket.mint ? lamportsToSol(this.quote.outAmount) : 0);
-        return capPreflight({
-            side: this.ticket.side, sizeSol, solUsd: this.liveSolUsd ?? st.solUsd.price,
-            perTradeUsd: st.caps.perTradeUsd, dailyUsd: st.caps.dailyUsd, spentTodayUsd: st.spentTodayUsd,
-        });
-    }
-    /** task-1368 `f`: size a LIVE buy to the cap (SOL unit). Says why when it cannot. */
-    fitToCap() {
-        const pf = this.preflight();
-        if (!pf) {
-            this.ticket.message = 'fit to cap needs the signer status (press L again to re-read it)';
-            return;
-        }
-        if (pf.fitSizeSol === null) {
-            this.ticket.message = pf.sizeUsd === null && pf.sizeSol > 0 ? 'fit to cap needs the signer\'s SOL/USD price (not available yet)' : 'nothing fits: the cap is spent for today';
-            return;
-        }
-        this.ticket.sizeUnit = 'sol';
-        this.ticket.sizeInput = String(pf.fitSizeSol);
-        this.ticket.typeback = '';
-        this.receipt = null;
-        this.liveOutcome = null;
-        this.ticket.message = `fit to cap: ${pf.fitSizeSol} SOL (≤ $${pf.capUsd.toFixed(2)} with room for fees + rent)`;
-        this.scheduleQuote(0);
-    }
-    dropPlan() {
-        const plan = this.livePlan;
-        this.livePlan = null;
-        if (plan) {
-            const s = this.liveDeps?.signer();
-            if (s?.alive)
-                void s.drop(plan.hash).catch(() => { });
-        }
-    }
-    /** Make this LIVE ticket the devnet PROBE (wrap-and-unwrap, fees only). The plan comes from the signer. */
-    startProbe() {
-        const why = this.liveUnavailable();
-        if (why)
-            return why;
-        this.ticket.mode = 'live';
-        this.liveProbe = true;
-        this.ticket.phase = 'planning';
-        this.ticket.message = 'devnet probe: building the wrap-and-unwrap plan…';
-        void this.planLive();
-        return null;
-    }
-    liveView() {
-        if (this.ticket.mode !== 'live')
-            return undefined;
-        const st = this.signerStatus;
-        return {
-            signer: st, plan: this.livePlan, outcome: this.liveOutcome, error: this.liveError,
-            linked: this.liveDeps?.linked()?.publicKey ? shortPubkey(this.liveDeps.linked().publicKey) : null, probe: this.liveProbe,
-            preflight: this.preflight(),
-            retryAt: this.liveRetryAt, retryMessage: this.liveRetryMsg,
-            devnetWarning: devnetMintWarning({ network: st?.network ?? null, probe: this.liveProbe, mint: this.ticket.mint, perTradeUsd: st?.caps.perTradeUsd, dailyUsd: st?.caps.dailyUsd }),
-        };
-    }
     notionalSol() {
         if (this.ticket.side === 'buy')
             return buyNotionalSol(this.ticket, this.wallet.balance());
@@ -380,25 +86,12 @@ export class TradeTicketLive {
     /** Apply a key; refetch the warm quote on a change. Returns 'confirm'/'close' for the loop. */
     key(k) {
         const eff = ticketKey(this.ticket, k, this.ctx());
-        if (eff === 'confirm' || eff === 'close' || eff === 'plan')
+        if (eff === 'confirm' || eff === 'close')
             this.clearQuoteTimer();
         if (eff === 'changed') {
             this.receipt = null;
-            this.liveOutcome = null;
             this.scheduleQuote();
         }
-        if (eff === 'toggle-live')
-            this.setMode(this.ticket.mode === 'live' ? 'paper' : 'live');
-        if (eff === 'fit-cap')
-            this.fitToCap();
-        if (eff === 'drop-plan')
-            this.dropPlan();
-        if (eff === 'close')
-            this.dropPlan();
-        if (eff === 'plan')
-            void this.planLive();
-        if (eff === 'confirm-live')
-            void this.confirmLive();
         return eff;
     }
     clearQuoteTimer() {
@@ -438,7 +131,7 @@ export class TradeTicketLive {
     /** Fetch a warm quote for the current order (debounced by a sequence guard). */
     refreshQuote() {
         const ctx = this.ctx();
-        if (!orderValid(this.ticket, ctx) || this.ticket.phase === 'filling' || this.liveProbe) {
+        if (!orderValid(this.ticket, ctx) || this.ticket.phase === 'filling') {
             this.quote = null;
             return;
         }
@@ -447,17 +140,9 @@ export class TradeTicketLive {
         this.loading = true;
         this.error = null;
         const req = { inputMint: order.side === 'buy' ? SOL_MINT : order.mint, outputMint: order.side === 'buy' ? order.mint : SOL_MINT, amount: order.amountRaw, slippageBps: order.slippageBps, mode: 'ExactIn' };
-        // task-1368: a LIVE preview is quoted BY THE SIGNER (its own limiter paces preview, re-quote and build as one,
-        // and the build reuses this very quote); PAPER keeps the terminal's keyless adapter. A fake signer without
-        // `quote` falls back to the terminal's adapter. task-1387: the terminal quote runs at `high`
-        // priority so a user-initiated trade quote preempts the background screener/token enrichment on
-        // the shared 0.5 rps keyless `jupiter` bucket — otherwise the warm quote queues for seconds.
-        const s = this.ticket.mode === 'live' ? this.liveDeps?.signer() ?? null : null;
-        const viaSigner = s && s.alive && typeof s.quote === 'function'
-            ? s.quote({ mint: order.mint, symbol: order.symbol, side: order.side, decimals: order.decimals, amountRaw: order.amountRaw.toString(), slippageBps: order.slippageBps })
-                .then((v) => { this.liveSolUsd = v.solUsd.price; return quoteFromView(v); })
-            : null;
-        (viaSigner ?? withPriority('high', () => this.dl.jupiterSwap.quote(req)))
+        // task-1387: the quote runs at `high` priority so a user-initiated trade quote preempts the background
+        // screener/token enrichment on the shared 0.5 rps keyless `jupiter` bucket — otherwise the warm quote queues for seconds.
+        withPriority('high', () => this.dl.jupiterSwap.quote(req))
             .then((q) => { if (my !== this.seq)
             return; this.quote = q; this.quoteAt = this.now(); this.loading = false; this.onChange(); })
             .catch((e) => { if (my !== this.seq)
@@ -549,7 +234,7 @@ export class TradeTicketLive {
             this.onChange();
         }
     }
-    /** The single exit for a settled outcome (paper fill, live fill, refusal, failure). Never called with a quote. */
+    /** The single exit for a settled outcome (paper fill or failure). Never called with a quote. */
     settle(tx) {
         if (!this.onSettled)
             return;
@@ -576,7 +261,6 @@ export class TradeTicketLive {
             receipt: this.ticket.phase === 'filled' ? this.receipt : null,
             rateLimited: this.ticket.phase === 'filling' && this.jupiterPaused(),
             decimalsKnown: this.decimalsKnown,
-            live: this.liveView(),
         };
     }
 }
@@ -586,20 +270,6 @@ export function settledFromFill(f, costBeforeLamports) {
     const basis = f.side === 'sell' && costBeforeLamports !== null && costBeforeLamports > 0n ? lamportsToSol(costBeforeLamports) : null;
     return { status: 'confirmed', side: f.side, symbol: f.symbol, mint: f.mint, sig: null, solDelta: lamportsToSol(f.solDelta), pnlSol, pnlPct: basis ? pnlSol / basis : null, ledger: 'paper' };
 }
-/** A signer ConfirmView → the settled outcome, or null when there is none to show (`send-unknown`, probes). */
-export function settledFromConfirm(out, symbol, mint, probe) {
-    if (out.kind === 'send-unknown')
-        return null;
-    if (out.kind === 'filled') {
-        if (probe)
-            return null; // the devnet wrap-and-unwrap probe is not a trade
-        const f = out.fill;
-        const pnlSol = f.side === 'sell' ? lamportsToSol(BigInt(f.realizedLamports)) : 0;
-        return { status: 'confirmed', side: f.side, symbol: f.symbol || symbol, mint: f.mint || mint, sig: out.signature, solDelta: lamportsToSol(BigInt(f.solDelta)), pnlSol, pnlPct: null, ledger: 'live' };
-    }
-    const reason = out.kind === 'refused' ? `${out.reason}: ${out.message}` : out.error;
-    return { status: 'failed', side: 'buy', symbol, mint, sig: out.kind === 'send-failed' ? out.signature : null, solDelta: null, pnlSol: null, pnlPct: null, ledger: 'live', reason };
-}
 function safePreview(exec, order, q) {
     try {
         return exec.previewFill(order, q);
@@ -703,7 +373,7 @@ export class PositionsLive {
     solUsd() {
         return this.solPriceUsd;
     }
-    /** The last DexScreener mark for a mint (SOL per token), shared with the live positions source. */
+    /** The last DexScreener mark for a mint (SOL per token). */
     markOf(mint) {
         return this.marks.get(mint) ?? null;
     }
@@ -844,121 +514,6 @@ export class PositionsLive {
         };
     }
 }
-// ---------------------------------------------------------------------------------------------
-// task-1328 item 5: LIVE positions. The signer process books confirmed real fills into its live ledger
-// file; the UI reads that file READ-ONLY (never writes it) and serves the same PositionSource interface
-// the paper ledger does, so the token screen's position row and the popup chart show real positions
-// through the task-1323 selector unchanged. A CombinedPositions wraps both: live wins for a mint when
-// held live, else paper; every HeldPosition says which ledger it came from.
-/** Live positions from the signer's ledger file (read-only). A missing file reads as flat. */
-export class LivePositions {
-    kind = 'live';
-    path;
-    now;
-    mark;
-    memo = new Map();
-    rowsMemo = null;
-    solUsdValue = null;
-    constructor(path, opts = {}) {
-        this.path = path;
-        this.now = opts.now ?? (() => Date.now());
-        this.mark = opts.mark ?? (() => null);
-        if (opts.solUsd)
-            this.solUsdFn = opts.solUsd;
-    }
-    solUsdFn = () => this.solUsdValue;
-    setSolPrice(p) { if (typeof p === 'number' && Number.isFinite(p) && p > 0)
-        this.solUsdValue = p; }
-    solUsd() { return this.solUsdFn(); }
-    /** All positions (open + closed) from the ledger file, memoised HELD_MEMO_MS. Unreadable → []. */
-    positions() {
-        const now = this.now();
-        if (this.rowsMemo && now - this.rowsMemo.at >= 0 && now - this.rowsMemo.at < HELD_MEMO_MS)
-            return this.rowsMemo.rows;
-        let rows = [];
-        try {
-            const l = new LiveLedger({ path: this.path, readOnly: true });
-            try {
-                rows = l.positions();
-            }
-            finally {
-                l.close();
-            }
-        }
-        catch {
-            rows = [];
-        }
-        this.rowsMemo = { at: now, rows };
-        return rows;
-    }
-    /** task-1407: the raw ledger rows (newest first, swaps only) with network + signature, for the LIVE PnL card. */
-    fills(mint, limit = 500) {
-        try {
-            const l = new LiveLedger({ path: this.path, readOnly: true });
-            try {
-                return l.trades(limit * 2).filter((r) => r.kind === 'swap' && r.mint === mint).slice(0, limit);
-            }
-            finally {
-                l.close();
-            }
-        }
-        catch {
-            return [];
-        }
-    }
-    /** Confirmed live fills (newest first) for the popup markers / history; probes excluded. */
-    records(limit = 100, mint) {
-        try {
-            const l = new LiveLedger({ path: this.path, readOnly: true });
-            try {
-                return l.records(limit, mint);
-            }
-            finally {
-                l.close();
-            }
-        }
-        catch {
-            return [];
-        }
-    }
-    held(mint) {
-        const now = this.now();
-        const m = this.memo.get(mint);
-        if (m && now - m.at >= 0 && now - m.at < HELD_MEMO_MS)
-            return m.v;
-        const p = this.positions().find((x) => x.mint === mint) ?? null;
-        const v = p ? heldFromPaper(p, this.mark(mint)) : null;
-        if (v)
-            v.kind = 'live';
-        if (this.memo.size > 64)
-            this.memo.clear();
-        this.memo.set(mint, { at: now, v });
-        return v;
-    }
-    /** task-1473 r2: mints of the open live positions (the AI-scan PnL chip). Memoised with positions(). */
-    openMints() { return this.positions().filter((p) => p.tokensRaw > 0n).map((p) => p.mint); }
-    /** Forget memoised reads (after a fill). */
-    invalidate() { this.memo.clear(); this.rowsMemo = null; }
-}
-/** Paper + live behind one PositionSource: live wins for a mint when held live, else paper. */
-export class CombinedPositions {
-    kind = 'paper';
-    paper;
-    live;
-    constructor(paper, live) { this.paper = paper; this.live = live; }
-    held(mint) {
-        const l = this.live?.held(mint) ?? null;
-        if (l)
-            return l;
-        const p = this.paper.held(mint);
-        if (p)
-            p.kind = 'paper';
-        return p;
-    }
-    solUsd() { return this.paper.solUsd() ?? this.live?.solUsd() ?? null; }
-    /** task-1473 r2: every open mint, live first (the AI-scan PnL chip picks one). */
-    openMints() { return [...new Set([...(this.live?.openMints() ?? []), ...this.paper.openMints()])]; }
-}
 function msg(e) {
     return e instanceof Error ? e.message : String(e);
 }

package/dist/packages/cli/src/live/watchlist.js

@@ -49,7 +49,7 @@ export class WatchlistLive {
             this.store.propose({ mint: c.mint, kind: 'mcap', op: '<', value: c.mcap * 0.5, note: 'half mcap vs add' });
             proposed = 2;
         }
-        this.store.log({ mint: c.mint, kind: 'watch', level: 'info', text: `${c.symbol} added to watchlist${c.price !== null ? ` at ${fmtPrice(c.price)}` : c.mcap ? ` at ${fmtAny('mcap', c.mcap)} mcap` : ''}` });
+        this.store.log({ mint: c.mint, kind: 'watch', level: 'info', text: `${c.symbol} added to watchlist${c.mcap ? ` at ${fmtAny('mcap', c.mcap)} mcap${c.price !== null ? ` (${fmtPrice(c.price)})` : ''}` : c.price !== null ? ` at ${fmtPrice(c.price)}` : ''}` }); // task-1537: the cap first, both kept
         this.notice = `watching $${c.symbol}${proposed ? ` · ${proposed} alert proposals (y to arm, x to dismiss)` : ' · no price or mcap yet, so no alert proposals'}`;
         this.onChange?.();
         return 'added';