@palmyr/cli 1.1.0 → 1.2.0

package/dist/cli.js

@@ -74,7 +74,7 @@ const BOOLEAN_FLAGS = new Set([
     // compute deploy/ssh flags
     'wait', 'generate-ssh-key', 'generate', 'progress',
     // wallet trading flags
-    'dry-run', 'all', 'protected', 'auto-slippage',
+    'dry-run', 'all', 'protected', 'auto-slippage', 'degen',
     // wallet daemon + triggers flags
     'auto', 'clear',
     // wallet brief flags
@@ -226,10 +226,11 @@ const WALLET_HELP = {
         { flag: '--hold-if "..."', desc: 'Free-form hold condition (informational)' },
         { flag: '--wallet <id|name>', desc: 'Vault wallet to sign with (else env WALLET_SECRET_KEY)' },
         { flag: '--slippage <bps>', desc: 'Explicit slippage in basis points', hint: 'overrides --auto-slippage' },
-        { flag: '--auto-slippage', desc: 'Dynamic slippage from DexScreener 5m volatility (solana)', hint: 'implied by --protected' },
-        { flag: '--protected', desc: 'MEV-protected execution', hint: 'sol: Jito tip + dyn slippage. base: priority-fee bump + PALMYR_BASE_PROTECTED_RPC' },
-        { flag: '--tip <amount>', desc: 'sol: Jito tip lamports (default 10000). base: priority fee in gwei (default 0.001)' },
-        { flag: '--rpc <url>', desc: 'Override RPC endpoint (base: maps to provider URL; bypasses --protected default)' },
+        { flag: '--degen', desc: 'Disable MEV protection + dynamic slippage. Faster / cheaper, no sandwich defense.' },
+        { flag: '--no-protected', desc: 'Disable MEV protection only (keep dynamic slippage)' },
+        { flag: '--no-auto-slippage', desc: 'Disable dynamic slippage only (use config default or --slippage)' },
+        { flag: '--tip <amount>', desc: 'Override the protection tip — sol: Jito tip lamports (default 10000); base: priority fee gwei (default 0.001)' },
+        { flag: '--rpc <url>', desc: 'Override RPC endpoint (base only; default uses PALMYR_BASE_PROTECTED_RPC env if set)' },
         { flag: '--template <name>', desc: 'YAML strategy template (see `wallet template list`). CLI flags win on conflict.' },
         { flag: '--dry-run', desc: 'Simulate without sending the swap' },
     ],
@@ -264,10 +265,11 @@ const WALLET_HELP = {
         { flag: '--reason "..."', desc: 'Why are you exiting? (required)' },
         { flag: '--wallet <id|name>', desc: 'Vault wallet to sign with (else env)' },
         { flag: '--slippage <bps>', desc: 'Explicit slippage in basis points', hint: 'overrides --auto-slippage' },
-        { flag: '--auto-slippage', desc: 'Dynamic slippage from DexScreener 5m volatility (solana)', hint: 'implied by --protected' },
-        { flag: '--protected', desc: 'MEV-protected execution', hint: 'sol: Jito tip + dyn slippage. base: priority-fee bump + PALMYR_BASE_PROTECTED_RPC' },
-        { flag: '--tip <amount>', desc: 'sol: Jito tip lamports (default 10000). base: priority fee in gwei (default 0.001)' },
-        { flag: '--rpc <url>', desc: 'Override RPC endpoint (base only currently)' },
+        { flag: '--degen', desc: 'Disable MEV protection + dynamic slippage' },
+        { flag: '--no-protected', desc: 'Disable MEV protection only' },
+        { flag: '--no-auto-slippage', desc: 'Disable dynamic slippage only' },
+        { flag: '--tip <amount>', desc: 'Override protection tip (sol: Jito lamports; base: priority fee gwei)' },
+        { flag: '--rpc <url>', desc: 'Override RPC endpoint (base only)' },
         { flag: '--dry-run', desc: 'Simulate without sending the swap' },
     ],
     sync: [
@@ -1934,6 +1936,30 @@ async function main() {
                         const cliTrail = flags.trail || undefined;
                         const cliTimeLimit = flags['time-limit'] || undefined;
                         const cliThesisCheck = flags['thesis-check'] || undefined;
+                        // Safe-by-default — protectedExec and autoSlippage default to true
+                        // (MEV-protected with dynamic slippage). `--degen` opts out of both
+                        // for fast/raw execution. `--no-protected` / `--no-auto-slippage`
+                        // disable each individually. Explicit `--protected` is a no-op now
+                        // (kept for back-compat with scripts that pass it).
+                        const degen = !!flags.degen;
+                        const resolveProtected = () => {
+                            if (degen)
+                                return false;
+                            if (flags.protected === false)
+                                return false; // --no-protected
+                            if (flags.protected === true)
+                                return true; // --protected (redundant but explicit)
+                            return undefined; // fall through to template, then default true at lib layer
+                        };
+                        const resolveAutoSlippage = () => {
+                            if (degen)
+                                return false;
+                            if (flags['auto-slippage'] === false)
+                                return false; // --no-auto-slippage
+                            if (flags['auto-slippage'] === true)
+                                return true;
+                            return undefined;
+                        };
                         // Base path — Phase 5b buy, 5c sell+sync, 5d --protected + private RPC.
                         if (chain === 'base') {
                             if (!walletRef)
@@ -1953,7 +1979,7 @@ async function main() {
                                 timeLimit: cliTimeLimit,
                                 thesisCheck: cliThesisCheck,
                                 slippageBps: cliSlippage,
-                                protectedExec: flags.protected === true ? true : undefined,
+                                protectedExec: resolveProtected(),
                                 rpcUrl: flags.rpc || undefined,
                                 priorityFeeWei: cliPriorityFeeWei,
                             };
@@ -1961,6 +1987,10 @@ async function main() {
                                 const { applyTemplateToBuyOpts } = await import('./wallet-strategy-templates.js');
                                 opts = applyTemplateToBuyOpts(template, opts);
                             }
+                            // Final default: protected ON unless user/template said otherwise. --degen already
+                            // forced it false above.
+                            if (opts.protectedExec === undefined)
+                                opts.protectedExec = !degen;
                             if (!opts.amount)
                                 err(`--amount required (e.g. --amount 0.01eth) — not in template or CLI`, EXIT.BAD_INPUT);
                             const { buyBase } = await import('./wallet-trading.js');
@@ -2007,8 +2037,8 @@ async function main() {
                             timeLimit: cliTimeLimit,
                             thesisCheck: cliThesisCheck,
                             slippageBps: cliSlippage,
-                            protectedExec: flags.protected === true ? true : undefined,
-                            autoSlippage: flags['auto-slippage'] === true ? true : undefined,
+                            protectedExec: resolveProtected(),
+                            autoSlippage: resolveAutoSlippage(),
                             jitoTipLamports: flags.tip !== undefined ? Number(flags.tip) : undefined,
                         };
                         if (template) {
@@ -2017,9 +2047,12 @@ async function main() {
                         }
                         if (!solOpts.amount)
                             err(`--amount required (e.g. --amount 0.5sol) — not in template or CLI`, EXIT.BAD_INPUT);
-                        // Normalize booleans for downstream call (undefined → false)
-                        solOpts.protectedExec = !!solOpts.protectedExec;
-                        solOpts.autoSlippage = !!solOpts.autoSlippage;
+                        // Final defaults: MEV protection + dynamic slippage are ON unless --degen, --no-protected,
+                        // --no-auto-slippage, or a template set them off.
+                        if (solOpts.protectedExec === undefined)
+                            solOpts.protectedExec = !degen;
+                        if (solOpts.autoSlippage === undefined)
+                            solOpts.autoSlippage = !degen;
                         const { buy } = await import('./wallet-trading.js');
                         let result;
                         try {
@@ -2138,6 +2171,26 @@ async function main() {
                         const dryRun = !!flags['dry-run'] || process.env.DRY_RUN === '1';
                         const cliTipGwei = flags.tip !== undefined && chain === 'base' ? Number(flags.tip) : undefined;
                         const cliPriorityFeeWei = cliTipGwei !== undefined ? BigInt(Math.round(cliTipGwei * 1e9)) : undefined;
+                        // Safe-by-default for cohort legs. --degen disables; --no-protected / --no-auto-slippage individually disable.
+                        const cohortDegen = !!flags.degen;
+                        const cohortResolveProtected = () => {
+                            if (cohortDegen)
+                                return false;
+                            if (flags.protected === false)
+                                return false;
+                            if (flags.protected === true)
+                                return true;
+                            return undefined;
+                        };
+                        const cohortResolveAutoSlippage = () => {
+                            if (cohortDegen)
+                                return false;
+                            if (flags['auto-slippage'] === false)
+                                return false;
+                            if (flags['auto-slippage'] === true)
+                                return true;
+                            return undefined;
+                        };
                         // Build opts with CLI values; merge template defaults for the rest.
                         let cohortOpts = {
                             chain: chain,
@@ -2154,8 +2207,8 @@ async function main() {
                             timeLimit: flags['time-limit'] || undefined,
                             thesisCheck: flags['thesis-check'] || undefined,
                             slippageBps: flags.slippage !== undefined ? Number(flags.slippage) : undefined,
-                            protectedExec: flags.protected === true ? true : undefined,
-                            autoSlippage: flags['auto-slippage'] === true ? true : undefined,
+                            protectedExec: cohortResolveProtected(),
+                            autoSlippage: cohortResolveAutoSlippage(),
                             jitoTipLamports: flags.tip !== undefined && chain === 'solana' ? Number(flags.tip) : undefined,
                             priorityFeeWei: cliPriorityFeeWei,
                             rpcUrl: flags.rpc || undefined,
@@ -2171,9 +2224,11 @@ async function main() {
                             cohortOpts.jitterMs = jitterMs;
                             cohortOpts.dryRun = dryRun;
                         }
-                        // Normalize booleans (template may leave them undefined)
-                        cohortOpts.protectedExec = !!cohortOpts.protectedExec;
-                        cohortOpts.autoSlippage = !!cohortOpts.autoSlippage;
+                        // Final defaults: protected + auto-slippage ON unless user/template/degen disabled.
+                        if (cohortOpts.protectedExec === undefined)
+                            cohortOpts.protectedExec = !cohortDegen;
+                        if (cohortOpts.autoSlippage === undefined)
+                            cohortOpts.autoSlippage = !cohortDegen;
                         const { cohortBuy } = await import('./wallet-trading.js');
                         let result;
                         try {
@@ -2472,11 +2527,18 @@ async function main() {
                         const walletRef = flags.wallet || undefined;
                         const slippageBps = flags.slippage ? Number(flags.slippage) : undefined;
                         const dryRun = !!flags['dry-run'] || process.env.DRY_RUN === '1';
+                        // Safe-by-default: protected ON unless --degen or --no-protected.
+                        const sellDegen = !!flags.degen;
+                        const sellProtected = sellDegen
+                            ? false
+                            : flags.protected === false ? false : true;
+                        const sellAutoSlippage = sellDegen
+                            ? false
+                            : flags['auto-slippage'] === false ? false : true;
                         // Base sell path — Phase 5c, plus 5d --protected + private RPC.
                         if (chain === 'base') {
                             if (!walletRef)
                                 err('--wallet required for Base. Use a vault wallet name/id or `trading:N`.', EXIT.BAD_INPUT);
-                            const baseProtected = !!flags.protected;
                             const baseRpc = flags.rpc || undefined;
                             const tipGwei = flags.tip ? Number(flags.tip) : undefined;
                             const priorityFeeWei = tipGwei !== undefined
@@ -2492,7 +2554,7 @@ async function main() {
                                     walletRef,
                                     slippageBps,
                                     dryRun,
-                                    protectedExec: baseProtected,
+                                    protectedExec: sellProtected,
                                     rpcUrl: baseRpc,
                                     priorityFeeWei,
                                 });
@@ -2529,8 +2591,6 @@ async function main() {
                             }
                             break;
                         }
-                        const protectedExec = !!flags.protected;
-                        const autoSlippage = !!flags['auto-slippage'];
                         const jitoTipLamports = flags.tip ? Number(flags.tip) : undefined;
                         const { sell } = await import('./wallet-trading.js');
                         let result;
@@ -2542,8 +2602,8 @@ async function main() {
                                 walletRef,
                                 slippageBps,
                                 dryRun,
-                                protectedExec,
-                                autoSlippage,
+                                protectedExec: sellProtected,
+                                autoSlippage: sellAutoSlippage,
                                 jitoTipLamports,
                             });
                         }