dexbot 1.6.4 → 1.6.5

package/dist/modules/account_bots.js

@@ -49,12 +49,13 @@
  *       "active": true,
  *       "dryRun": false,
  *       "startPrice": "pool",      // Price for order alignment: "pool", "book", or numeric
- *       "gridPrice": null,         // Reference price for x-factor bounds (3 options):
- *                                  //   "pool" / "book" = live pair price reference
+ *       "gridPrice": "ama3",       // Reference price for x-factor bounds (default "ama3"):
  *                                  //   "ama"/"ama1".."ama4" = market adapter writes a center snapshot to
  *                                  //              profiles/orders/<botKey>.dynamicgrid.json; grid reads the effective center on reset
- *                                  //   <number> = fixed numeric reference
- *                                  //   null     = use startPrice
+ *                                  //   "pool" / "book" = live pair price reference (legacy, editor no longer offers it)
+ *                                  //   <number> = fixed numeric reference (legacy)
+ *                                  //   null     = use startPrice (legacy); also accepted: false, empty/blank,
+ *                                  //              and the "none"/"null"/"start"/"startprice"/"s"/"n"/"no"/"f"/"0" spellings
  *       "minPrice": "2x",
  *       "maxPrice": "2x",
  *       "incrementPercent": 0.5,
@@ -87,11 +88,13 @@ import { path } from './path_api.js';
 import { getStorage } from './storage/index.js';
 import { ensureProfilesDirectory, readInput, sleep } from './order/utils/system.js';
 import { setGlobalConsoleLevel, getGlobalConsoleLevel } from './order/logger.js';
-import { DEFAULT_CONFIG, GRID_LIMITS, TIMING, RANGE_QUALITY, LOG_LEVEL, UPDATER, MARKET_ADAPTER, NODE_MANAGEMENT, FILL_PROCESSING, PIPELINE_TIMING, CREDENTIAL_PROMPTS, MAINTENANCE, COW_PERFORMANCE, INCREMENT_BOUNDS, FEE_PARAMETERS, API_LIMITS, LOGGING_CONFIG, NATIVE_CLIENT, LAUNCHER } from './constants.js';
+import { GRID_LIMITS, RANGE_QUALITY, MARKET_ADAPTER, NODE_MANAGEMENT, INCREMENT_BOUNDS, buildDefaultGeneralSettings } from './constants.js';
+import { seedBotDraft, isUnsetGridPrice } from './bot_defaults.js';
 import { PATHS } from './paths.js';
 import { SETTINGS_FILE, readGeneralSettings, writeGeneralSettings } from './general_settings.js';
 import { parseJsonWithComments } from './order/utils/system.js';
-import { assertNoDuplicateBotKeys, loadSettingsFile } from './bot_settings.js';
+import { assertNoDuplicateBotKeys, loadSettingsFile, normalizeBotEntry } from './bot_settings.js';
+import { getWhitelistFlags, setWhitelistFlags, renameWhitelistEntry, removeWhitelistEntry, whitelistFile } from './market_adapter_whitelist.js';
 import { BOT_LIVE_CONFIG_KEYS } from './runtime_settings.js';
 import { mergeSettings } from './settings_merge.js';
 import { getErrorMessage } from './utils/errors.js';
