dexterm-cli 0.1.6 → 0.1.7

package/dist/packages/cli/src/screens/ticket.js

@@ -1,14 +1,11 @@
-// dexterm — trade ticket screen (task-1310 T0 PAPER; task-1328 T2 LIVE). PAPER: a simulated buy/sell
-// priced from a live keyless Jupiter quote, every frame labelled PAPER. LIVE: the same ticket in LIVE
-// mode — ⏎ asks the SIGNER PROCESS to quote → build → decode → simulate and shows the PLAN (what will be
-// signed, in/out, impact as a percent, fee, route, the signer's caps verdict); Y is the keypress; the
-// signer then opens Phantom. The banner's network comes from the signer's own status (classified from
-// the RPC it talks to) — never from a flag the UI holds, so the label cannot disagree with the
-// connection. Pure renderer: the state machine + bindings live elsewhere; nothing here signs.
-import { Canvas, badge, header, footer, breakpoint, mix, isCalm, fmtPrice, fmtPriceBare, fmtAmount, fmtPct, } from '../../../tui/src/index.js';
+// dexterm — trade ticket screen (task-1310 T0). PAPER only: a simulated buy/sell priced from a live keyless
+// Jupiter quote, every frame labelled PAPER. task-1571: there is no LIVE ticket — dexterm holds no key and signs
+// nothing; live trading happens in the Telegram trading bot of the user's choice. Pure renderer.
+import { Canvas, badge, header, footer, breakpoint, mix, isCalm, fmtPrice, fmtPriceBare, fmtAmount, fmtPct, fmtMcap, } from '../../../tui/src/index.js';
+import { priceModeOf, supplyForMint } from "../display.js";
 import { lamportsToSol, rawToTokens } from '../../../data/src/index.js';
 import { headerModel } from "../state.js";
