dexterm-cli 0.1.5 → 0.1.7

package/dist/packages/cli/src/wallet-cmd.js

@@ -1,90 +1,26 @@
-// dexterm T1 — `dexterm wallet <link|unlink|status|panic|resume>` (SPEC §6.5). A non-TUI one-shot that
-// links a Phantom wallet through the loopback bridge (keys never enter dexterm; only the public key is
-// kept), unlinks it, prints the current link + the active trade caps, or PANICS live trading (round 2:
-// the cheapest safe signer panic path — a kill-switch file every dexterm process re-reads, plus a lock
-// on the shared daily-cap ledger). `resume` needs a real TTY keypress; piped input cannot re-arm.
-import { WalletBridge, WalletLinkStore, shortPubkey, defaultCaps, capsOnlyDownward, KillSwitch, CapLedger, defaultCapLedgerPath, defaultLiveLedgerPath, LiveLedger, HARD_MAX_PER_TRADE_USD, HARD_MAX_DAILY_USD, HARD_MAX_SOL_OUT, HARD_MAX_SLIPPAGE_BPS, parseSignerArgs, buildSignerService, lamportsToSol, FastWalletStore, defaultFastWalletPath, FAST_MAX_SOL_PER_FILL, createDataLayer, TradeRpc, DEVNET_RPC, } from '../../data/src/index.js';
-/**
- * Parse the trade-caps flags shared by the wallet command and (later) live trading. DEFECT 6: a USD
- * flag above the hard ceiling (e.g. `--max-usd 1000000`, `--daily-usd 1e12`) is REJECTED rather than
- * silently accepted, so a fat-fingered cap can never arm a huge money path. Throws on an over-ceiling
- * value; the caller surfaces it as a usage error. (defaultCaps also clamps as a second line of defence.)
- */
-export function parseCapsFlags(argv) {
-    let mainnet = false;
-    let perTradeUsd;
-    let dailyUsd;
-    let maxSolOut;
-    let maxSlippageBps;
-    const fmt = (n, unit) => (unit === '$' ? `$${n}` : `${n} ${unit}`);
-    const take = (flag, raw, ceiling, unit = '$') => {
-        const n = Number(raw);
-        if (!Number.isFinite(n) || n <= 0)
-            return undefined; // ignore junk; defaults apply
-        if (n > ceiling)
-            throw new Error(`${flag} ${fmt(n, unit)} exceeds the hard ceiling of ${fmt(ceiling, unit)}`);
-        return n;
-    };
-    for (let i = 0; i < argv.length; i++) {
-        const k = argv[i];
-        if (k === '--mainnet')
-            mainnet = true;
-        else if (k === '--max-usd')
-            perTradeUsd = take('--max-usd', argv[++i], HARD_MAX_PER_TRADE_USD);
-        else if (k === '--daily-usd')
-            dailyUsd = take('--daily-usd', argv[++i], HARD_MAX_DAILY_USD);
-        else if (k === '--max-sol-out')
-            maxSolOut = take('--max-sol-out', argv[++i], HARD_MAX_SOL_OUT, 'SOL');
-        else if (k === '--max-slippage-bps')
-            maxSlippageBps = take('--max-slippage-bps', argv[++i], HARD_MAX_SLIPPAGE_BPS, 'bps');
-    }
-    // task-1328: without --mainnet the USD caps can only go DOWN from the defaults (what the signer applies).
-    return capsOnlyDownward(defaultCaps({ network: mainnet ? 'mainnet' : 'devnet', mainnetEnabled: mainnet, perTradeUsd, dailyUsd, maxSolOut, maxSlippageBps }));
-}
-function capsLine(caps) {
-    const net = caps.network === 'mainnet' ? 'MAINNET' : 'devnet';
-    return `mode: ${caps.network === 'mainnet' ? 'LIVE' : 'DRY-RUN'} · network: ${net} · per-trade $${caps.perTradeUsd} · daily $${caps.dailyUsd} · max impact ${caps.maxPriceImpactPct}% · max SOL out ${caps.maxSolOut} · max slippage ${caps.maxSlippageBps} bps`;
-}
-function panicLine(ks, ledger) {
+// dexterm — `dexterm wallet <link|unlink|status|panic|resume>` (SPEC §6.5). A non-TUI one-shot that
+// links a Phantom wallet through the loopback bridge (sign-a-message only: dexterm keeps the PUBLIC key,
+// never a private key, and signs nothing), unlinks it, prints the link, or engages the PANIC switch (a
+// kill-switch file every dexterm process re-reads: autotrade runs and the paper agent desk halt).
+// `resume` needs a real TTY keypress; piped input cannot re-arm. task-1571: dexterm holds no key and has
+// no trading wallet; live trading happens in the Telegram trading bot of the user's choice.
+import { WalletBridge, WalletLinkStore, shortPubkey, KillSwitch, } from '../../data/src/index.js';
+function panicLine(ks) {
     const p = ks.engaged();
-    const l = ledger?.locked() ?? null;
-    if (!p && !l)
+    if (!p)
         return null;
-    const parts = [];
-    if (p)
-        parts.push(`panic switch engaged${p.engagedAt ? ` at ${new Date(p.engagedAt).toISOString()}` : ''} (${p.reason})`);
-    if (l)
-        parts.push(`cap ledger locked (${l.reason})`);
-    return `⛔ LIVE TRADING DISABLED — ${parts.join('; ')}. Run \`dexterm wallet resume\` in a terminal to re-enable.`;
+    return `⛔ PANIC ENGAGED${p.engagedAt ? ` at ${new Date(p.engagedAt).toISOString()}` : ''} (${p.reason}): autotrade runs and the paper agent desk stay halted. Run \`dexterm wallet resume\` in a terminal to clear it.`;
 }
-function printStatus(io, store, caps, ks, ledger) {
+function printStatus(io, store, ks) {
     const w = store.get();
     if (w)
-        io.stdout.write(`linked: ${shortPubkey(w.publicKey)}  (${w.publicKey})\n`);
+        io.stdout.write(`linked: ${shortPubkey(w.publicKey)}  (${w.publicKey}) · public key only, read-only\n`);
     else
         io.stdout.write('linked: (none) — run `dexterm wallet link`\n');
-    io.stdout.write(`${capsLine(caps)}\n`);
-    const p = panicLine(ks, ledger);
+    const p = panicLine(ks);
     if (p)
         io.stdout.write(`${p}\n`);
-    if (caps.network === 'mainnet')
-        io.stdout.write('⚠ --mainnet is on: real funds, within the caps above. Devnet is the default; drop --mainnet to stay safe.\n');
-}
-function liveLine(path) {
-    try {
-        const l = new LiveLedger({ path, readOnly: true });
-        try {
-            const fills = l.records(1000);
-            const open = l.positions().filter((p) => p.tokensRaw > 0n);
-            return `live ledger: ${fills.length} confirmed fill${fills.length === 1 ? '' : 's'} · ${open.length} open position${open.length === 1 ? '' : 's'}${open.length ? ` (${open.map((p) => `$${p.symbol}`).join(', ')})` : ''}`;
-        }
-        finally {
-            l.close();
-        }
-    }
-    catch {
-        return null;
-    }
+    io.stdout.write('dexterm holds no key and signs nothing. Live trading happens in the Telegram trading bot of your choice (dexterm telegram setup).\n');
 }
 /**
  * Wait for ONE real keypress on a TTY. Resolves with the key, or null when stdin is not a TTY (piped
@@ -132,302 +68,65 @@ export async function ttyKeypress(stdin, timeoutMs) {
 /** Run the wallet subcommand. Returns a process exit code. */
 export async function runWallet(argv, io, over = {}) {
     const sub = argv[0] ?? 'status';
-    let caps;
-    try {
-        caps = parseCapsFlags(argv.slice(1));
-    }
-    catch (e) {
-        io.stderr.write(`dexterm wallet: ${e instanceof Error ? e.message : String(e)}\n`);
+    if (sub === 'trading' || sub === 'fast' || sub === 'probe') {
+        io.stderr.write(`dexterm wallet ${sub}: removed in 0.1.7. dexterm holds no key and has no trading wallet; live trading happens in the Telegram trading bot of your choice\n`);
         return 2;
     }
     const store = over.store ?? new WalletLinkStore();
     const ks = over.killSwitch ?? new KillSwitch();
-    const ledgerPath = over.ledgerPath ?? defaultCapLedgerPath();
-    const openLedger = () => { try {
-        return new CapLedger({ path: ledgerPath });
-    }
-    catch {
-        return null;
-    } };
     if (sub === 'status') {
-        const ledger = openLedger();
-        try {
-            printStatus(io, store, caps, ks, ledger);
-        }
-        finally {
-            ledger?.close();
-        }
-        const ll = liveLine(over.liveLedgerPath ?? defaultLiveLedgerPath());
-        if (ll)
-            io.stdout.write(`${ll}\n`);
+        printStatus(io, store, ks);
         return 0;
     }
-    // PROBE (task-1328): the devnet plumbing test from a shell — the signer service runs in THIS process
-    // (same code the TUI's signer child runs), builds the wrap-and-unwrap plan for the linked wallet,
-    // prints it, waits for a real TTY keypress, then opens Phantom, verifies, re-simulates, submits and
-    // confirms. Devnet only: the service refuses a non-devnet RPC and --mainnet is not accepted here.
-    if (sub === 'probe') {
-        if (argv.includes('--mainnet')) {
-            io.stderr.write('dexterm wallet probe: devnet only (drop --mainnet)\n');
-            return 2;
-        }
-        if (!store.get()) {
-            io.stderr.write('dexterm wallet probe: no wallet linked; run `dexterm wallet link` first\n');
-            return 2;
-        }
-        let service;
-        try {
-            service = over.signerService ?? buildSignerService(parseSignerArgs(argv.slice(1).filter((a) => a !== '--no-browser'), io.env), (l) => io.stderr.write(`${l}\n`));
-        }
-        catch (e) {
-            io.stderr.write(`dexterm wallet probe: ${e instanceof Error ? e.message : String(e)}\n`);
-            return 2;
-        }
-        const st = service.status();
-        if (st.network !== 'devnet') {
-            io.stderr.write(`dexterm wallet probe: the signer RPC is ${st.network}; the probe runs only on devnet\n`);
-            return 2;
-        }
-        if (st.panic || st.ledgerLocked) {
-            io.stderr.write(`${panicLine(ks, openLedger()) ?? 'panicked'}\n`);
-            return 2;
-        }
-        let plan;
-        try {
-            plan = await service.probe();
-        }
-        catch (e) {
-            io.stderr.write(`dexterm wallet probe: plan failed: ${e instanceof Error ? e.message : String(e)}\n`);
-            return 1;
-        }
-        io.stdout.write(`DEVNET PROBE for ${shortPubkey(plan.userPublicKey)} via ${st.rpcHost}\n`);
-        io.stdout.write(`  wraps ${lamportsToSol(BigInt(plan.amountInRaw)).toFixed(4)} SOL into your own WSOL account and closes it back · fee ≈ ${lamportsToSol(BigInt(plan.feeLamports)).toFixed(6)} SOL\n`);
-        io.stdout.write(`  will sign: ${plan.instructions.map((i) => `${i.program}${i.op ? ':' + i.op : ''}`).join(' · ')}\n`);
-        io.stdout.write(`  simulation: ${plan.sim.ran ? (plan.sim.ok ? `ok (${plan.sim.solOutLamports ?? '?'} lamports leave the wallet)` : `FAILED ${plan.sim.error ?? ''}`) : 'not run'} · policy: ${plan.policy.ok ? 'ok' : `REFUSE ${plan.policy.reason}`} · caps: ${plan.precheck.ok ? 'ok' : `REFUSE ${plan.precheck.reason}`}\n`);
-        if (!plan.policy.ok || !plan.precheck.ok || !plan.sim.ok) {
-            io.stderr.write('dexterm wallet probe: the signer would refuse this plan; nothing to sign\n');
-            return 1;
-        }
-        const stdin = io.stdin;
-        if (!stdin || stdin.isTTY !== true) {
-            io.stderr.write('dexterm wallet probe: needs a real terminal keypress (stdin is not a TTY). Refusing.\n');
-            return 2;
-        }
-        io.stdout.write('Press Y to sign this probe in Phantom (any other key aborts)… ');
-        const key = await ttyKeypress(stdin, over.keypressTimeoutMs ?? 60_000);
-        io.stdout.write('\n');
-        if (key !== 'y' && key !== 'Y') {
-            io.stdout.write('aborted; nothing signed.\n');
-            return 1;
-        }
-        const out = await service.confirm({ hash: plan.hash });
-        if (out.kind === 'filled') {
-            io.stdout.write(`✓ confirmed on devnet · signature ${out.signature}${out.lighthouseTail ? ` · Phantom appended ${out.lighthouseTail} Lighthouse instruction(s)` : ' · no Lighthouse tail'} · ${out.roundTripMs} ms\n`);
-            return 0;
-        }
-        if (out.kind === 'refused') {
-            io.stdout.write(`✗ refused by the signer: ${out.reason} — ${out.message}\n`);
-            return 1;
-        }
-        if (out.kind === 'send-unknown') {
-            io.stdout.write(`? send outcome unknown: ${out.error} · signature ${out.signature} · do NOT resend\n`);
-            return 1;
-        }
-        io.stdout.write(`✗ send failed: ${out.error}${out.signature ? ` · signature ${out.signature}` : ''}\n`);
-        return 1;
-    }
-    // FAST WALLET (task-1363): the one key dexterm holds, devnet only, for standing-mandate fills at machine speed.
-    //   create   a new devnet key at ~/.dexterm/fast-wallet.json (mode 600) after a real TTY keypress; never overwrites
-    //   status   public key, devnet balance, the per-fill ceiling
-    //   airdrop  devnet faucet into the fast wallet (--sol N, default 1)
-    //   remove   delete the key (TTY keypress; refused while it still holds SOL unless --force)
-    // There is no export, no import, no mainnet variant, and the signer process only ever READS this file.
-    if (sub === 'fast') {
-        if (argv.includes('--mainnet')) {
-            io.stderr.write('dexterm wallet fast: devnet only (there is no mainnet fast wallet; drop --mainnet)\n');
-            return 2;
-        }
-        const action = argv[1] ?? 'status';
-        const fastStore = new FastWalletStore(over.fastWalletPath ?? defaultFastWalletPath(io.env));
-        const rpc = () => {
-            if (over.fastRpc)
-                return over.fastRpc;
-            const dl = createDataLayer({ dbPath: ':memory:', rpcUrl: DEVNET_RPC, rpcFallbackUrl: null });
-            const r = new TradeRpc(dl.http, { url: DEVNET_RPC });
-            return { balance: (pk) => r.balance(pk), airdrop: (pk, l) => r.airdrop(pk, l), confirm: (sig) => r.confirm(sig, { timeoutMs: 45_000 }) };
-        };
-        const balanceLine = async (pk) => {
-            try {
-                const l = await rpc().balance(pk);
-                return { lamports: l, text: `${lamportsToSol(l).toFixed(4)} SOL (devnet)` };
-            }
-            catch (e) {
-                return { lamports: null, text: `balance unavailable (${e instanceof Error ? e.message : String(e)})` };
-            }
-        };
-        if (action === 'status') {
-            const rec = fastStore.get();
-            if (!rec) {
-                io.stdout.write(`fast wallet: (none) — create one with \`dexterm wallet fast create\` (devnet only)\n`);
-                return 0;
-            }
-            const b = await balanceLine(rec.publicKey);
-            io.stdout.write(`fast wallet: ${shortPubkey(rec.publicKey)}  (${rec.publicKey}) · devnet · created ${new Date(rec.createdAt).toISOString()}\n`);
-            io.stdout.write(`  balance: ${b.text} · per-fill ceiling ${FAST_MAX_SOL_PER_FILL} SOL · the signer's USD per-trade/daily caps apply on every fill\n`);
-            io.stdout.write(`  file: ${fastStore.path} (mode 600; never exported, never printed)\n`);
-            return 0;
-        }
-        if (action === 'create') {
-            if (fastStore.exists()) {
-                io.stderr.write(`dexterm wallet fast create: a fast wallet already exists at ${fastStore.path} (remove it first, after draining)\n`);
-                return 2;
-            }
-            const stdin = io.stdin;
-            if (!stdin || stdin.isTTY !== true) {
-                io.stderr.write('dexterm wallet fast create: needs a real terminal keypress (stdin is not a TTY). Refusing.\n');
-                return 2;
-            }
-            io.stdout.write(`Create a DEVNET fast wallet at ${fastStore.path}?\n  armed order plans inside a standing mandate fire from it at machine speed, within the signer's caps and a ${FAST_MAX_SOL_PER_FILL} SOL per-fill ceiling.\n  devnet only — this key can never be used on mainnet. Press Y to create (any other key aborts)… `);
-            const key = await ttyKeypress(stdin, over.keypressTimeoutMs ?? 30_000);
-            io.stdout.write('\n');
-            if (key !== 'y' && key !== 'Y') {
-                io.stdout.write('aborted; nothing created.\n');
-                return 1;
-            }
-            const rec = fastStore.create({ network: 'devnet' });
-            io.stdout.write(`✓ fast wallet created: ${rec.publicKey} (devnet)\n  fund it: dexterm wallet fast airdrop   · then restart dexterm so the signer loads it\n`);
-            return 0;
-        }
-        if (action === 'airdrop') {
-            const rec = fastStore.get();
-            if (!rec) {
-                io.stderr.write('dexterm wallet fast airdrop: no fast wallet; `dexterm wallet fast create` first\n');
-                return 2;
-            }
-            const solIdx = argv.indexOf('--sol');
-            const sol = solIdx >= 0 ? Number(argv[solIdx + 1]) : 1;
-            if (!Number.isFinite(sol) || sol <= 0 || sol > 5) {
-                io.stderr.write('dexterm wallet fast airdrop: --sol must be in (0, 5]\n');
-                return 2;
-            }
-            try {
-                const sig = await rpc().airdrop(rec.publicKey, BigInt(Math.round(sol * 1e9)));
-                io.stdout.write(`airdrop requested: ${sol} SOL (devnet) → ${shortPubkey(rec.publicKey)} · signature ${sig}\n`);
-                const c = rpc().confirm ? await rpc().confirm(sig).catch(() => null) : null;
-                if (c)
-                    io.stdout.write(c.confirmed ? '✓ confirmed\n' : `? not confirmed yet (${c.err ?? 'pending'})\n`);
-                const b = await balanceLine(rec.publicKey);
-                io.stdout.write(`  balance: ${b.text}\n`);
-                return 0;
-            }
-            catch (e) {
-                io.stderr.write(`dexterm wallet fast airdrop failed: ${e instanceof Error ? e.message : String(e)} — the public devnet faucet is often dry; try https://faucet.solana.com with the address above\n`);
-                return 1;
-            }
-        }
-        if (action === 'remove') {
-            const rec = fastStore.get();
-            if (!rec) {
-                io.stdout.write('no fast wallet to remove.\n');
-                return 0;
-            }
-            const b = await balanceLine(rec.publicKey);
-            if (b.lamports !== null && b.lamports > 0n && !argv.includes('--force')) {
-                io.stderr.write(`dexterm wallet fast remove: the fast wallet still holds ${b.text}; move it out first, or pass --force to delete the key anyway (devnet SOL only)\n`);
-                return 2;
-            }
-            const stdin = io.stdin;
-            if (!stdin || stdin.isTTY !== true) {
-                io.stderr.write('dexterm wallet fast remove: needs a real terminal keypress (stdin is not a TTY). Refusing.\n');
-                return 2;
-            }
-            io.stdout.write(`Delete the fast wallet ${shortPubkey(rec.publicKey)} (${b.text})? Press Y to delete (any other key aborts)… `);
-            const key = await ttyKeypress(stdin, over.keypressTimeoutMs ?? 30_000);
-            io.stdout.write('\n');
-            if (key !== 'y' && key !== 'Y') {
-                io.stdout.write('aborted; the fast wallet is kept.\n');
-                return 1;
-            }
-            fastStore.remove();
-            io.stdout.write('✓ fast wallet removed. Restart dexterm so the signer stops loading it.\n');
-            return 0;
-        }
-        io.stderr.write(`dexterm wallet fast: unknown action ${JSON.stringify(action)} (expected status | create | airdrop | remove)\n`);
-        return 2;
-    }
     if (sub === 'unlink') {
         const had = store.clear();
         io.stdout.write(had ? 'unlinked.\n' : 'no wallet was linked.\n');
         return 0;
     }
     // PANIC: instant, no confirmation, scriptable from anywhere (a second terminal, a hotkey, an agent).
-    // Engages the kill-switch file (every executor re-reads it on each plan/confirm) AND locks the shared
-    // daily-cap ledger so no reservation can be taken even if the file were removed by hand.
+    // Engages the kill-switch file; every autotrade runner and the paper agent desk re-read it on each step.
     if (sub === 'panic') {
         const reasonIdx = argv.indexOf('--reason');
         const reason = reasonIdx >= 0 && argv[reasonIdx + 1] ? argv[reasonIdx + 1] : 'manual panic';
         const rec = ks.engage(reason);
-        const ledger = openLedger();
-        let lockNote = '';
-        if (ledger) {
-            try {
-                ledger.lock(reason);
-                lockNote = ' · cap ledger locked';
-            }
-            finally {
-                ledger.close();
-            }
-        }
-        else
-            lockNote = ' · (cap ledger could not be opened; the kill-switch file still disables trading)';
-        io.stdout.write(`⛔ PANIC: live trading disabled (${rec.reason})${lockNote}\n`);
-        io.stdout.write(`kill switch: ${ks.path}\nRe-enable only from a real terminal: dexterm wallet resume\n`);
+        io.stdout.write(`⛔ PANIC: autotrade and the paper agent desk halted (${rec.reason})\n`);
+        io.stdout.write(`kill switch: ${ks.path}\nClear it only from a real terminal: dexterm wallet resume\n`);
         return 0;
     }
     // RESUME: the only way back. Requires a physical keypress on a TTY — not piped/scripted input — so a
-    // model, a script or a compromised popup cannot silently re-arm live trading.
+    // model or a script cannot silently clear the panic switch.
     if (sub === 'resume') {
         const stdin = io.stdin;
         if (!stdin || stdin.isTTY !== true) {
             io.stderr.write('dexterm wallet resume: needs a real terminal keypress (stdin is not a TTY). Refusing.\n');
             return 2;
         }
-        const p = ks.engaged();
-        const ledger = openLedger();
-        try {
-            const l = ledger?.locked() ?? null;
-            if (!p && !l) {
-                io.stdout.write('live trading is not panicked; nothing to resume.\n');
-                return 0;
-            }
-            io.stdout.write(`${panicLine(ks, ledger) ?? ''}\nPress Y to re-enable live trading (any other key aborts)… `);
-            const key = await ttyKeypress(stdin, over.keypressTimeoutMs ?? 30_000);
-            io.stdout.write('\n');
-            if (key === null) {
-                io.stderr.write('dexterm wallet resume: no keypress; still panicked.\n');
-                return 2;
-            }
-            if (key !== 'y' && key !== 'Y') {
-                io.stdout.write('aborted; still panicked.\n');
-                return 1;
-            }
-            ks.release();
-            ledger?.unlock();
-            io.stdout.write('✓ live trading re-enabled (caps still apply).\n');
+        if (!ks.engaged()) {
+            io.stdout.write('the panic switch is not engaged; nothing to resume.\n');
             return 0;
         }
-        finally {
-            ledger?.close();
+        io.stdout.write(`${panicLine(ks) ?? ''}\nPress Y to clear the panic switch (any other key aborts)… `);
+        const key = await ttyKeypress(stdin, over.keypressTimeoutMs ?? 30_000);
+        io.stdout.write('\n');
+        if (key === null) {
+            io.stderr.write('dexterm wallet resume: no keypress; still panicked.\n');
+            return 2;
+        }
+        if (key !== 'y' && key !== 'Y') {
+            io.stdout.write('aborted; still panicked.\n');
+            return 1;
         }
+        ks.release();
+        io.stdout.write('✓ panic switch cleared.\n');
+        return 0;
     }
     if (sub === 'link') {
         const bridge = over.bridge ?? new WalletBridge(over.open ? { open: over.open } : {});
         io.stdout.write('Opening your browser to link a Solana wallet (sign-a-message only; no transaction)…\n');
         try {
             const res = await bridge.link();
-            const rec = store.set(res.publicKey, { network: caps.network });
-            io.stdout.write(`linked: ${shortPubkey(rec.publicKey)}  (${rec.publicKey})\n`);
-            io.stdout.write(`${capsLine(caps)}\n`);
+            const rec = store.set(res.publicKey);
+            io.stdout.write(`linked: ${shortPubkey(rec.publicKey)}  (${rec.publicKey}) · public key only; dexterm never signs with it\n`);
             return 0;
         }
         catch (e) {
@@ -435,6 +134,6 @@ export async function runWallet(argv, io, over = {}) {
             return 1;
         }
     }
-    io.stderr.write(`dexterm wallet: unknown subcommand ${JSON.stringify(sub)} (expected link | unlink | status | panic | resume | probe | fast)\n`);
+    io.stderr.write(`dexterm wallet: unknown subcommand ${JSON.stringify(sub)} (expected link | unlink | status | panic | resume)\n`);
     return 2;
 }

package/dist/packages/cli/src/wallet-command.js

@@ -1,8 +1,8 @@
 /**
- * Parse a typed command: `/wallet` · `/wallet status` · `/wallet link` · `/wallet unlink` ·
- * `/wallet panic` · `/wallet probe`. The leading slash is optional (the screener's `/` line ate it).
- * Anything else — including a real filter — returns null. `resume` is deliberately NOT a command here:
- * re-enabling live trading needs a real TTY keypress in `dexterm wallet resume`.
+ * Parse a typed command: `/wallet` · `/wallet status` · `/wallet link` · `/wallet unlink` · `/wallet panic`.
+ * The leading slash is optional (the screener's `/` line ate it). Anything else — including a real filter —
+ * returns null. `resume` is deliberately NOT a command here: clearing the panic switch needs a real TTY
+ * keypress in `dexterm wallet resume`.
  */
 export function parseWalletCommand(text) {
     const m = /^\s*\/?wallet(?:\s+(\S+))?\s*$/i.exec(String(text ?? ''));
@@ -17,15 +17,12 @@ export function parseWalletCommand(text) {
         return 'unlink';
     if (arg === 'panic')
         return 'panic';
-    if (arg === 'probe')
-        return 'probe';
     if (arg === 'resume')
         return { error: 'resume needs a real terminal keypress: run `dexterm wallet resume` in a shell' };
-    return { error: `unknown /wallet command "${arg.slice(0, 16)}" (status · link · unlink · panic · probe)` };
+    return { error: `unknown /wallet command "${arg.slice(0, 16)}" (status · link · unlink · panic)` };
 }
-export const WALLET_HELP = `  /wallet [status]          linked wallet (pubkey only), the signer's network + caps, panic state
+export const WALLET_HELP = `  /wallet [status]          linked wallet (public key only, read-only) and the panic state
   /wallet link              open the browser to link a Phantom wallet (sign-a-message proof; no transaction)
   /wallet unlink            forget the linked public key
-  /wallet panic             disable live signing at once (kill-switch file + cap-ledger lock); resume needs \`dexterm wallet resume\`
-  /wallet probe             devnet plumbing test: a wrap-and-unwrap transaction you sign in Phantom (fees only)
-  dexterm wallet fast …     the capped DEVNET fast wallet armed order plans fire from: create (TTY keypress) · status · airdrop · remove`;
+  /wallet panic             halt autotrade runs and the paper agent desk at once (kill-switch file); resume needs \`dexterm wallet resume\`
+  dexterm never holds a key and never signs. Live trading happens in the Telegram trading bot of your choice.`;

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

@@ -109,18 +109,6 @@ export function widgetPositionsVM(state) {
                 rows.push({ symbol: p.symbol, mint: p.mint, side: 'long', tokens: p.tokens, valueSol: p.valueSol, unrealizedSol: p.unrealizedSol, unrealizedPct: p.unrealizedPct, book: 'paper' });
         }
         catch { /* no paper book on this run */ }
-        const lp = live.livePositions;
-        if (lp) {
-            try {
-                for (const p of lp.positions()) {
-                    if (p.tokensRaw <= 0n)
-                        continue;
-                    const h = lp.held(p.mint);
-                    rows.push({ symbol: p.symbol, mint: p.mint, side: 'long', tokens: h?.tokens ?? Number(p.tokensRaw) / 10 ** p.decimals, valueSol: null, unrealizedSol: null, unrealizedPct: null, book: 'live' });
-                }
-            }
-            catch { /* ledger unreadable */ }
-        }
     }
     return { rows, updatedAt: state.now.getTime() };
 }

package/dist/packages/custom/src/config.js

@@ -1,5 +1,5 @@
 // @dexterm/custom — the config loader (task-1358 Tier 1). ~/.dexterm/config.json is the canonical,
-// machine-written config (0600, `version: 4`); workspaces are one JSON file each in ~/.dexterm/workspaces/,
+// machine-written config (0600, `version: 5`); workspaces are one JSON file each in ~/.dexterm/workspaces/,
 // user themes in ~/.dexterm/themes/. THIS MODULE NEVER READS A KEY FILE: `<name>.key` files are the data
 // layer's business, and the only thing the loader does with a key is move one OUT of an old config.
 //
@@ -55,7 +55,7 @@ export function loadConfig(home) {
     // older (or newer) config: migrate, back up, write the new one, write extracted keys to <name>.key (0600)
     let m;
     try {
-        m = migrate(raw);
+        m = migrate(raw, { journaledPriceMode: journaledPriceMode(home) });
     }
     catch (e) {
         return { ...base, ok: false, errors: [`${path}: ${e.message}`] };
@@ -95,6 +95,24 @@ export function saveConfig(home, config) {
     writeFileSync(tmp, JSON.stringify(config, null, 2) + '\n', { mode: 0o600 });
     renameSync(tmp, path);
 }
+/**
+ * task-1537: the `display.priceMode` value the journal last recorded (every applied / undone / redone op that set it,
+ * in order), or null when the journal never touched it. Lets the v4 → v5 migration tell a user's own `price` choice
+ * from the old default.
+ */
+export function journaledPriceMode(home) {
+    let v = null;
+    for (const e of readJournal(home)) {
+        for (const op of e.ops ?? []) {
+            const val = op.path === '/display/priceMode' ? op.value : op.path === '/display' && op.value && typeof op.value === 'object' ? op.value.priceMode : undefined;
+            if (op.op === 'remove' && (op.path === '/display/priceMode' || op.path === '/display'))
+                v = null;
+            else if (val === 'price' || val === 'mcap')
+                v = val;
+        }
+    }
+    return v;
+}
 export function readJournal(home) {
     try {
         return readFileSync(journalPath(home), 'utf8').split('\n').filter(Boolean).map((l) => JSON.parse(l));

package/dist/packages/custom/src/schema.js

@@ -5,7 +5,7 @@
 // "no runtime deps" rule. KEYS NEVER APPEAR IN THIS SCHEMA: there is no `keys` / `signer` / `trading`
 // section at all (additional:false makes an attempt to add one a precise refusal), and the v1 migration
 // demonstrates moving a key OUT of the config file into `~/.dexterm/<name>.key`.
-export const CONFIG_VERSION = 4;
+export const CONFIG_VERSION = 5;
 const FORBIDDEN_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
 /** Validate `value` against a schema (a node or the name of one in `refs`); returns the error list. */
 export function validate(schema, value, path = '', errors = [], refs = SCHEMAS) {
@@ -135,11 +135,25 @@ export const WIDGET_REF = '^[a-z][a-z0-9-]{0,39}/[a-z][a-z0-9-]{0,39}(/[a-z][a-z
 export const WORKSPACE_SCREENS = ['screener', 'token', 'newpairs', 'watchlist', 'analyst', 'positions', 'narrative', 'plans', 'trending'];
 export const LAYOUT_SCREENS = ['screener', 'token', 'newpairs', 'watchlist', 'analyst', 'positions'];
 /**
- * task-1366: how token prices are DISPLAYED. `price` (default) = USD per token; `mcap` = market cap (price × supply,
- * supply from the data layer). A display mode only: the same data underneath, nothing that trades reads it.
+ * task-1366: how token prices are DISPLAYED. `mcap` = market cap (price × a known supply); `price` = USD per token.
+ * task-1537: `display.priceMode` is THE price-basis key for the UI, the CLI text AND the agents' language, default
+ * `mcap` (the v4 → v5 migration moves a `price` that was only the old default). A display / wording mode only: the
+ * same data underneath, nothing that trades reads it. @dexterm/data/basis holds the resolver and formatters.
  */
 export const PRICE_MODES = ['price', 'mcap'];
-export const DEFAULT_PRICE_MODE = 'price';
+export const DEFAULT_PRICE_MODE = 'mcap';
+/**
+ * task-1472: what the CHART Y axis shows (the terminal token chart and the chart popup), separate from the table/header
+ * price mode: `mcap` (default; absent = mcap, so existing configs get it too) or `price`. `A` / the popup control toggle it.
+ */
+export const CHART_AXES = ['mcap', 'price'];
+export const DEFAULT_CHART_AXIS = 'mcap';
+/**
+ * task-1483: whether both charts draw the BUY / SELL markers of the ledgers' fills (and the avg-entry line): `on`
+ * (default; absent = on) or `off`. The chart popup's MARKERS control and `dexterm display markers` set it. Display only.
+ */
+export const CHART_MARKERS = ['on', 'off'];
+export const DEFAULT_CHART_MARKERS = 'on';
 const tokenProps = () => Object.fromEntries([...THEME_TOKENS.map((t) => [t, 'hex']), ...THEME_RAMPS.map((t) => [t, 'ramp'])]);
 export const SCHEMAS = {
     hex: { type: 'string', pattern: HEX },
@@ -236,8 +250,8 @@ export const SCHEMAS = {
                     user: { type: 'object', values: 'userTheme' },
                 } },
             fx: { type: 'object', additional: false, props: { intensity: { type: 'string', enum: ['off', 'normal', 'fever'] }, sound: { type: 'boolean' } } },
-            /** task-1366: display options. `priceMode` price | mcap (the `$` key toggles and persists it). */
-            display: { type: 'object', additional: false, props: { priceMode: { type: 'string', enum: PRICE_MODES } } },
+            /** task-1366: display options. `priceMode` price | mcap (the `$` key toggles and persists it). task-1472: `chartAxis` mcap | price (`A`; absent = mcap). task-1483: `chartMarkers` on | off (absent = on). */
+            display: { type: 'object', additional: false, props: { priceMode: { type: 'string', enum: PRICE_MODES }, chartAxis: { type: 'string', enum: CHART_AXES }, chartMarkers: { type: 'string', enum: CHART_MARKERS } } },
             layout: { type: 'object', additional: false, props: {
                     workspace: { type: 'string', pattern: WS_NAME },
                     workspaces: { type: 'object', values: 'workspace' },
@@ -263,7 +277,7 @@ export const SCHEMAS = {
                 } },
             /** 0.1.5: which of the user's own CLIs runs the analyst. `/analyst` is user-only (DENIED_FOR_MODELS): a model never picks its own engine. */
             analyst: { type: 'object', additional: false, props: {
-                    engine: { type: 'string', enum: ['auto', 'claude', 'codex'] },
+                    engine: { type: 'string', enum: ['auto', 'claude', 'codex', 'ollama'] },
                 } },
             /** task-1393: voice-out preferences. `/voice` is user-only (DENIED_FOR_MODELS), so only the keyboard sets it. */
             voice: { type: 'object', additional: false, props: {
@@ -518,12 +532,29 @@ export const MIGRATIONS = {
     3: (c, out) => {
         const prior = (c.display && typeof c.display === 'object' ? c.display.priceMode : undefined);
         const priceMode = PRICE_MODES.includes(prior) ? prior : DEFAULT_PRICE_MODE;
-        out.notes.push(`added display.priceMode = ${priceMode} (press $ in the app to show market cap instead of price)`);
+        out.notes.push(`added display.priceMode = ${priceMode} (press $ in the app to switch market cap / USD price)`);
         return { ...c, version: 4, display: { priceMode } };
     },
+    // v4 → v5 (task-1537): market cap is the default price basis. Every saved config carried `priceMode: "price"`
+    // because that was the default written with the first save, so a `price` moves to `mcap` UNLESS the config
+    // journal shows the user chose price themselves (`$`, `dexterm display price`, an approved proposal): that stays.
+    4: (c, out) => {
+        const d = c.display && typeof c.display === 'object' ? { ...c.display } : {};
+        const kept = out.journaledPriceMode === 'price';
+        if (d.priceMode === 'price' && !kept) {
+            d.priceMode = 'mcap';
+            out.notes.push('display.priceMode: market cap is now the default basis (screens, CLI text and the assistant); press $ or run `dexterm display price` to go back to USD price');
+        }
+        else if (d.priceMode === 'price') {
+            out.notes.push('display.priceMode = price kept (you chose it); market cap is the new default, `dexterm display mcap` switches');
+        }
+        else if (!PRICE_MODES.includes(d.priceMode))
+            d.priceMode = DEFAULT_PRICE_MODE;
+        return { ...c, version: 5, display: d };
+    },
 };
-export function migrate(raw) {
-    const out = { notes: [], extractedKeys: {}, from: Number(raw?.version ?? 1), to: CONFIG_VERSION };
+export function migrate(raw, hints = {}) {
+    const out = { notes: [], extractedKeys: {}, from: Number(raw?.version ?? 1), to: CONFIG_VERSION, journaledPriceMode: hints.journaledPriceMode ?? null };
     let cur = raw && typeof raw === 'object' ? structuredClone(raw) : {};
     let v = out.from;
     if (!Number.isInteger(v) || v < 1)

package/dist/packages/custom/src/workspace.js

@@ -6,7 +6,7 @@
 // Workspaces hold NO keys, NO trading settings and NO code: the schema is additional:false and a pack or a
 // Jarvis proposal that tries to smuggle anything else is refused by name (schema.ts). Switching a workspace
 // is a UI action: it can navigate, re-theme and open read-only popups; it can never arm, sign or confirm.
-import { validate, POPUP_KINDS, WORKSPACE_SCREENS } from "./schema.js";
+import { validate, DEFAULT_PRICE_MODE, POPUP_KINDS, WORKSPACE_SCREENS } from "./schema.js";
 import { breakpoint, solve, treeFor, widgetsIn, widgetSpec } from "./layout.js";
 export const DEFAULT_WORKSPACE = 'default';
 export const MORNING_HUD = 'morning-hud';
@@ -114,8 +114,8 @@ export function layoutNumbers(ws, w, h) {
 export function captureWorkspace(name, snap) {
     const start = WORKSPACE_SCREENS.includes(snap.screen) ? snap.screen : 'screener';
     const ws = { name, description: `saved from the ${snap.screen} screen`, start, theme: snap.theme, intensity: snap.intensity };
-    if (snap.priceMode && snap.priceMode !== 'price')
-        ws.priceMode = snap.priceMode;
+    if (snap.priceMode && snap.priceMode !== DEFAULT_PRICE_MODE)
+        ws.priceMode = snap.priceMode; // task-1537: the default is mcap
     if (snap.screens)
         ws.screens = structuredClone(snap.screens);
     const sc = {};