@@ -157,26 +160,9 @@ function saveBotsConfig(config, filePath) {
  * @returns {Object} The loaded settings or default settings if the file doesn't exist.
  */
 function loadGeneralSettings() {
-    const defaults = {
-        LOG_LEVEL: LOG_LEVEL,
-        GRID_LIMITS: { ...GRID_LIMITS, GRID_COMPARISON: { ...GRID_LIMITS.GRID_COMPARISON } },
-        TIMING: { ...TIMING },
-        UPDATER: { ...UPDATER },
-        MARKET_ADAPTER: { ...MARKET_ADAPTER },
-        NODE_MANAGEMENT: { ...NODE_MANAGEMENT },
-        DEFAULT_CONFIG: { ...DEFAULT_CONFIG },
-        FILL_PROCESSING: { ...FILL_PROCESSING },
-        PIPELINE_TIMING: { ...PIPELINE_TIMING },
-        CREDENTIAL_PROMPTS: { ...CREDENTIAL_PROMPTS },
-        MAINTENANCE: { ...MAINTENANCE },
-        COW_PERFORMANCE: { ...COW_PERFORMANCE },
-        INCREMENT_BOUNDS: { ...INCREMENT_BOUNDS },
-        FEE_PARAMETERS: { ...FEE_PARAMETERS },
-        API_LIMITS: { ...API_LIMITS },
-        LOGGING_CONFIG: { ...LOGGING_CONFIG },
-        NATIVE_CLIENT: { ...NATIVE_CLIENT },
-        LAUNCHER: { ...LAUNCHER },
-    };
+    // Single canonical defaults document (modules/constants.ts) — same source
+    // the first-run generator and the local-overrides merge use.
+    const defaults = buildDefaultGeneralSettings();
     const settings = readGeneralSettings({
         fallback: null,
         onError: (err) => {
@@ -190,6 +176,14 @@ function loadGeneralSettings() {
         ? configuredDeltaPercent
         : MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT;
     merged.MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT = effectiveDeltaPercent;
+    // MARKET_ADAPTER validation for AMA_SLOPE_DELTA_THRESHOLD_PERCENT (the
+    // slope trigger factor: (value/100) x maxSlopePct). Same >0 guard so a
+    // hand-edited 0/negative/NaN can never disable the slope reset silently.
+    const configuredSlopeDeltaPercent = Number(merged.MARKET_ADAPTER.AMA_SLOPE_DELTA_THRESHOLD_PERCENT);
+    const effectiveSlopeDeltaPercent = Number.isFinite(configuredSlopeDeltaPercent) && configuredSlopeDeltaPercent > 0
+        ? configuredSlopeDeltaPercent
+        : MARKET_ADAPTER.AMA_SLOPE_DELTA_THRESHOLD_PERCENT;
+    merged.MARKET_ADAPTER.AMA_SLOPE_DELTA_THRESHOLD_PERCENT = effectiveSlopeDeltaPercent;
     return merged;
 }
 /**
@@ -559,6 +553,13 @@ function isDynamicPriceSource(value) {
     const lower = value.trim().toLowerCase();
     return lower === 'pool' || lower === 'book' || /^ama(?:[1-4])?$/.test(lower);
 }
+/**
+ * AMA grid-price values: the four explicit presets ama1..ama4 plus bare
+ * "ama" (the pair's default preset). Bare "ama" is a valid green value but is
+ * deliberately not listed in the prompt label. These are the ONLY values that
+ * color green — pool/book/numeric/none stay accepted, just displayed red.
+ */
+const AMA_GRID_PRICE_PATTERN = /^ama(?:[1-4])?$/;
 /**
  * Colors a start-price value for display: green when it is a dynamic source
  * ("pool"/"book"), red when it is a fixed numeric price (no live rescaling).
@@ -573,26 +574,53 @@ function colorStartPriceValue(value) {
     return `${COLORS.red}${text}${COLORS.reset}`;
 }
 /**
- * Colors a grid-price value for display: green for dynamic sources
- * ("pool"/"book"/AMA keywords), red for fixed numeric references. A null
- * gridPrice delegates to startPrice, so the "startPrice" label inherits the
- * start-price coloring.
+ * Colors a grid-price value for display: GREEN only for AMA values
+ * ("ama"/"ama1".."ama4"), RED for everything else — pool/book references,
+ * numeric values and any unset grid price (null, false, blank/whitespace, and
+ * the "none"/"s"/"no"/"f"/"start" aliases) which delegates to startPrice and is
+ * therefore labeled "startPrice", always in red: the delegation itself is the
+ * thing the editor wants replaced by an AMA preset.
  * @param {*} value - The grid price value to color.
- * @param {*} [startPrice] - The bot's current startPrice for null resolution.
  * @returns {string} ANSI-colored value string.
  */
-function colorGridPriceValue(value, startPrice) {
-    if (value === null || value === undefined) {
-        const label = isDynamicPriceSource(startPrice)
-            ? `${COLORS.green}startPrice${COLORS.reset}`
-            : `${COLORS.red}startPrice${COLORS.reset}`;
-        return label;
+function colorGridPriceValue(value) {
+    if (isUnsetGridPrice(value)) {
+        return `${COLORS.red}startPrice${COLORS.reset}`;
     }
     const text = String(value);
-    if (isDynamicPriceSource(text))
+    if (AMA_GRID_PRICE_PATTERN.test(text.trim().toLowerCase()))
         return `${COLORS.green}${text}${COLORS.reset}`;
     return `${COLORS.red}${text}${COLORS.reset}`;
 }
+/**
+ * True when startPrice === "pool" and no poolRef is pinned, so the runtime
+ * auto-selects the pair's default pool for order alignment. Deliberately NOT
+ * keyed on gridPrice === "pool": anchoring the grid reference on the live
+ * market price is discouraged and stays red in the GridPrice field, so the
+ * Pool label must not read as a green healthy default for that case.
+ * @param {*} data - The bot draft.
+ * @returns {boolean}
+ */
+function startPriceUsesDefaultPool(data) {
+    return String(data?.startPrice ?? '').trim().toLowerCase() === 'pool';
+}
+/**
+ * Colors the pool label for the editor summary. An unset poolRef does NOT
+ * mean "no pool": when startPrice is "pool" the runtime auto-selects the
+ * pair's default pool, so it reads green `default`. Otherwise the pin is
+ * inert, shown as grey `none` so it does not compete with live values (a
+ * gridPrice of "pool"/"book" is discouraged and stays red in its own field).
+ * Display only — the stored poolRef is never changed here.
+ * @param {*} data - The bot draft.
+ * @returns {string} ANSI-colored pinned pool ID, `default` (green), or `none` (grey).
+ */
+function formatPoolRefLabel(data) {
+    if (data?.poolRef)
+        return String(data.poolRef);
+    if (startPriceUsesDefaultPool(data))
+        return `${COLORS.green}default${COLORS.reset}`;
+    return `${COLORS.gray}none${COLORS.reset}`;
+}
 /**
  * Colors a boolean flag value for display: green when the flag is in its
  * healthy state, red when it is not.
@@ -600,13 +628,15 @@ function colorGridPriceValue(value, startPrice) {
  * @param {boolean} greenWhenTrue - True when `true` is the healthy state
  *                                   (e.g. Active), false when `false` is
  *                                   healthy (e.g. DryRun off).
+ * @param {string} [offColor] - Color for the unhealthy value (default red);
+ *                              pass a warn color for flags that are optional.
  * @returns {string} ANSI-colored "true"/"false" string.
  */
-function colorBooleanFlag(value, greenWhenTrue) {
+function colorBooleanFlag(value, greenWhenTrue, offColor = COLORS.red) {
     const isTrue = !!value;
     const healthy = greenWhenTrue ? isTrue : !isTrue;
     const text = String(isTrue);
-    return healthy ? `${COLORS.green}${text}${COLORS.reset}` : `${COLORS.red}${text}${COLORS.reset}`;
+    return healthy ? `${COLORS.green}${text}${COLORS.reset}` : `${offColor}${text}${COLORS.reset}`;
 }
 /**
  * Converts a cron string to a readable format (days delta and time).
@@ -892,20 +922,46 @@ async function askNumberOrPercentage(promptText, defaultValue) {
     }
     return parsed;
 }
+/**
+ * Parses a raw boolean answer.
+ * Accepted: y/yes/true/1/t → true, n/no/false/0/f → false (case-insensitive);
+ * empty input keeps the current/default value; anything else is rejected so
+ * the caller can re-prompt (the old `startsWith('y')` rule silently parsed
+ * "true" as false).
+ * @param {string} raw - Raw prompt input.
+ * @param {boolean} [defaultValue] - Value returned for empty input.
+ * @returns {{ ok: boolean, value?: boolean }} ok=false for unrecognized input.
+ */
+function parseBooleanInput(raw, defaultValue) {
+    const value = String(raw ?? '').trim().toLowerCase();
+    if (!value)
+        return { ok: true, value: !!defaultValue };
+    if (value === 'y' || value === 'yes' || value === 'true' || value === '1' || value === 't')
+        return { ok: true, value: true };
+    if (value === 'n' || value === 'no' || value === 'false' || value === '0' || value === 'f')
+        return { ok: true, value: false };
+    return { ok: false };
+}
 /**
  * Prompts the user for a boolean value (Y/n).
+ * Enter keeps the current/default value; unrecognized input re-prompts with
+ * a hint instead of silently coercing. See parseBooleanInput for the exact
+ * accepted spellings.
  * @param {string} promptText - The prompt text to display.
  * @param {boolean} [defaultValue] - The default value to use if input is empty.
  * @returns {Promise<boolean|string>} The boolean value or '\x1b' if ESC.
  */
 async function askBoolean(promptText, defaultValue) {
     const label = defaultValue ? 'Y/n' : 'y/N';
-    const raw = (await readInput(`${promptText} (${label}): `)).trim().toLowerCase();
-    if (raw === '\x1b')
-        return '\x1b';
-    if (!raw)
-        return !!defaultValue;
-    return raw.startsWith('y');
+    for (;;) {
+        const raw = (await readInput(`${promptText} (${label}): `)).trim().toLowerCase();
+        if (raw === '\x1b')
+            return '\x1b';
+        const parsed = parseBooleanInput(raw, !!defaultValue);
+        if (parsed.ok)
+            return parsed.value;
+        console.log('Please enter y/yes/true or n/no/false (Enter keeps the current value).');
+    }
 }
 /**
  * Prompts the user for the start price (numeric or "pool"/"book").
@@ -969,38 +1025,49 @@ async function askPoolRef(promptText, currentValue) {
     }
 }
 /**
- * Prompts the user for the grid price mode (pool, book, ama, numeric, or startprice).
+ * Prompts the user for the grid price mode.
+ * The label lists ama1..ama4; bare "ama" is accepted as well (green) but not
+ * listed. The live colorizer echoes AMA input green and every other value
+ * (pool/book/number/none) red — red only flags "not an AMA value", it does not
+ * reject: pool, book, numeric references, none/null (delegate to startPrice)
+ * and bare "ama" all stay accepted, exactly as before. Only input that is not
+ * a value at all is rejected, with a red error line.
  * @param {string} promptText - The prompt text to display.
- * @param {string} [defaultValue] - The default value to use if input is empty.
- * @param {*} [startPrice] - The bot's current startPrice, used to color the
- *                           "startPrice" default label when gridPrice is null.
- * @returns {Promise<string>} The grid price mode or '\x1b' if ESC.
+ * @param {string} [defaultValue] - The current value, offered as the Enter default.
+ * @returns {Promise<any>} The normalized grid-price value, the unchanged
+ *                         current value on Enter, or '\x1b' if ESC.
  */
-async function askGridPriceMode(promptText, defaultValue, startPrice) {
+async function askGridPriceMode(promptText, defaultValue) {
     while (true) {
-        const coloredDefault = defaultValue === null || defaultValue === undefined
-            ? colorGridPriceValue(null, startPrice)
-            : colorGridPriceValue(defaultValue);
-        const raw = (await readInput(`${promptText} [${coloredDefault}]: `, {
-            colorize: (input) => colorGridPriceValue(input)
-        })).trim();
+        const coloredDefault = colorGridPriceValue(defaultValue ?? null);
+        const raw = await readInput(`${promptText} [${coloredDefault}]: `, {
+            colorize: (input) => colorGridPriceValue(input),
+            // Keep whitespace so a deactivating space can be told apart from a
+            // bare Enter that means "keep current".
+            trimInput: false
+        });
         if (raw === '\x1b')
             return '\x1b';
-        if (!raw)
-            return defaultValue === undefined ? null : defaultValue;
-        const lower = raw.toLowerCase();
-        if (lower === 'none' || lower === 'null' || lower === 'start' || lower === 'startprice')
+        // A bare Enter keeps the current value (an already-unset value is
+        // normalized to null so it is stored as delegation). Whitespace-only
+        // input is NOT a bare Enter: the live echo already previews it as red
+        // startPrice, so it must overwrite with null — otherwise the preview
+        // would promise startPrice while the old value silently survived.
+        if (raw === '')
+            return isUnsetGridPrice(defaultValue) ? null : (defaultValue === undefined ? null : defaultValue);
+        const lower = raw.trim().toLowerCase();
+        if (isUnsetGridPrice(lower))
             return null;
         if (lower === 'pool')
             return lower;
         if (lower === 'book')
             return 'book';
-        if (/^ama(?:[1-4])?$/.test(lower))
+        if (AMA_GRID_PRICE_PATTERN.test(lower))
             return lower;
         const num = Number(raw);
         if (Number.isFinite(num) && num > 0)
             return num;
-        console.log('Please enter: pool, book, ama, ama1..ama4, a positive number, or none/startprice.');
+        console.log(`${COLORS.red}Please enter: ama1, ama2, ama3 or ama4 — also allowed: pool, book, ama, a positive number, or none (s/start, n/no/false/0/f).${COLORS.reset}`);
     }
 }
 /**
@@ -1010,36 +1077,10 @@ async function askGridPriceMode(promptText, defaultValue, startPrice) {
  * @returns {Object} A normalized bot draft.
  */
 function normalizeBotDraft(base = {}) {
-    const data = JSON.parse(JSON.stringify(base));
-    if (!data.weightDistribution)
-        data.weightDistribution = { ...DEFAULT_CONFIG.weightDistribution };
-    if (!data.botFunds)
-        data.botFunds = { ...DEFAULT_CONFIG.botFunds };
-    if (!data.activeOrders)
-        data.activeOrders = { ...DEFAULT_CONFIG.activeOrders };
-    if (typeof data.reserveOrders === 'number')
-        data.reserveOrders = { buy: Math.max(0, Math.floor(data.reserveOrders)), sell: 0 };
-    if (data.reserveOrders === undefined || data.reserveOrders === null || typeof data.reserveOrders !== 'object' || Array.isArray(data.reserveOrders))
-        data.reserveOrders = { ...DEFAULT_CONFIG.reserveOrders };
-    if (data.active === undefined)
-        data.active = DEFAULT_CONFIG.active;
-    if (data.dryRun === undefined)
-        data.dryRun = DEFAULT_CONFIG.dryRun;
-    if (data.minPrice === undefined)
-        data.minPrice = DEFAULT_CONFIG.minPrice;
-    if (data.maxPrice === undefined)
-        data.maxPrice = DEFAULT_CONFIG.maxPrice;
-    if (data.incrementPercent === undefined)
-        data.incrementPercent = DEFAULT_CONFIG.incrementPercent;
-    if (data.targetSpreadPercent === undefined)
-        data.targetSpreadPercent = DEFAULT_CONFIG.targetSpreadPercent;
-    if (data.startPrice === undefined)
-        data.startPrice = data.startPrice || DEFAULT_CONFIG.startPrice || 'pool';
-    if (data.gridPrice === undefined)
-        data.gridPrice = null;
-    delete data.gridPriceOffsetPct;
-    delete data.gridPriceOffsetClampToBounds;
-    return data;
+    // Seeding rules live in modules/bot_defaults.ts (single defaults source).
+    // Return type stays `any`: the editor prompt-flow treats drafts as dynamic
+    // bags and its inference depends on it.
+    return seedBotDraft(base);
 }
 /**
  * Resolve data.preferredAccount to a chain account ID and stamp data.accountId
@@ -1162,10 +1203,30 @@ async function ensureBotAccountId(data, timeoutMs = 15000, quiet = false, force
 /**
  * Interactive menu to edit bot data.
  * @param {Object} [base={}] - The initial bot data to edit.
- * @returns {Promise<Object|null>} The edited bot data or null if cancelled.
+ * @param {number} [index=0] - Position the edited bot will occupy in the
+ *   bots array (used to derive the same botKey the runtime uses for unnamed
+ *   fallback entries).
+ * @param {number} [baseIndex=index] - Position the base entry currently
+ *   occupies (differs from `index` for copies, whose source sits elsewhere).
+ * @returns {Promise<{ data: any, commitAdapter: (() => void)|null }|null>}
+ *   The edited draft plus a commit hook for staged `6) Adapter` flags — the
+ *   caller MUST run `commitAdapter()` only after its bots.json save succeeded
+ *   (so a failed save never leaves the whitelist out of sync), or null when
+ *   cancelled.
  */
-async function promptBotData(base = {}) {
+async function promptBotData(base = {}, index = 0, baseIndex = index) {
     const data = normalizeBotDraft(base);
+    // Market-adapter flags (6) Adapter) live in
+    // profiles/market_adapter_whitelist.json keyed by botKey — the same file
+    // the market adapter reads. Stage edits here and expose them through the
+    // commit hook so Cancel (or a failed bots.json save) discards them
+    // together with the rest of the draft.
+    const baseEntry = base && typeof base === 'object' && Object.keys(base).length > 0 ? base : null;
+    const baseBotKey = baseEntry ? String(normalizeBotEntry(baseEntry, baseIndex).botKey || '') : '';
+    let adapterStaged = null;
+    const isAmaGridPriceDraft = () => /^ama(?:[1-4])?$/.test(String(data.gridPrice ?? '').trim().toLowerCase());
+    const adapterFlags = () => adapterStaged
+        || getWhitelistFlags(baseBotKey || String(normalizeBotEntry(data, index).botKey || ''));
     let finished = false;
     let cancelled = false;
     let showMenu = true;
@@ -1173,17 +1234,28 @@ async function promptBotData(base = {}) {
         if (showMenu) {
             console.log(`\n${COLORS.bold}--- Bot Editor: ` + (data.name || 'New Bot') + ` ---${COLORS.reset}`);
             console.log(`${COLORS.yellowBold}1) Pair:${COLORS.reset}       ${COLORS.cyan}${data.assetA || '?'} / ${data.assetB || '?'}${COLORS.reset}`);
-            console.log(`${COLORS.yellowBold}2) Identity:${COLORS.reset}   ${COLORS.orange}Name:${COLORS.reset} ${data.name || '?'} , ${COLORS.orange}Account:${COLORS.reset} ${data.preferredAccount || '?'} , ${COLORS.orange}Active:${COLORS.reset} ${colorBooleanFlag(data.active, true)}, ${COLORS.orange}DryRun:${COLORS.reset} ${colorBooleanFlag(data.dryRun, false)}`);
-            console.log(`${COLORS.yellowBold}3) Price:${COLORS.reset}      ${COLORS.orange}Range:${COLORS.reset} [${colorPriceRangeValue(data.minPrice)} - ${colorPriceRangeValue(data.maxPrice)}], ${COLORS.orange}Start:${COLORS.reset} ${colorStartPriceValue(data.startPrice)}, ${COLORS.orange}Pool:${COLORS.reset} ${data.poolRef || 'none'}, ${COLORS.orange}GridPrice:${COLORS.reset} ${colorGridPriceValue(data.gridPrice, data.startPrice)}`);
-            console.log(`${COLORS.yellowBold}4) Grid:${COLORS.reset}       ${COLORS.orange}Weights:${COLORS.reset} (S:${data.weightDistribution.sell}, B:${data.weightDistribution.buy}), ${COLORS.orange}Incr:${COLORS.reset} ${data.incrementPercent}%, ${COLORS.orange}Spread:${COLORS.reset} ${data.targetSpreadPercent}%`);
+            console.log(`${COLORS.yellowBold}2) Identity:${COLORS.reset}   ${COLORS.orange}Name:${COLORS.reset} ${data.name || '?'} | ${COLORS.orange}Account:${COLORS.reset} ${data.preferredAccount || '?'} | ${COLORS.orange}Active:${COLORS.reset} ${colorBooleanFlag(data.active, true)}, ${COLORS.orange}DryRun:${COLORS.reset} ${colorBooleanFlag(data.dryRun, false)}`);
+            console.log(`${COLORS.yellowBold}3) Price:${COLORS.reset}      ${COLORS.orange}Range:${COLORS.reset} [${colorPriceRangeValue(data.minPrice)} - ${colorPriceRangeValue(data.maxPrice)}] | ${COLORS.orange}Start:${COLORS.reset} ${colorStartPriceValue(data.startPrice)}, ${COLORS.orange}Pool:${COLORS.reset} ${formatPoolRefLabel(data)} | ${COLORS.orange}GridPrice:${COLORS.reset} ${colorGridPriceValue(data.gridPrice)}`);
+            console.log(`${COLORS.yellowBold}4) Grid:${COLORS.reset}       ${COLORS.orange}Weights:${COLORS.reset} (S:${data.weightDistribution.sell}, B:${data.weightDistribution.buy}) | ${COLORS.orange}Incr:${COLORS.reset} ${data.incrementPercent}%, ${COLORS.orange}Spread:${COLORS.reset} ${data.targetSpreadPercent}%`);
             console.log(`${COLORS.yellowBold}5) Funding:${COLORS.reset}    ${COLORS.orange}Sell:${COLORS.reset} ${colorPercentageInput(data.botFunds.sell)}, ${COLORS.orange}Buy:${COLORS.reset} ${colorPercentageInput(data.botFunds.buy)} | ${COLORS.orange}Orders:${COLORS.reset} (S:${data.activeOrders.sell}, B:${data.activeOrders.buy}) | ${COLORS.orange}Reserve:${COLORS.reset} (S:${data.reserveOrders?.sell ?? 0}, B:${data.reserveOrders?.buy ?? 0})`);
+            {
+                const flags = adapterFlags();
+                const inert = !isAmaGridPriceDraft() && (flags.ama || flags.dynamicWeight || flags.asymmetricBounds);
+                const hint = inert ? ` ${COLORS.red}(needs gridPrice=ama)${COLORS.reset}` : '';
+                // Adapter flags read as a health state, not a neutral toggle:
+                // green = on (colorBooleanFlag's greenWhenTrue form, same
+                // helper section 2 uses for Active). Price is the gate for the
+                // other two, so off stays red; Weight/Range are optional
+                // riders, so off is a bright-yellow warning rather than an error.
+                console.log(`${COLORS.yellowBold}6) Adapter:${COLORS.reset}    ${COLORS.orange}Price:${COLORS.reset} ${colorBooleanFlag(flags.ama, true)}, ${COLORS.orange}Weight:${COLORS.reset} ${colorBooleanFlag(flags.dynamicWeight, true, COLORS.yellowBold)}, ${COLORS.orange}Range:${COLORS.reset} ${colorBooleanFlag(flags.asymmetricBounds, true, COLORS.yellowBold)}${hint}`);
+            }
             console.log('--------------------------------------------------');
             console.log(`${COLORS.greenBold}S) Save & Exit${COLORS.reset}`);
             console.log(`${COLORS.white}C) Cancel (Discard changes)${COLORS.reset}`);
             showMenu = false;
         }
         const choice = (await readInput('Select section to edit or action: ', {
-            validate: (input) => ['1', '2', '3', '4', '5', 's', 'c'].includes(input.toLowerCase())
+            validate: (input) => ['1', '2', '3', '4', '5', '6', 's', 'c'].includes(input.toLowerCase())
         })).trim().toLowerCase();
         if (choice === '\x1b') {
             finished = true;
@@ -1260,7 +1332,7 @@ async function promptBotData(base = {}) {
                 const poolR = await askPoolRef('poolRef (pinned pool ID for price source)', data.poolRef);
                 if (poolR === '\x1b')
                     break;
-                const gp = await askGridPriceMode('gridPrice (pool/book/ama/number/none)', data.gridPrice, data.startPrice);
+                const gp = await askGridPriceMode('gridPrice (ama1/ama2/ama3/ama4)', data.gridPrice);
                 if (gp === '\x1b')
                     break;
                 data.minPrice = minP;
@@ -1318,6 +1390,29 @@ async function promptBotData(base = {}) {
                 data.reserveOrders = { buy: rBuy, sell: rSell };
                 showMenu = true;
                 break;
+            case '6': {
+                // Per-bot market-adapter flags (Price = AMA pricing, Weight =
+                // dynamic weights, Range = asymmetric range scaling).
+                const flags = adapterFlags();
+                if (!isAmaGridPriceDraft()) {
+                    console.log(`${COLORS.gray}Note: these flags only take effect when gridPrice is ama/ama1..ama4 (set in 3) Price).${COLORS.reset}`);
+                }
+                const price = await askBoolean('AMA pricing (Price)', flags.ama);
+                if (price === '\x1b')
+                    break;
+                const weight = await askBoolean('Dynamic weights (Weight)', flags.dynamicWeight);
+                if (weight === '\x1b')
+                    break;
+                const range = await askBoolean('Range scaling (Range)', flags.asymmetricBounds);
+                if (range === '\x1b')
+                    break;
+                adapterStaged = { ama: price, dynamicWeight: weight, asymmetricBounds: range };
+                if (!price && (weight || range)) {
+                    console.log(`${COLORS.yellow}Note: Weight/Range only take effect while Price (AMA) is enabled.${COLORS.reset}`);
+                }
+                showMenu = true;
+                break;
+            }
             case 's':
                 // Final basic validation before saving
                 if (!data.name || !data.assetA || !data.assetB || !data.preferredAccount) {
@@ -1350,11 +1445,40 @@ async function promptBotData(base = {}) {
     }
     if (cancelled)
         return null;
+    // Staged 6) Adapter flags become a commit hook instead of an immediate
+    // write: the caller runs it only after its bots.json save succeeded, so
+    // the whitelist can never end up updated by a save that was rejected
+    // (duplicate bot keys, write error). Writes are skipped when the staged
+    // flags already match what is stored — an unchanged save never creates a
+    // placeholder entry.
+    const stagedFlags = adapterStaged;
+    const commitAdapter = stagedFlags ? () => {
+        const newKey = String(normalizeBotEntry(data, index).botKey || '');
+        const needRename = !!(baseBotKey && newKey && baseBotKey !== newKey);
+        const current = getWhitelistFlags(baseBotKey || newKey);
+        const unchanged = stagedFlags.ama === current.ama
+            && stagedFlags.dynamicWeight === current.dynamicWeight
+            && stagedFlags.asymmetricBounds === current.asymmetricBounds;
+        if (needRename && !renameWhitelistEntry(baseBotKey, newKey)) {
+            console.log(`${COLORS.yellow}Adapter flags not saved — see the warning above.${COLORS.reset}`);
+            return;
+        }
+        // Unchanged flags need no write — a successful rename above already
+        // migrated the entry under the new key.
+        if (unchanged)
+            return;
+        if (!setWhitelistFlags(newKey, stagedFlags)) {
+            console.log(`${COLORS.yellow}Warning: adapter flags not saved — could not write ${whitelistFile()}.${COLORS.reset}`);
+        }
+        else {
+            console.log(`${COLORS.green}Adapter flags saved for '${newKey}'. Price/Weight are picked up on the adapter's next cycle; Range scaling applies after 'dexbot reset ${data.name}'.${COLORS.reset}`);
+        }
+    } : null;
     // Return the final data structure, preserving ALL fields from the normalized
     // draft (deep-copy of base + defaults, minus stripped runtime-managed fields).
     // A fixed whitelist here would silently drop custom overrides (logging, timing,
     // feeParams, gridLimits, poolRef, etc.) when the caller replaces the bot entry.
-    return { ...data };
+    return { data: { ...data }, commitAdapter };
 }
 /**
  * Interactive menu to edit general settings.
@@ -1365,7 +1489,7 @@ async function promptGeneralSettings() {
     let finished = false;
     while (!finished) {
         console.log(`${COLORS.bold}--- General Settings (Global) ---${COLORS.reset}`);
-        console.log(`${COLORS.yellowBold}1) Grid Health:${COLORS.reset}   ${COLORS.orange}Ratio:${COLORS.reset} ${settings.GRID_LIMITS.GRID_REGENERATION_PERCENTAGE}%, ${COLORS.orange}RMS:${COLORS.reset} ${settings.GRID_LIMITS.GRID_COMPARISON.RMS_PERCENTAGE}%, ${COLORS.orange}AMA Delta:${COLORS.reset} ${settings.MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT}%`);
+        console.log(`${COLORS.yellowBold}1) Grid Health:${COLORS.reset}   ${COLORS.orange}Funds:${COLORS.reset} ${settings.GRID_LIMITS.GRID_REGENERATION_PERCENTAGE}%, ${COLORS.orange}RMS:${COLORS.reset} ${settings.GRID_LIMITS.GRID_COMPARISON.RMS_PERCENTAGE}%, ${COLORS.orange}AMA Δ:${COLORS.reset} ${settings.MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT}%, ${COLORS.orange}AMA-Slope Δ:${COLORS.reset} ${settings.MARKET_ADAPTER.AMA_SLOPE_DELTA_THRESHOLD_PERCENT}%`);
         console.log(`${COLORS.yellowBold}2) Order Recovery:${COLORS.reset} ${COLORS.orange}Dust Threshold:${COLORS.reset} ${settings.GRID_LIMITS.PARTIAL_DUST_THRESHOLD_PERCENTAGE}%`);
         const nodeCount = (settings.NODES.list || []).length;
         const hcIntervalMin = ((settings.NODES.healthCheck?.intervalMs || NODE_MANAGEMENT.HEALTH_CHECK_INTERVAL_MS) / 60000).toFixed(0);
@@ -1387,18 +1511,22 @@ async function promptGeneralSettings() {
         }
         switch (choice) {
             case '1':
-                const gRegen = await askNumberWithBounds('Grid Ratio Regeneration %', settings.GRID_LIMITS.GRID_REGENERATION_PERCENTAGE, 0.1, 50);
+                const gRegen = await askNumberWithBounds('Grid Funds Regeneration %', settings.GRID_LIMITS.GRID_REGENERATION_PERCENTAGE, 0.1, 50);
                 if (gRegen === '\x1b')
                     break;
                 const rms = await askNumberWithBounds('RMS Divergence Threshold %', settings.GRID_LIMITS.GRID_COMPARISON.RMS_PERCENTAGE, 1, 100);
                 if (rms === '\x1b')
                     break;
-                const amaDelta = await askNumberWithBounds('AMA Delta Threshold %', settings.MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT, 0.1, 50.0);
+                const amaDelta = await askNumberWithBounds('AMA Δ', settings.MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT, 0.1, 50.0);
                 if (amaDelta === '\x1b')
                     break;
+                const amaSlopeDelta = await askNumberWithBounds('AMA-Slope Δ', settings.MARKET_ADAPTER.AMA_SLOPE_DELTA_THRESHOLD_PERCENT, 0.1, 100.0);
+                if (amaSlopeDelta === '\x1b')
+                    break;
                 settings.GRID_LIMITS.GRID_REGENERATION_PERCENTAGE = gRegen;
                 settings.GRID_LIMITS.GRID_COMPARISON.RMS_PERCENTAGE = rms;
                 settings.MARKET_ADAPTER.AMA_DELTA_THRESHOLD_PERCENT = amaDelta;
+                settings.MARKET_ADAPTER.AMA_SLOPE_DELTA_THRESHOLD_PERCENT = amaSlopeDelta;
                 break;
             case '2':
                 const dust = await askNumberWithBounds('Partial Dust Threshold %', settings.GRID_LIMITS.PARTIAL_DUST_THRESHOLD_PERCENTAGE, 0.1, 50);
@@ -1528,12 +1656,13 @@ async function main() {
             case '1': {
                 while (true) {
                     try {
-                        const entry = await promptBotData();
-                        if (!entry)
+                        const result = await promptBotData({}, config.bots.length);
+                        if (!result)
                             break;
-                        config.bots.push(entry);
+                        config.bots.push(result.data);
                         saveBotsConfig(config, filePath);
-                        console.log(`\nAdded bot '${entry.name}' to ${path.basename(filePath)}.`);
+                        result.commitAdapter?.();
+                        console.log(`\nAdded bot '${result.data.name}' to ${path.basename(filePath)}.`);
                     }
                     catch (err) {
                         console.log(`\n❌ Invalid input: ${getErrorMessage(err)}\n`);
@@ -1548,10 +1677,12 @@ async function main() {
                     if (idx === null || idx === '\x1b')
                         break;
                     try {
-                        const entry = await promptBotData(config.bots[idx]);
-                        if (entry) {
-                            config.bots[idx] = entry;
+                        const result = await promptBotData(config.bots[idx], idx);
+                        if (result) {
+                            config.bots[idx] = result.data;
                             saveBotsConfig(config, filePath);
+                            result.commitAdapter?.();
+                            const entry = result.data;
                             console.log(`saved settings '${entry.name}' in ${path.basename(filePath)}.\n`);
                             console.log(`Live pickup (~1min, no reload needed): ${BOT_LIVE_CONFIG_KEYS.join(' / ')}.`);
                             console.log(`Grid geometry needs 'dexbot reset ${entry.name}' (or 'dexbot reload' for everything at once); market/account changes need 'dexbot reload'.\n`);
@@ -1573,8 +1704,17 @@ async function main() {
                     if (confirm === '\x1b')
                         break;
                     if (confirm) {
+                        // Derive the whitelist key before splicing (createBotKey
+                        // uses the index only for unnamed fallback entries).
+                        const removedKey = String(normalizeBotEntry(config.bots[idx], idx).botKey || '');
                         const removed = config.bots.splice(idx, 1)[0];
                         saveBotsConfig(config, filePath);
+                        // Only after the bots.json save succeeded, drop the
+                        // matching whitelist entry so a deleted bot leaves no
+                        // stale flags behind (name reuse would inherit them).
+                        if (!removeWhitelistEntry(removedKey)) {
+                            console.log(`${COLORS.yellow}Warning: could not remove whitelist entry '${removedKey}' — check ${whitelistFile()}.${COLORS.reset}`);
+                        }
                         console.log(`Removed bot '${removed.name || placeholderName}' from ${path.basename(filePath)}.\n`);
                     }
                     else {
@@ -1589,11 +1729,12 @@ async function main() {
                     if (idx === null || idx === '\x1b')
                         break;
                     try {
-                        const entry = await promptBotData(config.bots[idx]);
-                        if (entry) {
-                            config.bots.splice(idx + 1, 0, entry);
+                        const result = await promptBotData(config.bots[idx], idx + 1, idx);
+                        if (result) {
+                            config.bots.splice(idx + 1, 0, result.data);
                             saveBotsConfig(config, filePath);
-                            console.log(`Copied bot '${entry.name}' into ${path.basename(filePath)}.\n`);
+                            result.commitAdapter?.();
+                            console.log(`Copied bot '${result.data.name}' into ${path.basename(filePath)}.\n`);
                         }
                     }
                     catch (err) {
@@ -1617,5 +1758,5 @@ async function main() {
     }
     console.log('Botmanager closed!');
 }
-export { main, normalizeBotDraft, ensureBotAccountId, parseJsonWithComments };
+export { main, normalizeBotDraft, ensureBotAccountId, parseJsonWithComments, parseBooleanInput, colorGridPriceValue, formatPoolRefLabel, loadGeneralSettings, saveGeneralSettings };
 //# sourceMappingURL=account_bots.js.map