-import { slippageBps, simFailureHint } from "../trade.js";
+import { slippageBps } from "../trade.js";
 function fmtSol(sol, digits = 4) {
     const a = Math.abs(sol);
     return `${a.toFixed(digits)} SOL`;
@@ -22,83 +19,41 @@ function tokenAmount(raw, decimals, symbol, decimalsKnown) {
         return `${symbol}: decimals unknown yet (raw ${raw.toString()})`;
     return `${fmtAmount(rawToTokens(raw, decimals))} ${symbol}`;
 }
-/** Word-wrap `text` into at most `maxLines` lines of `width` columns; the last line is cut with an ellipsis. */
-function wrapLines(text, width, maxLines) {
-    const words = text.split(/\s+/).filter((w) => w.length > 0);
-    const lines = [];
-    let cur = '';
-    for (const w of words) {
-        const next = cur ? `${cur} ${w}` : w;
-        if (next.length <= width) {
-            cur = next;
-            continue;
-        }
-        if (cur)
-            lines.push(cur);
-        cur = w.length > width ? `${w.slice(0, Math.max(1, width - 1))}…` : w;
-        if (lines.length === maxLines)
-            break;
-    }
-    if (cur && lines.length < maxLines)
-        lines.push(cur);
-    if (lines.length > maxLines)
-        lines.length = maxLines;
-    const joined = lines.join(' ');
-    if (joined.length < text.length && lines.length === maxLines) {
-        const last = lines[maxLines - 1];
-        lines[maxLines - 1] = last.length >= width - 1 ? `${last.slice(0, Math.max(1, width - 1))}…` : `${last}…`;
-    }
-    return lines;
-}
 export function renderTicket(c, state) {
     const t = c.theme;
     header(c, headerModel(state));
     const bp = breakpoint(c.w);
     // Live binding is the source of truth; the seeded demo view backs fixture/one-shot frames.
     const view = (state.live?.ticket ? state.live.ticket.view() : state.ticket) ?? null;
-    const live = view?.live ?? null;
-    const isLive = !!live;
-    // Always-on banner strip (never hidden, any state). PAPER = warn tint; LIVE = the signer's network.
+    // Always-on banner strip (never hidden, any state).
     const bannerY = 2;
-    const net = live?.signer?.network ?? null; // the SIGNER's classified network, or unknown
-    const mainnet = net === 'mainnet';
-    const bannerColor = !isLive ? t.warn : mainnet ? t.down : t.up;
-    c.fill(0, bannerY, c.w, 1, ' ', { bg: mix(t.bg, bannerColor, mainnet ? 0.3 : 0.16) });
-    const banner = !isLive
-        ? ' ◈ PAPER TRADING — simulated · no real orders · no keys · no signing '
-        : net === null
-            ? ' ◉ LIVE — signer not reachable · nothing can be signed '
-            : mainnet
-                ? ` ⚠ LIVE · MAINNET — REAL FUNDS · caps $${live?.signer?.caps.perTradeUsd ?? '?'}/trade $${live?.signer?.caps.dailyUsd ?? '?'}/day · Phantom signs · dexterm holds no key `
-                : ` ◉ LIVE · DEVNET — real signing via Phantom · devnet funds only · dexterm holds no key `;
-    c.text(2, bannerY, banner, { fg: bannerColor, bg: mix(t.bg, bannerColor, mainnet ? 0.3 : 0.16), b: true });
+    const bannerColor = t.warn;
+    c.fill(0, bannerY, c.w, 1, ' ', { bg: mix(t.bg, bannerColor, 0.16) });
+    c.text(2, bannerY, ' ◈ PAPER TRADING — simulated · no real orders · no keys · no signing ', { fg: bannerColor, bg: mix(t.bg, bannerColor, 0.16), b: true });
     const linked = state.live?.linkedWallet;
     if (linked)
-        c.textR(2, bannerY, c.w - 3, `linked: ${linked.publicKey.slice(0, 4)}…${linked.publicKey.slice(-4)} `, { fg: t.muted, bg: mix(t.bg, bannerColor, mainnet ? 0.3 : 0.16) });
+        c.textR(2, bannerY, c.w - 3, `linked: ${linked.publicKey.slice(0, 4)}…${linked.publicKey.slice(-4)} `, { fg: t.muted, bg: mix(t.bg, bannerColor, 0.16) });
     c.noRain(0, bannerY, c.w, 1);
-    if (live && (live.signer?.panic || live.signer?.ledgerLocked)) {
-        c.fill(0, bannerY + 1, c.w, 1, ' ', { bg: mix(t.bg, t.down, 0.3) });
-        c.text(2, bannerY + 1, ' ⛔ PANIC — live signing is disabled · re-enable only from a shell: dexterm wallet resume ', { fg: t.down, bg: mix(t.bg, t.down, 0.3), b: true });
-        c.noRain(0, bannerY + 1, c.w, 1);
-    }
     if (!view) {
-        c.text(2, 4, 'Open a trade ticket from a token screen:  B buy · S sell   (L on the ticket flips PAPER ⇄ LIVE)', { fg: t.muted, bg: t.bg });
+        c.text(2, 4, 'Open a paper trade ticket from a token screen:  B buy · S sell', { fg: t.muted, bg: t.bg });
         footer(c, [['esc', 'back'], ['P', 'positions'], ['q', 'quit']], t.name, isCalm(state.vfx));
         return;
     }
     const ts = view.ticket;
+    const mode = priceModeOf(state); // task-1537: fills and prices read as market caps by default
+    const sup = supplyForMint(state, ts.mint);
     const buy = ts.side === 'buy';
     const sideColor = buy ? t.up : t.down;
     const top = 4;
     const w = Math.min(bp === 'compact' ? c.w - 2 : 78, c.w - 2);
     const x0 = 1;
     const h = c.h - top - 1;
-    const title = isLive ? `◉ LIVE ${live?.probe ? 'DEVNET PROBE' : `${ts.side.toUpperCase()} TICKET`}` : `◈ PAPER ${ts.side.toUpperCase()} TICKET`;
-    const caption = isLive ? `signer process · jupiter quote · phantom signs${net ? ` · ${net}` : ''}` : 'jupiter keyless quote · paper fill';
+    const title = `◈ PAPER ${ts.side.toUpperCase()} TICKET`;
+    const caption = 'jupiter keyless quote · paper fill';
     // task-1340: the ticket is PLAIN by construction — no heading (no chromatic split on its title) and every cell of
     // its rect is shielded below, so no effect pass (rain, mosh, shake, scanlines, trade moments) can write a glyph, a
     // colour or a background into it in any phase. The banner rows above it are shielded too.
-    const box = c.box(x0, top, w, h, { title, titleFg: isLive && mainnet ? t.down : sideColor, caption, captionFg: t.dim, border: mix(t.border, isLive && mainnet ? t.down : sideColor, 0.5), plain: true });
+    const box = c.box(x0, top, w, h, { title, titleFg: sideColor, caption, captionFg: t.dim, border: mix(t.border, sideColor, 0.5), plain: true });
     c.shieldRect(x0, top, w, h);
     c.shieldRect(0, bannerY, c.w, 2);
     const bg = box.bg;
@@ -109,24 +64,18 @@ export function renderTicket(c, state) {
     let x = c.text(ix, y, `$${ts.symbol}`, { fg: t.borderFocus, bg, b: true });
     x = c.text(x + 1, y, `${ts.mint.slice(0, 4)}…${ts.mint.slice(-4)}`, { fg: t.dim, bg });
     x = badge(c, x + 2, y, buy ? '▲ BUY' : '▼ SELL', sideColor, { on: bg, bold: true }) + 1;
-    x = badge(c, x + 1, y, isLive ? 'LIVE' : 'PAPER', isLive ? (mainnet ? t.down : t.up) : t.warn, { on: bg, bold: true }) + 1;
-    c.textR(ix, y, iw, ts.phase === 'editing' ? '← → flip side · L paper⇄live' : '', { fg: t.dim, bg });
+    x = badge(c, x + 1, y, 'PAPER', t.warn, { on: bg, bold: true }) + 1;
+    c.textR(ix, y, iw, ts.phase === 'editing' ? '← → flip side' : '', { fg: t.dim, bg });
     y += 2;
     // size field
-    if (!live?.probe) {
-        const sizeUnit = buy ? (ts.sizeUnit === 'sol' ? 'SOL' : '% of balance') : '% of position';
-        field(c, ix, y, iw, bg, 'Size', `${ts.sizeInput || '—'} ${sizeUnit}`, ts.field === 'size' && ts.phase === 'editing', t);
-        y += 1;
-        field(c, ix, y, iw, bg, 'Slippage', `${slippageBps(ts)} bps`, ts.field === 'slippage' && ts.phase === 'editing', t);
-        y += 2;
-    }
-    const showPlan = isLive && live && live.plan && (ts.phase === 'plan' || ts.phase === 'signing' || ts.phase === 'filled' || ts.phase === 'refused' || ts.phase === 'error');
-    if (showPlan && live?.plan) {
-        y = renderPlan(c, ix, y, iw, bg, live, ts.decimals, ts.symbol, buy, state.now.getTime());
-    }
-    else {
-        // quote block (paper warm quote; LIVE editing shows the same keyless quote as a preview)
-        c.text(ix, y, isLive ? 'PREVIEW QUOTE (keyless; the signer re-quotes on ⏎)' : 'QUOTE', { fg: t.dim, bg });
+    const sizeUnit = buy ? (ts.sizeUnit === 'sol' ? 'SOL' : '% of balance') : '% of position';
+    field(c, ix, y, iw, bg, 'Size', `${ts.sizeInput || '—'} ${sizeUnit}`, ts.field === 'size' && ts.phase === 'editing', t);
+    y += 1;
+    field(c, ix, y, iw, bg, 'Slippage', `${slippageBps(ts)} bps`, ts.field === 'slippage' && ts.phase === 'editing', t);
+    y += 2;
+    {
+        // quote block (the paper warm quote)
+        c.text(ix, y, 'QUOTE', { fg: t.dim, bg });
         c.textR(ix, y, iw, view.loading ? '· fetching…' : view.quote ? `· ${Math.max(0, Math.round((view.quoteAgeMs ?? 0) / 1000))}s ago` : view.error ? '· unavailable' : '', { fg: view.error ? t.down : t.dim, bg });
         c.hline(box.x + 1, y + 1, box.w - 2, { fg: t.border, bg, soft: true });
         y += 2;
@@ -139,51 +88,29 @@ export function renderTicket(c, state) {
             const recv = buy ? tokenAmount(tokenAbs, ts.decimals, ts.symbol, decimalsKnown) : `${fmtSol(lamportsToSol(preview.solDelta))}`;
             kv(c, ix, y++, iw, bg, 'You pay', spend, t, buy ? t.down : t.text);
             kv(c, ix, y++, iw, bg, 'You receive', recv, t, buy && !decimalsKnown ? t.warn : t.up);
-            kv(c, ix, y++, iw, bg, 'Price', decimalsKnown ? `${fmtPriceBare(preview.priceSol)} SOL${preview.priceUsd !== null ? `  ·  ${fmtPrice(preview.priceUsd)}` : ''}` : 'per-token price needs the decimals', t, decimalsKnown ? t.text : t.warn);
+            // task-1537: in the market-cap basis (default) the fill price reads as the cap it buys/sells at, the price beside it
+            const capAt = mode === 'mcap' && sup !== null && preview.priceUsd !== null ? fmtMcap(preview.priceUsd * sup) : null;
+            kv(c, ix, y++, iw, bg, capAt ? 'At mcap' : 'Price', decimalsKnown ? `${capAt ? `${capAt}  ·  ` : ''}${fmtPriceBare(preview.priceSol)} SOL${preview.priceUsd !== null ? `  ·  ${fmtPrice(preview.priceUsd)}` : ''}` : 'per-token price needs the decimals', t, decimalsKnown ? t.text : t.warn);
             const impact = preview.priceImpactPct;
             kv(c, ix, y++, iw, bg, 'Price impact', impact === null ? '—' : fmtPct(impact, { sign: false }), t, impact !== null && impact > 5 ? t.down : impact !== null && impact > 1 ? t.warn : t.muted);
             kv(c, ix, y++, iw, bg, 'Min received', buy ? tokenAmount(q.otherAmountThreshold, ts.decimals, ts.symbol, decimalsKnown) : fmtSol(lamportsToSol(q.otherAmountThreshold)), t, t.muted);
-            kv(c, ix, y++, iw, bg, isLive ? 'Est. fee' : 'Sim fee', fmtSol(lamportsToSol(preview.feeLamports), 6), t, t.muted);
+            kv(c, ix, y++, iw, bg, 'Sim fee', fmtSol(lamportsToSol(preview.feeLamports), 6), t, t.muted);
             kv(c, ix, y++, iw, bg, 'Route', q.route.length ? q.route.join(' → ') : 'direct', t, t.accent);
         }
         else if (view.error) {
             c.text(ix, y++, `⚠ ${view.error}`, { fg: t.down, bg }, iw);
         }
-        else if (live?.probe) {
-            c.text(ix, y++, 'wrap 0.001 SOL into your own WSOL account, sync, memo, close it back — fees only', { fg: t.dim, bg }, iw);
-        }
         else {
             c.text(ix, y++, view.loading ? 'fetching a live quote…' : 'enter a size to see a quote', { fg: t.dim, bg }, iw);
         }
-        // task-1368 items b + c: BEFORE ⏎ on a LIVE ticket — the size in USD against the signer's caps (red when the
-        // signer would refuse it, with the size that fits), and the devnet-cannot-fill-mainnet-tokens line.
-        if (isLive && live && !live.probe && ts.phase === 'editing') {
-            const pf = live.preflight ?? null;
-            if (pf) {
-                const color = pf.over ? t.down : pf.sizeUsd === null && pf.sizeSol > 0 ? t.warn : t.muted;
-                for (const line of wrapLines(`${pf.over ? '✗ ' : ''}${pf.line}`, iw, 2))
-                    c.text(ix, y++, line, { fg: color, bg, b: pf.over }, iw);
-            }
-            if (live.devnetWarning)
-                for (const line of wrapLines(`⚠ ${live.devnetWarning}`, iw, 2))
-                    c.text(ix, y++, line, { fg: t.warn, bg, b: true }, iw);
-        }
         y += 1;
     }
     // wallet line
     c.hline(box.x + 1, y, box.w - 2, { fg: t.border, bg, soft: true });
     y += 1;
-    if (isLive) {
-        kv(c, ix, y++, iw, bg, 'Signer', live?.signer ? `${live.signer.network.toUpperCase()} · ${live.signer.rpcHost} · pid ${live.signer.pid}` : (live?.error ?? 'not reachable'), t, live?.signer ? t.text : t.down);
-        if (live?.signer)
-            kv(c, ix, y++, iw, bg, 'Caps', `$${live.signer.caps.perTradeUsd}/trade · $${live.signer.caps.dailyUsd}/day · spent $${live.signer.spentTodayUsd.toFixed(2)} · impact ≤ ${live.signer.caps.maxPriceImpactPct}% · ≤ ${live.signer.caps.maxSolOut} SOL out`, t, t.muted);
-        kv(c, ix, y++, iw, bg, 'Wallet', live?.linked ? `${live.linked} (Phantom signs; dexterm holds no key)` : 'none linked', t, live?.linked ? t.text : t.down);
-    }
-    else {
-        kv(c, ix, y++, iw, bg, 'Paper balance', fmtSol(view.balanceSol), t, t.text);
-    }
+    kv(c, ix, y++, iw, bg, 'Paper balance', fmtSol(view.balanceSol), t, t.text);
     if (!buy || view.positionTokens > 0)
-        kv(c, ix, y++, iw, bg, `Position`, `${fmtAmount(view.positionTokens)} ${ts.symbol}${isLive ? ' (live ledger)' : ''}`, t, t.muted);
+        kv(c, ix, y++, iw, bg, `Position`, `${fmtAmount(view.positionTokens)} ${ts.symbol}`, t, t.muted);
     y += 1;
     // gate / receipt region
     const gy = box.y + box.h - 3;
@@ -201,127 +128,33 @@ export function renderTicket(c, state) {
         if (ts.message)
             c.text(ix, gy + 1, ts.message, { fg: t.warn, bg: tint }, iw);
     }
-    else if (ts.phase === 'planning' && live?.retryAt) {
-        // task-1368: rate limited by Jupiter — the plan is NOT dropped; countdown + r / esc.
-        const left = Math.max(0, Math.ceil((live.retryAt - state.now.getTime()) / 1000));
-        const what = (live.retryMessage ?? 'Jupiter is rate limiting this IP').replace(/; retry in \d+s$/, '');
-        c.fill(box.x + 1, gy, box.w - 2, 2, ' ', { bg: mix(bg, t.warn, 0.18) });
-        c.text(ix, gy, `⚠ ${what}, retrying in ${left}s`, { fg: t.warn, bg: mix(bg, t.warn, 0.18), b: true }, iw);
-        c.text(ix, gy + 1, 'r = retry now · esc = cancel · the plan is kept (nothing was built or signed)', { fg: t.muted, bg: mix(bg, t.warn, 0.18) }, iw);
-    }
-    else if (ts.phase === 'planning') {
-        c.text(ix, gy, 'signer: quote → build → decode → policy → simulate…   (esc cancels)', { fg: t.ai, bg, b: true }, iw);
-    }
-    else if (ts.phase === 'plan' && live?.plan) {
-        const refused = !live.plan.policy.ok || !live.plan.precheck.ok;
-        c.fill(box.x + 1, gy, box.w - 2, 2, ' ', { bg: tint });
-        if (refused) {
-            const v = !live.plan.policy.ok ? live.plan.policy : live.plan.precheck;
-            c.text(ix, gy, `✗ the signer WILL REFUSE this plan: ${v.reason ?? ''} — ${v.message ?? ''}`, { fg: t.down, bg: tint, b: true }, iw);
-            c.text(ix, gy + 1, 'esc back to editing (Y asks anyway and gets the signer\'s refusal)', { fg: t.muted, bg: tint }, iw);
-        }
-        else if (ts.typebackRequired) {
-            c.text(ix, gy, `⚠ large order — type the size (${ts.sizeInput}) then press Y to sign in Phantom:`, { fg: t.warn, bg: tint, b: true }, iw);
-            c.text(ix, gy + 1, `▌ ${ts.typeback || ''}`, { fg: t.text, bg: tint, b: true });
-        }
-        else {
-            c.text(ix, gy, `${mainnet ? '⚠ REAL FUNDS · ' : ''}Y = sign this exact plan in Phantom   (esc cancels · any other key cancels)`, { fg: mainnet ? t.down : sideColor, bg: tint, b: true }, iw);
-            c.text(ix, gy + 1, `the signer re-checks caps, verifies the signed bytes and re-simulates before it submits`, { fg: t.muted, bg: tint }, iw);
-        }
-        if (ts.message)
-            c.text(ix, gy + 1, ts.message, { fg: t.warn, bg: tint }, iw);
-    }
-    else if (ts.phase === 'signing') {
-        c.text(ix, gy, 'approve in Phantom (browser) — the signer verifies, re-simulates and submits…', { fg: t.ai, bg, b: true }, iw);
-        c.text(ix, gy + 1, 'nothing is sent until the signed bytes match the plan', { fg: t.muted, bg }, iw);
-    }
     else if (ts.phase === 'filling') {
         const line = view.rateLimited
             ? '⚠ rate limited by Jupiter — retrying…   (esc cancels)'
             : 'booking paper fill from a fresh quote…   (esc cancels)';
         c.text(ix, gy, line, { fg: view.rateLimited ? t.warn : t.ai, bg, b: true }, iw);
     }
-    else if (ts.phase === 'filled' && isLive && live?.outcome?.kind === 'filled') {
-        const o = live.outcome;
-        const got = live.probe ? `wrap-and-unwrap confirmed · fee ${fmtSol(lamportsToSol(BigInt(o.fill.feeLamports)), 6)}` : `${fmtAmount(rawToTokens(o.fill.side === 'buy' ? BigInt(o.fill.tokenDelta) : -BigInt(o.fill.tokenDelta), o.fill.decimals))} ${o.fill.symbol} @ ${fmtPriceBare(o.fill.priceSol)} SOL`;
-        c.text(ix, gy, `✓ LIVE ${o.network.toUpperCase()} ${live.probe ? 'PROBE' : o.fill.side.toUpperCase()} confirmed — ${got}${o.lighthouseTail ? ` · +${o.lighthouseTail} Lighthouse` : ''}`, { fg: t.up, bg, b: true }, iw);
-        c.text(ix, gy + 1, `sig ${o.signature.slice(0, 12)}…${o.signature.slice(-6)} · esc=back · P=positions`, { fg: t.muted, bg }, iw);
-    }
     else if (ts.phase === 'filled' && view.receipt) {
         const r = view.receipt;
         const got = r.side === 'buy' ? `${fmtAmount(rawToTokens(r.tokenDelta, r.decimals))} ${r.symbol}` : fmtSol(lamportsToSol(r.solDelta));
-        c.text(ix, gy, `✓ PAPER ${r.side.toUpperCase()} filled — ${got} @ ${fmtPriceBare(r.priceSol)} SOL`, { fg: t.up, bg, b: true }, iw);
+        const at = mode === 'mcap' && sup !== null && r.priceUsd !== null ? `${fmtMcap(r.priceUsd * sup)} mcap (${fmtPriceBare(r.priceSol)} SOL)` : `${fmtPriceBare(r.priceSol)} SOL`; // task-1537
+        c.text(ix, gy, `✓ PAPER ${r.side.toUpperCase()} filled — ${got} @ ${at}`, { fg: t.up, bg, b: true }, iw);
         const extra = r.side === 'sell' ? `realized ${r.realizedLamports >= 0n ? '+' : ''}${fmtSol(lamportsToSol(r.realizedLamports))}` : 'cost booked to position';
         c.text(ix, gy + 1, `${extra} · esc=back to token · P=positions`, { fg: t.muted, bg }, iw);
     }
-    else if (ts.phase === 'refused') {
-        c.text(ix, gy, `✗ REFUSED by the signer — ${ts.message ?? 'refused'}`, { fg: t.down, bg, b: true }, iw);
-        c.text(ix, gy + 1, 'nothing was signed or sent · esc=back · any key = new ticket', { fg: t.muted, bg }, iw);
-    }
     else if (ts.phase === 'error') {
-        const unknown = live?.outcome?.kind === 'send-unknown';
         c.text(ix, gy, `⚠ ${ts.message ?? 'order failed'}`, { fg: t.down, bg, b: true }, iw);
-        c.text(ix, gy + 1, unknown && live?.outcome?.kind === 'send-unknown' ? `sig ${live.outcome.signature.slice(0, 12)}… · DO NOT resend · check the explorer · esc=back` : 'esc=back to token · P=positions', { fg: unknown ? t.warn : t.muted, bg }, iw);
+        c.text(ix, gy + 1, 'esc=back to token · P=positions', { fg: t.muted, bg }, iw);
     }
     else {
-        c.text(ix, gy, isLive ? `⏎ build the plan in the signer → Y signs in Phantom   ·   gate ${ts.gateOn ? 'ON' : 'off'}` : `⏎ review → Y confirm   ·   gate ${ts.gateOn ? 'ON' : 'off'} (keypress required)`, { fg: t.muted, bg }, iw);
+        c.text(ix, gy, `⏎ review → Y confirm   ·   gate ${ts.gateOn ? 'ON' : 'off'} (keypress required)`, { fg: t.muted, bg }, iw);
         if (ts.message)
             c.text(ix, gy + 1, ts.message, { fg: t.warn, bg }, iw);
     }
-    const keys = [['⏎', isLive ? 'plan' : 'review'], ['Y', isLive ? 'sign' : 'confirm'], ['L', isLive ? 'paper' : 'live'], ['tab', 'field'], ['←→', 'side'], ['u', 'unit']];
-    if (isLive && buy && ts.phase === 'editing' && !live?.probe)
-        keys.push(['f', 'fit cap']);
-    if (ts.phase === 'planning' && live?.retryAt)
-        keys.push(['r', 'retry now']);
+    const keys = [['⏎', 'review'], ['Y', 'confirm'], ['tab', 'field'], ['←→', 'side'], ['u', 'unit']];
     keys.push(['esc', 'cancel'], ['P', 'positions']);
     footer(c, keys, t.name, isCalm(state.vfx));
 }
-/** The PLAN block: everything the signer will sign, from the signer's own view. */
-function renderPlan(c, ix, y, iw, bg, live, decimals, symbol, buy, now) {
-    const t = c.theme;
-    const p = live.plan;
-    const left = Math.max(0, Math.round((p.expiresAt - now) / 1000));
-    c.text(ix, y, `PLAN · ${p.network.toUpperCase()} · ${p.kind === 'probe' ? 'devnet probe' : 'jupiter swap'}`, { fg: p.network === 'mainnet' ? t.down : t.up, bg, b: true });
-    c.textR(ix, y, iw, `expires in ${left}s · ${p.hash.slice(0, 8)}`, { fg: left < 15 ? t.warn : t.dim, bg });
-    c.hline(ix - 1, y + 1, iw + 2, { fg: t.border, bg, soft: true });
-    y += 2;
-    const inRaw = BigInt(p.amountInRaw), outRaw = BigInt(p.amountOutRaw), minRaw = BigInt(p.minOutRaw);
-    if (p.kind === 'probe') {
-        kv(c, ix, y++, iw, bg, 'Wraps', `${fmtSol(lamportsToSol(inRaw))} → your own WSOL account → back to you`, t, t.text);
-    }
-    else {
-        // The plan's decimals are the ones the order was built with (the signer echoes them back).
-        const pay = buy ? fmtSol(lamportsToSol(inRaw)) : `${fmtAmount(rawToTokens(inRaw, p.decimals ?? decimals))} ${symbol}`;
-        const recv = buy ? `${fmtAmount(rawToTokens(outRaw, p.decimals ?? decimals))} ${symbol}` : fmtSol(lamportsToSol(outRaw));
-        const min = buy ? `${fmtAmount(rawToTokens(minRaw, p.decimals ?? decimals))} ${symbol}` : fmtSol(lamportsToSol(minRaw));
-        kv(c, ix, y++, iw, bg, 'You pay', pay, t, buy ? t.down : t.text);
-        kv(c, ix, y++, iw, bg, 'You receive', recv, t, t.up);
-        kv(c, ix, y++, iw, bg, 'Min received', `${min} (${p.slippageBps} bps slippage)`, t, t.muted);
-        const impact = p.priceImpactPct;
-        kv(c, ix, y++, iw, bg, 'Price impact', impact === null ? 'unknown' : fmtPct(impact, { sign: false }), t, impact !== null && impact > 3 ? t.down : impact !== null && impact > 1 ? t.warn : t.muted);
-        kv(c, ix, y++, iw, bg, 'Route', p.route.length ? p.route.join(' → ') : 'direct', t, t.accent);
-    }
-    kv(c, ix, y++, iw, bg, 'Fee', `${fmtSol(lamportsToSol(BigInt(p.feeLamports)), 6)}${p.prioritizationFeeLamports ? ` (incl. ${p.prioritizationFeeLamports} lamports priority)` : ''}`, t, t.muted);
-    kv(c, ix, y++, iw, bg, 'Notional', p.notionalUsd !== null ? `$${p.notionalUsd.toFixed(2)} (SOL $${p.solUsd.price?.toFixed(2) ?? '?'} via ${p.solUsd.sources?.join('+') ?? '?'})` : (p.network === 'mainnet' ? `unpriced — ${p.solUsd.reason ?? ''}` : 'devnet (no USD value)'), t, p.notionalUsd === null && p.network === 'mainnet' ? t.down : t.muted);
-    if (!p.sim.ran || p.sim.ok) {
-        kv(c, ix, y++, iw, bg, 'Simulation', !p.sim.ran ? 'not run' : `ok · ${p.sim.solOutLamports !== null ? `${fmtSol(lamportsToSol(BigInt(p.sim.solOutLamports)), 6)} leaves the wallet` : 'wallet delta unknown'}`, t, p.sim.ok ? t.up : t.down);
-    }
-    else {
-        // task-1368 item f: the FULL RPC error, wrapped (it used to be cut to `invalid transaction: Tr…`), then the hint.
-        kv(c, ix, y++, iw, bg, 'Simulation', 'FAILED', t, t.down);
-        for (const line of wrapLines(p.sim.error ?? 'unknown error', iw - 2, 3))
-            c.text(ix + 2, y++, line, { fg: t.down, bg }, iw - 2);
-        const hint = simFailureHint(p, live.signer ? { perTradeUsd: live.signer.caps.perTradeUsd, dailyUsd: live.signer.caps.dailyUsd } : undefined);
-        if (hint)
-            for (const line of wrapLines(`↳ ${hint}`, iw - 2, 4))
-                c.text(ix + 2, y++, line, { fg: t.warn, bg }, iw - 2);
-    }
-    const ins = p.instructions.map((i) => `${i.program}${i.op ? `:${i.op}` : ''}`).join(' · ');
-    kv(c, ix, y++, iw, bg, 'Will sign', ins || '—', t, t.text);
-    kv(c, ix, y++, iw, bg, 'Policy', p.policy.ok ? 'swap shape ok · route bound to this plan · no fee account' : `REFUSE ${p.policy.reason}: ${p.policy.message}`, t, p.policy.ok ? t.up : t.down);
-    kv(c, ix, y++, iw, bg, 'Caps', p.precheck.ok ? 'within caps' : `REFUSE ${p.precheck.reason}: ${p.precheck.message}`, t, p.precheck.ok ? t.up : t.down);
-    return y + 1;
-}
 function field(c, x, y, w, bg, label, value, active, t) {
     const lblW = 10;
     c.text(x, y, label, { fg: t.dim, bg });

package/dist/packages/cli/src/screens/token.js

@@ -10,7 +10,7 @@ import { renderAnalystSession } from "./analyst-session.js";
 import { renderSocialPanel } from "./social-panel.js";
 import { brainFor, factsFromFixture, renderBrainPanel } from "./brain.js";
 import { layoutFor } from "../custom.js";
-import { chartMode, chartTitle, chartAxisOf, priceModeOf } from "../display.js";
+import { chartMode, chartTitle, chartAxisOf, priceModeOf, levelCell, supplyRatio } from "../display.js";
 export function renderToken(c, state) {
     if (state.live?.token && state.screener.source !== 'fixtures')
         return renderTokenLive(c, state, state.live.token.view); // task-1298: live data path
@@ -52,7 +52,7 @@ export function renderToken(c, state) {
     const pm = chartMode(priceModeOf(state), tk.price, tk.mcap);
     if (pm.kind === 'mcap') {
         x = c.text(1, y, fmtMcap(tk.mcap), { fg: pumping ? t.rainPump[3] : t.text, bg: priceBg, b: true });
-        x = c.text(x, y, ` (${fmtPrice(tk.price)})`, { fg: t.dim, bg: priceBg });
+        x = c.text(x, y, ` (${fmtPrice(tk.price)})`, { fg: priceBg === t.bg ? t.dim : t.text, bg: priceBg }); // task-1537: readable on the pump / dump band
     }
     else
         x = c.text(1, y, fmtPrice(tk.price), { fg: pm.label ? t.warn : pumping ? t.rainPump[3] : t.text, bg: priceBg, b: true });
@@ -162,7 +162,7 @@ export function renderToken(c, state) {
                     let cx = c.text(hb.x + 1, hy, fmtAgeSec(tr.ago).padStart(4), { fg: t.dim, bg: hb.bg });
                     cx = c.text(cx + 1, hy, tr.side === 'buy' ? '▲BUY ' : '▼SELL', { fg: color, bg: hb.bg, b: true });
                     cx = c.textR(cx + 1, hy, 8, fmtUsd(tr.usd), { fg: t.text, bg: hb.bg });
-                    cx = c.text(cx + 2, hy, fmtPrice(tr.price), { fg: t.muted, bg: hb.bg });
+                    cx = c.text(cx + 2, hy, levelCell(priceModeOf(state), supplyRatio(tk.price, tk.mcap), tr.price), { fg: t.muted, bg: hb.bg }); // task-1537
                     cx = c.text(cx + 2, hy, shortAddr(tr.addr, 3), { fg: t.dim, bg: hb.bg });
                     if (tr.tag)
                         badge(c, cx + 1, hy, tr.tag, tr.tag === 'smart' ? t.accent : t.warn, { on: hb.bg });

package/dist/packages/cli/src/state.js

@@ -1,13 +1,13 @@
 // dexterm — app state consumed by the screens. Screens are pure render(canvas, state) functions;
 // renderFrame() draws the screen, the toast, then runs the effects post-pass (VISUAL-V2 §3).
-import { Canvas, THEMES, applyFx, toast, makeVfx, setSources, marketActivity, candleActivity, isCalm, breakpoint, } from '../../tui/src/index.js';
+import { Canvas, THEMES, applyFx, toast, makeVfx, setSources, marketActivity, candleActivity, isCalm, breakpoint, fmtMcap, } from '../../tui/src/index.js';
 import { makeFixtures } from "./fixtures.js";
 import { fromFixture } from "./screener/rows.js";
 import { makeScreenerState, screenerView } from "./screener/view.js";
 import { renderScreener } from "./screens/screener.js";
 import { renderToken } from "./screens/token.js";
 import { agentBrainActive } from "./screens/brain.js";
-import { pnlChipVM, renderPnlChip } from "./screens/pnl-chip.js";
+import { pnlChipVM, renderPnlChip, CHIP_PRICE_LEVEL } from "./screens/pnl-chip.js";
 import { renderNewPairs } from "./screens/newpairs.js";
 import { renderWatchlist } from "./screens/watchlist.js";
 import { renderAnalyst } from "./screens/analyst.js";
@@ -22,6 +22,7 @@ import { renderNarrative } from "./screens/narrative.js";
 import { renderPlans } from "./screens/plans.js";
 import { renderFollows } from "./screens/follows.js";
 import { renderRules } from "./screens/rules.js";
+import { renderAutotrade } from "./screens/autotrade-screen.js";
 import { CopyLive } from "./live/copy.js";
 import { CopyAuto, defaultCopyJournalPath, leaderSoldSince } from '../../data/src/trade/copy/index.js';
 import { computeBoard, loadDefaultLexicon, recentNarrativeRows } from '../../packs/src/index.js';
@@ -32,7 +33,7 @@ import { renderScanTicker, scanIndicator } from "./scan/ui.js";
 import { renderVoiceHud } from "./voice-hud.js";
 import { composeHud, DOCK_ROWS, HUD_MIN_H } from "./screens/agent-hud.js";
 import { workspaceBadge } from "./custom.js";
-import { chartAxisOf, supplyRatio } from "./display.js";
+import { chartAxisOf, supplyRatio, priceModeOf, supplyForMint } from "./display.js";
 /** Map key for the Analyst-tab's own conversation (not tied to a single token). */
 export const ANALYST_TAB_KEY = '__analyst_tab__';
 /**
@@ -101,7 +102,7 @@ export function computeNarrativeView(state, window, now = Date.now()) {
         return { board: null, window, computedAt: now, source: 'none', selected: 0, error: e instanceof Error ? e.message : String(e) };
     }
 }
-export function newPlansUi() { return { tab: 'plans', selected: 0, notice: null, arming: null, riskModal: false, liveModal: false }; }
+export function newPlansUi() { return { tab: 'plans', selected: 0, notice: null, arming: null, riskModal: false }; }
 /**
  * task-1363: how old a board price may be and still fire a plan. The terminal feeds the plan engine from its
  * screener/watchlist refresh (about every 10 s) and the token screen, so the engine's 3 s default would never
@@ -179,6 +180,7 @@ export const RENDERERS = {
     plans: renderPlans,
     follows: renderFollows,
     rules: renderRules,
+    autotrade: renderAutotrade,
 };
 export const SCREEN_NAMES = Object.keys(RENDERERS);
 export function isScreenKey(s) {
@@ -206,6 +208,9 @@ export function isDemoScreen(s) {
     // task-1360: the follows screen shows the user's own list + the tracker's real state (unavailable when keyless).
     if (s.screen === 'follows')
         return false;
+    // task-1508: the autotrade screen reads the user's own strategy files and the runner's status file (PAPER badge).
+    if (s.screen === 'autotrade')
+        return false;
     // analyst screen: a live Claude session (even mid-run or failed) is real output, not demo data
     return !s.analyst;
 }
@@ -236,13 +241,10 @@ export function headerModel(s) {
         feedLabel = 'jupiter · gecko · boosts · coingecko · rss · keyless';
     if (s.screen === 'kol')
         feedLabel = 'kol lists · sqlite';
-    // task-1355: the plans screen is the signer trust domain; it is paper by default and says so.
-    // task-1363: once the fire path is LIVE (devnet fast wallet, keypress opt-in) the header says so; anything not
-    // provably paper renders LIVE (fail-safe).
+    // task-1355: the plans screen fires on PAPER only (task-1571: there is no live fire path) and says so.
     if (s.screen === 'plans') {
-        const paper = s.plansSvc ? s.plansSvc.mode() === 'paper' : true;
-        status = paper ? '◈ PAPER · plans journal' : '◉ LIVE · DEVNET · fast wallet';
-        feedLabel = paper ? 'order plans · standing mandates · hash-chained journal' : 'order plans · signer process · fast wallet · devnet';
+        status = '◈ PAPER · plans journal';
+        feedLabel = 'order plans · standing mandates · hash-chained journal';
     }
     // task-1360: the follows screen reads public history for the user's own list; it never trades.
     if (s.screen === 'follows')
@@ -250,14 +252,13 @@ export function headerModel(s) {
     // task-1358: the rules screen evaluates the screener rows locally; rules only alert or PROPOSE.
     if (s.screen === 'rules')
         feedLabel = 'rules · config.json · alerts + proposals only · nothing arms';
+    // task-1508: autotrade is paper only; the screen edits strategy files and reads recorded history.
+    if (s.screen === 'autotrade') {
+        status = '◈ PAPER · autotrade';
+        feedLabel = 'strategies · recorded history · paper runner status';
+    }
     if (s.screen === 'bubbles')
         feedLabel = `${s.live?.rpc.provider === 'helius' ? 'helius history · ' : ''}rpc holders · rules · sqlite`;
-    // task-1328: a LIVE ticket says so in the header, with the SIGNER's network (never a UI flag).
-    if (s.screen === 'ticket' && s.live?.ticket?.ticket.mode === 'live') {
-        const net = s.live.ticket.view().live?.signer?.network ?? null;
-        status = net === 'mainnet' ? '⚠ LIVE · MAINNET · real funds' : net === 'devnet' ? '◉ LIVE · DEVNET' : '◉ LIVE · signer unreachable';
-        feedLabel = 'signer process · jupiter · phantom';
-    }
     // task-1324: while AI scan mode is on the header ALWAYS says so (state + the scan's analyst meter +
     // any Helius credit warning), on every screen — the running indicator wins over every other status.
     let scanStatus = null;
@@ -302,6 +303,8 @@ export function makeFixtureState(opts = {}) {
         larpByMint: new Map(),
         colorDepth: opts.colorDepth ?? 'truecolor',
     };
+    if (opts.priceMode)
+        state.priceMode = opts.priceMode;
     refreshVfx(state);
     if (screen === 'ticket' || screen === 'positions')
         seedDemoTrade(state);
@@ -447,7 +450,7 @@ export function renderFrame(state, w, h) {
     return composeHud(new Canvas(w, h, state.theme), screen, view, {
         now, reduced: !!hud.reduced || isCalm(state.vfx), depth: state.colorDepth, dataLabel: hud.dataLabel ?? null, screen: state.screen, brain,
         chip: pnlChipFor(state, now, view),
-        mcapScale: chartAxisOf(state) === 'mcap' ? (mint) => hudMcapScale(state, mint) : undefined, // task-1472
+        mcapScale: priceModeOf(state) === 'mcap' ? (mint) => hudMcapScale(state, mint) : undefined, // task-1472; task-1537: the HUD's text follows the price basis (the charts keep A)
     });
 }
 /** task-1472: the supply ratio for the HUD's position card: the open token's (live, else fixture), else its screener row. */
@@ -468,13 +471,16 @@ function hudMcapScale(state, mint) {
  */
 export function pnlChipFor(state, now, view) {
     const hud = state.agentHud;
+    // task-1537: entry / mark / TP read as market caps by default (the coin's known supply), else prices
+    const mode = priceModeOf(state);
+    const lvl = (u, mint) => { const sup = mode === 'mcap' ? supplyForMint(state, mint) : null; return sup !== null ? fmtMcap(u * sup) : CHIP_PRICE_LEVEL(u, mint); };
     if (hud) {
-        const m = pnlChipVM(view ?? hud.story.view(now), now);
+        const m = pnlChipVM(view ?? hud.story.view(now), now, lvl);
         if (m)
             return m;
     }
     if (state.scan?.engine.on && state.ownPnl)
-        return state.ownPnl.vm(now);
+        return state.ownPnl.vm(now, lvl);
     return null;
 }
 function renderScreenFrame(state, w, h, bandChip = false) {