@okx_ai/okx-trade-cli 1.3.1-beta.4 → 1.3.1-beta.5

package/dist/index.js

@@ -876,6 +876,20 @@ import * as fs3 from "fs";
 import * as path3 from "path";
 import * as os3 from "os";
 import { execFileSync } from "child_process";
+import {
+  readFileSync as readFileSync7,
+  createWriteStream as createWriteStream2,
+  mkdirSync as mkdirSync8,
+  chmodSync,
+  existsSync as existsSync6,
+  unlinkSync as unlinkSync3,
+  renameSync as renameSync3
+} from "fs";
+import { createHash } from "crypto";
+import { homedir as homedir7, platform, arch } from "os";
+import { join as join9, dirname as dirname6 } from "path";
+import { get as httpsGet } from "https";
+import { get as httpGet } from "http";
 var EXEC_TIMEOUT_MS = 3e4;
 var ALLOWED_DOMAIN_RE = /^[\w.-]+\.okx\.com$/;
 var DOH_BIN_DIR = join(homedir(), ".okx", "bin");
@@ -2116,6 +2130,30 @@ var MODULES = [
   "skills"
 ];
 var DEFAULT_MODULES = ["spot", "swap", "option", "account", ...BOT_DEFAULT_SUB_MODULES, "skills"];
+var SKILLS_MARKETPLACE_DESC = "OKX Skills Marketplace \u2014 search, install, and manage agent skills";
+var MODULE_DESCRIPTIONS = {
+  market: "Market data (ticker, orderbook, candles, trades)",
+  spot: "Spot trading (orders, algo orders)",
+  swap: "Perpetual swap trading (orders, algo orders)",
+  futures: "Futures trading (orders, positions, algo orders, leverage)",
+  option: "Options trading (orders, positions, greeks)",
+  account: "Account balance, positions, bills, and configuration",
+  "earn.savings": "Simple Earn \u2014 flexible savings, fixed-term, and lending",
+  "earn.onchain": "On-chain Earn \u2014 staking and DeFi products",
+  "earn.dcd": "DCD (Dual Currency Deposit) \u2014 structured products with fixed yield",
+  "earn.autoearn": "Auto-earn \u2014 automatically lend, stake, or earn on idle assets",
+  "bot.grid": "Grid trading bot \u2014 create, monitor, and stop grid orders",
+  "bot.dca": "DCA (Martingale) bot \u2014 spot or contract recurring buys",
+  skills: SKILLS_MARKETPLACE_DESC,
+  earn: "Earn products \u2014 Simple Earn, On-chain Earn, and DCD (Dual Currency Deposit)",
+  bot: "Trading bot strategies (grid, dca)",
+  config: "Manage CLI configuration profiles",
+  setup: "Set up client integrations (Cursor, Windsurf, Claude, etc.)",
+  doh: "Manage DoH (DNS-over-HTTPS) resolver binary",
+  diagnose: "Run network / MCP server diagnostics",
+  upgrade: "Upgrade okx CLI and MCP server to the latest stable version",
+  skill: SKILLS_MARKETPLACE_DESC
+};
 function registerAccountTools() {
   return [
     {
@@ -8449,13 +8487,13 @@ function findMsStoreClaudePath() {
 }
 function getConfigPath(client) {
   const home = os3.homedir();
-  const platform = process.platform;
+  const platform2 = process.platform;
   switch (client) {
     case "claude-desktop":
-      if (platform === "win32") {
+      if (platform2 === "win32") {
         return findMsStoreClaudePath() ?? path3.join(appData(), "Claude", CLAUDE_CONFIG_FILE);
       }
-      if (platform === "darwin") {
+      if (platform2 === "darwin") {
         return path3.join(home, "Library", "Application Support", "Claude", CLAUDE_CONFIG_FILE);
       }
       return path3.join(process.env.XDG_CONFIG_HOME ?? path3.join(home, ".config"), "Claude", CLAUDE_CONFIG_FILE);
@@ -8557,6 +8595,269 @@ function runSetup(options) {
 `);
   }
 }
+var CDN_SOURCES = [
+  { host: "static.jingyunyilian.com", protocol: "https" },
+  { host: "static.okx.com", protocol: "https" },
+  { host: "static.coinall.ltd", protocol: "https" }
+];
+var CDN_PATH_PREFIX = "/upgradeapp/doh";
+var DOWNLOAD_TIMEOUT_MS = 3e4;
+function getPlatformDir() {
+  const p = platform();
+  const a = arch();
+  const map = {
+    "darwin-arm64": "darwin-arm64",
+    "darwin-x64": "darwin-x64",
+    "linux-x64": "linux-x64",
+    "win32-x64": "win32-x64"
+  };
+  return map[`${p}-${a}`] ?? null;
+}
+function getBinaryName() {
+  return platform() === "win32" ? "okx-doh-resolver.exe" : "okx-doh-resolver";
+}
+function hashFile(filePath) {
+  const buf = readFileSync7(filePath);
+  return {
+    size: buf.byteLength,
+    sha256: createHash("sha256").update(buf).digest("hex")
+  };
+}
+function getDohStatus(binaryPath, opts) {
+  const resolvedPath = binaryPath ?? getDohBinaryPath();
+  const platformDir = getPlatformDir();
+  if (!existsSync6(resolvedPath)) {
+    return {
+      binaryPath: resolvedPath,
+      exists: false,
+      platform: platformDir
+    };
+  }
+  if (opts?.skipHash) {
+    return {
+      binaryPath: resolvedPath,
+      exists: true,
+      platform: platformDir
+    };
+  }
+  const { size, sha256 } = hashFile(resolvedPath);
+  return {
+    binaryPath: resolvedPath,
+    exists: true,
+    platform: platformDir,
+    fileSize: size,
+    sha256
+  };
+}
+async function fetchCdnChecksum(sources = CDN_SOURCES, timeoutMs = DOWNLOAD_TIMEOUT_MS) {
+  const platformDir = getPlatformDir();
+  if (!platformDir) return null;
+  const checksumPath = `${CDN_PATH_PREFIX}/${platformDir}/checksum.json`;
+  for (const { host, protocol } of sources) {
+    try {
+      const url = `${protocol}://${host}${checksumPath}`;
+      const raw = await downloadText(url, timeoutMs);
+      const data = JSON.parse(raw);
+      if (typeof data.sha256 !== "string" || typeof data.size !== "number" || typeof data.target !== "string") {
+        continue;
+      }
+      return {
+        sha256: data.sha256,
+        size: data.size,
+        target: data.target,
+        source: host
+      };
+    } catch {
+    }
+  }
+  return null;
+}
+async function fetchAndValidateChecksum(host, protocol, checksumPath, platformDir, timeoutMs, onProgress) {
+  const checksumUrl = `${protocol}://${host}${checksumPath}`;
+  onProgress?.(`Fetching checksum from ${host}...`);
+  const raw = await downloadText(checksumUrl, timeoutMs);
+  const checksum = JSON.parse(raw);
+  if (typeof checksum.sha256 !== "string" || typeof checksum.size !== "number" || typeof checksum.target !== "string") {
+    throw new Error("Invalid checksum.json: missing sha256, size, or target");
+  }
+  if (checksum.target !== platformDir) {
+    throw new Error(
+      `Target mismatch: expected ${platformDir}, got ${checksum.target}`
+    );
+  }
+  return { sha256: checksum.sha256, size: checksum.size, target: checksum.target };
+}
+async function downloadAndVerify(host, protocol, binaryPath, tmpPath, checksum, timeoutMs, onProgress) {
+  const binaryUrl = `${protocol}://${host}${binaryPath}`;
+  onProgress?.(`Downloading binary from ${host}...`);
+  await download(binaryUrl, tmpPath, timeoutMs);
+  const actual = hashFile(tmpPath);
+  if (actual.size !== checksum.size) {
+    throw new Error(
+      `Size mismatch: expected ${checksum.size}, got ${actual.size}`
+    );
+  }
+  if (actual.sha256 !== checksum.sha256) {
+    throw new Error(
+      `SHA-256 mismatch: expected ${checksum.sha256}, got ${actual.sha256}`
+    );
+  }
+}
+function atomicReplace(tmpPath, resolvedDest) {
+  if (platform() === "win32") {
+    try {
+      unlinkSync3(resolvedDest);
+    } catch {
+    }
+  }
+  renameSync3(tmpPath, resolvedDest);
+  if (platform() !== "win32") {
+    chmodSync(resolvedDest, 493);
+  }
+}
+function installPreChecks(destPath, sources) {
+  if (!destPath && process.env.OKX_DOH_BINARY_PATH) {
+    return { status: "up-to-date", source: "(env override)" };
+  }
+  if (!getPlatformDir()) {
+    return { status: "failed", error: "Unsupported platform" };
+  }
+  if (sources.length === 0) {
+    return { status: "failed", error: "No CDN sources available" };
+  }
+  return null;
+}
+function isLocalUpToDate(localHash, checksum) {
+  return localHash !== null && localHash.size === checksum.size && localHash.sha256 === checksum.sha256;
+}
+async function installDohBinary(destPath, sources = CDN_SOURCES, onProgress) {
+  const earlyResult = installPreChecks(destPath, sources);
+  if (earlyResult) return earlyResult;
+  const platformDir = getPlatformDir();
+  const binaryName = getBinaryName();
+  const resolvedDest = destPath ?? join9(homedir7(), ".okx", "bin", binaryName);
+  const tmpPath = resolvedDest + ".tmp";
+  mkdirSync8(dirname6(resolvedDest), { recursive: true });
+  const localHash = existsSync6(resolvedDest) ? hashFile(resolvedDest) : null;
+  const checksumPath = `${CDN_PATH_PREFIX}/${platformDir}/checksum.json`;
+  const binaryPath = `${CDN_PATH_PREFIX}/${platformDir}/${binaryName}`;
+  const errors = [];
+  for (const { host, protocol } of sources) {
+    try {
+      const checksum = await fetchAndValidateChecksum(
+        host,
+        protocol,
+        checksumPath,
+        platformDir,
+        DOWNLOAD_TIMEOUT_MS,
+        onProgress
+      );
+      if (isLocalUpToDate(localHash, checksum)) {
+        onProgress?.("Already up to date (checksum match)");
+        return { status: "up-to-date", source: host };
+      }
+      await downloadAndVerify(host, protocol, binaryPath, tmpPath, checksum, DOWNLOAD_TIMEOUT_MS, onProgress);
+      atomicReplace(tmpPath, resolvedDest);
+      onProgress?.(`Downloaded and verified from ${host}`);
+      return { status: "installed", source: host };
+    } catch (err) {
+      try {
+        unlinkSync3(tmpPath);
+      } catch {
+      }
+      const msg = err instanceof Error ? err.message : String(err);
+      errors.push(`${host}: ${msg}`);
+      onProgress?.(`${host} failed: ${msg}`);
+    }
+  }
+  return { status: "failed", error: `All CDN sources failed:
+${errors.join("\n")}` };
+}
+function removeDohBinary(binaryPath) {
+  const resolvedPath = binaryPath ?? getDohBinaryPath();
+  try {
+    unlinkSync3(resolvedPath);
+    return { status: "removed" };
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return { status: "not-found" };
+    }
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`Failed to remove ${resolvedPath}: ${msg}`);
+  }
+}
+function isRedirect(statusCode) {
+  return statusCode !== void 0 && statusCode >= 300 && statusCode < 400;
+}
+function validateRedirect(res, requestUrl, redirectCount, maxRedirects) {
+  if (redirectCount > maxRedirects) {
+    throw new Error(`Too many redirects (${maxRedirects})`);
+  }
+  const location = res.headers.location;
+  if (requestUrl.startsWith("https") && !location.startsWith("https")) {
+    throw new Error("Refused HTTPS \u2192 HTTP redirect downgrade");
+  }
+  return location;
+}
+function fetchResponse(url, timeoutMs) {
+  return new Promise((resolve3, reject) => {
+    let redirects = 0;
+    const maxRedirects = 5;
+    function doRequest(requestUrl) {
+      const reqFn = requestUrl.startsWith("https") ? httpsGet : httpGet;
+      const req = reqFn(requestUrl, { timeout: timeoutMs }, (res) => {
+        if (isRedirect(res.statusCode) && res.headers.location) {
+          redirects++;
+          try {
+            const location = validateRedirect(res, requestUrl, redirects, maxRedirects);
+            res.resume();
+            doRequest(location);
+          } catch (err) {
+            reject(err);
+          }
+          return;
+        }
+        if (res.statusCode !== 200) {
+          reject(new Error(`HTTP ${res.statusCode ?? "unknown"}`));
+          return;
+        }
+        resolve3(res);
+      });
+      req.on("error", reject);
+      req.on("timeout", () => {
+        req.destroy();
+        reject(new Error("Download timed out"));
+      });
+    }
+    doRequest(url);
+  });
+}
+function download(url, destPath, timeoutMs) {
+  return fetchResponse(url, timeoutMs).then(
+    (res) => new Promise((resolve3, reject) => {
+      const file = createWriteStream2(destPath);
+      res.pipe(file);
+      file.on("finish", () => file.close(() => resolve3()));
+      file.on("error", (err) => {
+        try {
+          unlinkSync3(destPath);
+        } catch {
+        }
+        reject(err);
+      });
+    })
+  );
+}
+function downloadText(url, timeoutMs) {
+  return fetchResponse(url, timeoutMs).then(
+    (res) => new Promise((resolve3, reject) => {
+      const chunks = [];
+      res.on("data", (chunk) => chunks.push(chunk));
+      res.on("end", () => resolve3(Buffer.concat(chunks).toString("utf8")));
+      res.on("error", reject);
+    })
+  );
+}
 
 // src/commands/diagnose.ts
 import dns from "dns/promises";
@@ -9189,7 +9490,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "980de10" : "dev";
+var GIT_HASH = true ? "63a5613" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -9431,6 +9732,44 @@ async function cmdDiagnose(config, profile, options = {}) {
   }
   return runCliChecks(config, profile, options.output);
 }
+async function checkDoh(report) {
+  section("DoH Resolver");
+  const local = getDohStatus();
+  if (!local.exists) {
+    fail("DoH binary", "not installed", [
+      "Run: okx doh install",
+      "Or wait for the next npm install to auto-download"
+    ]);
+    report.add("doh_binary", "not installed");
+    return;
+  }
+  ok("DoH binary", local.binaryPath);
+  report.add("doh_binary", `installed (${local.platform ?? "unknown"})`);
+  const cdnChecksum = await fetchCdnChecksum(void 0, 5e3);
+  if (!cdnChecksum) {
+    warn("DoH checksum", "CDN unreachable \u2014 cannot verify");
+    report.add("doh_checksum", "CDN unreachable");
+  } else if (cdnChecksum.sha256 === local.sha256) {
+    ok("DoH checksum", `match (${cdnChecksum.source})`);
+    report.add("doh_checksum", `match (${cdnChecksum.source})`);
+  } else {
+    warn("DoH checksum", "mismatch \u2014 update available", ["Run: okx doh install"]);
+    report.add("doh_checksum", "mismatch");
+  }
+  try {
+    const cacheEntry = readCache("www.okx.com");
+    if (cacheEntry) {
+      ok("DoH mode", cacheEntry.mode);
+      report.add("doh_mode", cacheEntry.mode);
+    } else {
+      ok("DoH mode", "no cache (will auto-detect on next request)");
+      report.add("doh_mode", "no cache");
+    }
+  } catch {
+    ok("DoH mode", "no cache");
+    report.add("doh_mode", "no cache");
+  }
+}
 function checkConfigFile(report) {
   section("Config File");
   const path6 = configFilePath();
@@ -9459,6 +9798,7 @@ async function runCliChecks(config, profile, outputPath) {
   report.add("ts", (/* @__PURE__ */ new Date()).toISOString());
   const configFilePassed = checkConfigFile(report);
   const envPassed = checkEnvironment(report);
+  await checkDoh(report);
   if (!config) {
     fail("Config", "Could not load config (see Config File check above)", []);
     report.add("result", "FAIL");
@@ -9486,23 +9826,23 @@ async function runCliChecks(config, profile, outputPath) {
 
 // src/commands/upgrade.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { readFileSync as readFileSync7, writeFileSync as writeFileSync7, mkdirSync as mkdirSync8 } from "fs";
-import { dirname as dirname6, join as join9 } from "path";
-import { homedir as homedir7 } from "os";
+import { readFileSync as readFileSync8, writeFileSync as writeFileSync7, mkdirSync as mkdirSync9 } from "fs";
+import { dirname as dirname7, join as join10 } from "path";
+import { homedir as homedir8 } from "os";
 var PACKAGES = ["@okx_ai/okx-trade-mcp", "@okx_ai/okx-trade-cli"];
-var CACHE_FILE2 = join9(homedir7(), ".okx", "last_check");
+var CACHE_FILE2 = join10(homedir8(), ".okx", "last_check");
 var THROTTLE_MS = 12 * 60 * 60 * 1e3;
-var NPM_BIN = join9(dirname6(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
+var NPM_BIN = join10(dirname7(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
 function readLastCheck() {
   try {
-    return parseInt(readFileSync7(CACHE_FILE2, "utf-8").trim(), 10) || 0;
+    return parseInt(readFileSync8(CACHE_FILE2, "utf-8").trim(), 10) || 0;
   } catch {
     return 0;
   }
 }
 function writeLastCheck() {
   try {
-    mkdirSync8(join9(homedir7(), ".okx"), { recursive: true });
+    mkdirSync9(join10(homedir8(), ".okx"), { recursive: true });
     writeFileSync7(CACHE_FILE2, String(Math.floor(Date.now() / 1e3)), "utf-8");
   } catch {
   }
@@ -9587,24 +9927,6 @@ async function cmdUpgrade(currentVersion, options, json) {
   }
 }
 
-// src/config/loader.ts
-function loadProfileConfig(opts) {
-  return loadConfig({
-    profile: opts.profile,
-    modules: opts.modules,
-    readOnly: opts.readOnly ?? false,
-    demo: opts.demo,
-    live: opts.live,
-    site: opts.site,
-    userAgent: opts.userAgent,
-    sourceTag: opts.sourceTag,
-    verbose: opts.verbose
-  });
-}
-
-// src/help.ts
-import { EOL as EOL2 } from "os";
-
 // src/commands/client-setup.ts
 import * as fs6 from "fs";
 var DETECTABLE_CLIENTS = ["claude-desktop", "cursor", "windsurf"];
@@ -9629,154 +9951,213 @@ function cmdSetupClients() {
   printSetupUsage();
 }
 
-// src/help.ts
-var HELP_TREE = {
+// src/cli-registry.ts
+var CLI_REGISTRY = {
+  // ── market ─────────────────────────────────────────────────────────────────
   market: {
     description: "Market data (ticker, orderbook, candles, trades)",
     commands: {
       ticker: {
+        toolName: "market_get_ticker",
         usage: "okx market ticker <instId>",
         description: "Get latest ticker data for an instrument"
       },
       tickers: {
+        toolName: "market_get_tickers",
         usage: "okx market tickers <instType>",
         description: "Get all tickers for an instrument type (SPOT|SWAP|FUTURES|OPTION)"
       },
       orderbook: {
+        toolName: "market_get_orderbook",
         usage: "okx market orderbook <instId> [--sz <n>]",
         description: "Get order book depth for an instrument"
       },
       candles: {
+        toolName: "market_get_candles",
         usage: "okx market candles <instId> [--bar <bar>] [--limit <n>]",
         description: "Get candlestick (OHLCV) data"
       },
       instruments: {
+        toolName: "market_get_instruments",
         usage: "okx market instruments --instType <type> [--instId <id>]",
         description: "List tradable instruments of a given type"
       },
       "funding-rate": {
+        toolName: "market_get_funding_rate",
         usage: "okx market funding-rate <instId> [--history] [--limit <n>]",
         description: "Get current or historical funding rate for perpetual swaps"
       },
       "mark-price": {
+        toolName: "market_get_mark_price",
         usage: "okx market mark-price --instType <MARGIN|SWAP|FUTURES|OPTION> [--instId <id>]",
         description: "Get mark price for instruments"
       },
       trades: {
+        toolName: "market_get_trades",
         usage: "okx market trades <instId> [--limit <n>]",
         description: "Get recent trades for an instrument"
       },
       "index-ticker": {
+        toolName: "market_get_index_ticker",
         usage: "okx market index-ticker [--instId <id>] [--quoteCcy <ccy>]",
         description: "Get index ticker data"
       },
       "index-candles": {
+        toolName: "market_get_index_candles",
         usage: "okx market index-candles <instId> [--bar <bar>] [--limit <n>] [--history]",
         description: "Get index candlestick data"
       },
       "price-limit": {
+        toolName: "market_get_price_limit",
         usage: "okx market price-limit <instId>",
         description: "Get price limit for an instrument"
       },
       "open-interest": {
+        toolName: "market_get_open_interest",
         usage: "okx market open-interest --instType <SWAP|FUTURES|OPTION> [--instId <id>]",
         description: "Get open interest for instruments"
       },
       "stock-tokens": {
+        toolName: "market_get_stock_tokens",
         usage: "okx market stock-tokens [--instType <SPOT|SWAP>] [--instId <id>]",
         description: "[Deprecated: use instruments-by-category --instCategory 3] List all stock token instruments (instCategory=3, e.g. AAPL-USDT-SWAP)"
       },
       "instruments-by-category": {
+        toolName: "market_get_instruments_by_category",
         usage: "okx market instruments-by-category --instCategory <4|5|6|7> [--instType <SPOT|SWAP>] [--instId <id>]",
         description: "List instruments by asset category: 4=Metals (gold/silver), 5=Commodities (oil/gas), 6=Forex (EUR/USD), 7=Bonds"
       }
+    },
+    subgroups: {
+      indicator: {
+        description: "Technical indicators and chart patterns",
+        commands: {
+          list: {
+            toolName: "market_list_indicators",
+            usage: "okx market indicator list",
+            description: "List all supported technical indicators"
+          },
+          "<instId> <indicator>": {
+            toolName: "market_get_indicator",
+            usage: "okx market indicator <instId> <indicator> [--bar <bar>] [--limit <n>] [--backtest-time <ts>] [--params <json>]",
+            description: "Get indicator values for an instrument (e.g. okx market indicator BTC-USDT-SWAP rsi)"
+          }
+        }
+      }
     }
   },
+  // ── account ────────────────────────────────────────────────────────────────
   account: {
     description: "Account balance, positions, bills, and configuration",
     commands: {
       balance: {
+        toolName: "account_get_balance",
         usage: "okx account balance [<ccy>]",
         description: "Get trading account balance"
       },
       "asset-balance": {
+        toolName: "account_get_asset_balance",
         usage: "okx account asset-balance [--ccy <ccy>]",
         description: "Get funding account asset balance"
       },
       positions: {
+        toolName: "account_get_positions",
         usage: "okx account positions [--instType <type>] [--instId <id>]",
         description: "Get current open positions"
       },
       "positions-history": {
+        toolName: "account_get_positions_history",
         usage: "okx account positions-history [--instType <type>] [--instId <id>] [--limit <n>]",
         description: "Get historical positions"
       },
       bills: {
+        toolName: "account_get_bills",
+        alternateTools: ["account_get_bills_archive"],
         usage: "okx account bills [--instType <type>] [--ccy <ccy>] [--limit <n>] [--archive]",
         description: "Get account bill history"
       },
       fees: {
+        toolName: "account_get_trade_fee",
         usage: "okx account fees --instType <type> [--instId <id>]",
         description: "Get trading fee rates"
       },
       config: {
+        toolName: "account_get_config",
         usage: "okx account config",
         description: "Get account configuration"
       },
       "set-position-mode": {
+        toolName: "account_set_position_mode",
         usage: "okx account set-position-mode --posMode <long_short_mode|net_mode>",
         description: "Set position mode (long/short or net)"
       },
       "max-size": {
+        toolName: "account_get_max_size",
         usage: "okx account max-size --instId <id> --tdMode <cross|isolated> [--px <price>]",
         description: "Get maximum order size for an instrument"
       },
       "max-avail-size": {
+        toolName: "account_get_max_avail_size",
         usage: "okx account max-avail-size --instId <id> --tdMode <cross|isolated|cash>",
         description: "Get maximum available tradable amount"
       },
       "max-withdrawal": {
+        toolName: "account_get_max_withdrawal",
         usage: "okx account max-withdrawal [--ccy <ccy>]",
         description: "Get maximum withdrawable amount"
       },
       transfer: {
+        toolName: "account_transfer",
         usage: "okx account transfer --ccy <ccy> --amt <n> --from <acct> --to <acct> [--transferType <0|1|2|3>]",
         description: "Transfer funds between accounts"
       },
       audit: {
+        // trade_get_history ToolSpec reads the same local log files as cmdAccountAudit.
+        // CLI reads files directly without routing through ToolRunner for performance,
+        // but conceptually this command is the CLI representation of the ToolSpec.
+        toolName: "trade_get_history",
         usage: "okx account audit [--tool <name>] [--since <ISO-date>] [--limit <n>]",
         description: "Audit account activity and tool call history"
       }
     }
   },
+  // ── spot ───────────────────────────────────────────────────────────────────
   spot: {
     description: "Spot trading (orders, algo orders)",
     commands: {
       orders: {
+        toolName: "spot_get_orders",
         usage: "okx spot orders [--instId <id>] [--history]",
         description: "List open or historical spot orders"
       },
       get: {
+        toolName: "spot_get_order",
         usage: "okx spot get --instId <id> --ordId <id>",
         description: "Get details of a specific spot order"
       },
       fills: {
+        toolName: "spot_get_fills",
         usage: "okx spot fills [--instId <id>] [--ordId <id>]",
         description: "Get trade fill history for spot orders"
       },
       place: {
+        toolName: "spot_place_order",
         usage: "okx spot place --instId <id> --side <buy|sell> --ordType <type> --sz <n> [--px <price>] [--tdMode <cash|cross|isolated>] [--tpTriggerPx <price>] [--tpOrdPx <price|-1>] [--slTriggerPx <price>] [--slOrdPx <price|-1>]",
         description: "Place a new spot order (supports attached TP/SL)"
       },
       amend: {
+        toolName: "spot_amend_order",
         usage: "okx spot amend --instId <id> --ordId <id> [--newSz <n>] [--newPx <price>]",
         description: "Amend a pending spot order"
       },
       cancel: {
+        toolName: "spot_cancel_order",
         usage: "okx spot cancel <instId> --ordId <id>",
         description: "Cancel a pending spot order"
       },
       batch: {
+        toolName: "spot_batch_orders",
+        alternateTools: ["spot_batch_amend", "spot_batch_cancel"],
         usage: "okx spot batch --action <place|amend|cancel> --orders '<json>'",
         description: "Batch place, amend, or cancel spot orders"
       }
@@ -9786,18 +10167,27 @@ var HELP_TREE = {
         description: "Spot algo orders (conditional, OCO, take-profit/stop-loss)",
         commands: {
           orders: {
+            toolName: "spot_get_algo_orders",
             usage: "okx spot algo orders [--instId <id>] [--history] [--ordType <conditional|oco>]",
             description: "List spot algo orders"
           },
           place: {
+            toolName: "spot_place_algo_order",
             usage: "okx spot algo place --instId <id> --side <buy|sell> --sz <n> [--ordType <conditional|oco>]\n                    [--tpTriggerPx <price>] [--tpOrdPx <price|-1>]\n                    [--slTriggerPx <price>] [--slOrdPx <price|-1>] [--tdMode <cash|cross|isolated>]",
             description: "Place a spot algo order (take-profit/stop-loss)"
           },
+          trail: {
+            toolName: "spot_place_algo_order",
+            usage: "okx spot algo trail --instId <id> --side <buy|sell> --sz <n> --callbackRatio <ratio>\n                    [--activePx <price>] [--tdMode <cash|cross|isolated>]",
+            description: "Place a trailing stop algo order for spot"
+          },
           amend: {
+            toolName: "spot_amend_algo_order",
             usage: "okx spot algo amend --instId <id> --algoId <id> [--newSz <n>]\n                    [--newTpTriggerPx <price>] [--newTpOrdPx <price|-1>]\n                    [--newSlTriggerPx <price>] [--newSlOrdPx <price|-1>]",
             description: "Amend a pending spot algo order"
           },
           cancel: {
+            toolName: "spot_cancel_algo_order",
             usage: "okx spot algo cancel --instId <id> --algoId <id>",
             description: "Cancel a pending spot algo order"
           }
@@ -9805,50 +10195,64 @@ var HELP_TREE = {
       }
     }
   },
+  // ── swap ───────────────────────────────────────────────────────────────────
   swap: {
     description: "Perpetual swap trading (orders, algo orders)",
     commands: {
       positions: {
+        toolName: "swap_get_positions",
         usage: "okx swap positions [<instId>]",
         description: "Get current perpetual swap positions"
       },
       orders: {
+        toolName: "swap_get_orders",
         usage: "okx swap orders [--instId <id>] [--history] [--archive]",
         description: "List open or historical swap orders"
       },
       get: {
+        toolName: "swap_get_order",
         usage: "okx swap get --instId <id> --ordId <id>",
         description: "Get details of a specific swap order"
       },
       fills: {
+        toolName: "swap_get_fills",
         usage: "okx swap fills [--instId <id>] [--ordId <id>] [--archive]",
         description: "Get trade fill history for swap orders"
       },
       place: {
+        toolName: "swap_place_order",
         usage: "okx swap place --instId <id> --side <buy|sell> --ordType <type> --sz <n> [--posSide <side>] [--px <price>] [--tdMode <cross|isolated>] [--tpTriggerPx <price>] [--tpOrdPx <price|-1>] [--slTriggerPx <price>] [--slOrdPx <price|-1>]",
         description: "Place a new perpetual swap order (supports attached TP/SL)"
       },
       cancel: {
+        toolName: "swap_cancel_order",
         usage: "okx swap cancel <instId> --ordId <id>",
         description: "Cancel a pending swap order"
       },
       amend: {
+        // swap amend uses spot_amend_order (same OKX /trade/amend-order endpoint works for all types)
+        toolName: "spot_amend_order",
         usage: "okx swap amend --instId <id> --ordId <id> [--newSz <n>] [--newPx <price>]",
         description: "Amend a pending swap order"
       },
       close: {
+        toolName: "swap_close_position",
         usage: "okx swap close --instId <id> --mgnMode <cross|isolated> [--posSide <net|long|short>] [--autoCxl]",
         description: "Close a swap position"
       },
       leverage: {
+        toolName: "swap_set_leverage",
         usage: "okx swap leverage --instId <id> --lever <n> --mgnMode <cross|isolated> [--posSide <side>]",
         description: "Set leverage for a swap instrument"
       },
       "get-leverage": {
+        toolName: "swap_get_leverage",
         usage: "okx swap get-leverage --instId <id> --mgnMode <cross|isolated>",
         description: "Get current leverage setting for a swap instrument"
       },
       batch: {
+        toolName: "swap_batch_orders",
+        alternateTools: ["swap_batch_amend", "swap_batch_cancel"],
         usage: "okx swap batch --action <place|amend|cancel> --orders '<json>'",
         description: "Batch place, amend, or cancel swap orders"
       }
@@ -9858,22 +10262,27 @@ var HELP_TREE = {
         description: "Perpetual swap algo orders (trailing stop, conditional, OCO)",
         commands: {
           orders: {
+            toolName: "swap_get_algo_orders",
             usage: "okx swap algo orders [--instId <id>] [--history] [--ordType <conditional|oco>]",
             description: "List swap algo orders"
           },
           trail: {
+            toolName: "swap_place_move_stop_order",
             usage: "okx swap algo trail --instId <id> --side <buy|sell> --sz <n> --callbackRatio <ratio>\n                   [--activePx <price>] [--posSide <net|long|short>] [--tdMode <cross|isolated>] [--reduceOnly]",
             description: "Place a trailing stop algo order for perpetual swap"
           },
           place: {
+            toolName: "swap_place_algo_order",
             usage: "okx swap algo place --instId <id> --side <buy|sell> --sz <n> [--ordType <conditional|oco>]\n                   [--tpTriggerPx <price>] [--tpOrdPx <price|-1>]\n                   [--slTriggerPx <price>] [--slOrdPx <price|-1>]\n                   [--posSide <net|long|short>] [--tdMode <cross|isolated>] [--reduceOnly]",
             description: "Place a swap algo order (take-profit/stop-loss)"
           },
           amend: {
+            toolName: "swap_amend_algo_order",
             usage: "okx swap algo amend --instId <id> --algoId <id> [--newSz <n>]\n                   [--newTpTriggerPx <price>] [--newTpOrdPx <price|-1>]\n                   [--newSlTriggerPx <price>] [--newSlOrdPx <price|-1>]",
             description: "Amend a pending swap algo order"
           },
           cancel: {
+            toolName: "swap_cancel_algo_orders",
             usage: "okx swap algo cancel --instId <id> --algoId <id>",
             description: "Cancel a pending swap algo order"
           }
@@ -9881,50 +10290,63 @@ var HELP_TREE = {
       }
     }
   },
+  // ── futures ────────────────────────────────────────────────────────────────
   futures: {
     description: "Futures trading (orders, positions, algo orders, leverage)",
     commands: {
       orders: {
+        toolName: "futures_get_orders",
         usage: "okx futures orders [--instId <id>] [--history] [--archive]",
         description: "List open or historical futures orders"
       },
       positions: {
+        toolName: "futures_get_positions",
         usage: "okx futures positions [--instId <id>]",
         description: "Get current futures positions"
       },
       fills: {
+        toolName: "futures_get_fills",
         usage: "okx futures fills [--instId <id>] [--ordId <id>] [--archive]",
         description: "Get trade fill history for futures orders"
       },
       place: {
+        toolName: "futures_place_order",
         usage: "okx futures place --instId <id> --side <buy|sell> --ordType <type> --sz <n>\n                 [--tdMode <cross|isolated>] [--posSide <net|long|short>] [--px <price>] [--reduceOnly]\n                 [--tpTriggerPx <price>] [--tpOrdPx <price|-1>] [--slTriggerPx <price>] [--slOrdPx <price|-1>]",
         description: "Place a new futures order (supports attached TP/SL)"
       },
       cancel: {
+        toolName: "futures_cancel_order",
         usage: "okx futures cancel <instId> --ordId <id>",
         description: "Cancel a pending futures order"
       },
       amend: {
+        toolName: "futures_amend_order",
         usage: "okx futures amend --instId <id> [--ordId <id>] [--clOrdId <id>] [--newSz <n>] [--newPx <price>]",
         description: "Amend a pending futures order"
       },
       get: {
+        toolName: "futures_get_order",
         usage: "okx futures get --instId <id> --ordId <id>",
         description: "Get details of a specific futures order"
       },
       close: {
+        toolName: "futures_close_position",
         usage: "okx futures close --instId <id> --mgnMode <cross|isolated> [--posSide <net|long|short>] [--autoCxl]",
         description: "Close a futures position"
       },
       "get-leverage": {
+        toolName: "futures_get_leverage",
         usage: "okx futures get-leverage --instId <id> --mgnMode <cross|isolated>",
         description: "Get current leverage for a futures instrument"
       },
       leverage: {
+        toolName: "futures_set_leverage",
         usage: "okx futures leverage --instId <id> --lever <n> --mgnMode <cross|isolated> [--posSide <net|long|short>]",
         description: "Set leverage for a futures instrument"
       },
       batch: {
+        toolName: "futures_batch_orders",
+        alternateTools: ["futures_batch_amend", "futures_batch_cancel"],
         usage: "okx futures batch --action <place|amend|cancel> --orders '<json>'",
         description: "Batch place, amend, or cancel futures orders"
       }
@@ -9934,22 +10356,27 @@ var HELP_TREE = {
         description: "Futures algo orders (trailing stop, conditional, OCO)",
         commands: {
           orders: {
+            toolName: "futures_get_algo_orders",
             usage: "okx futures algo orders [--instId <id>] [--history] [--ordType <conditional|oco>]",
             description: "List futures algo orders"
           },
           trail: {
+            toolName: "futures_place_move_stop_order",
             usage: "okx futures algo trail --instId <id> --side <buy|sell> --sz <n> --callbackRatio <ratio>\n                   [--activePx <price>] [--posSide <net|long|short>] [--tdMode <cross|isolated>] [--reduceOnly]",
             description: "Place a trailing stop algo order for futures"
           },
           place: {
+            toolName: "futures_place_algo_order",
             usage: "okx futures algo place --instId <id> --side <buy|sell> --sz <n> [--ordType <conditional|oco>]\n                   [--tpTriggerPx <price>] [--tpOrdPx <price|-1>]\n                   [--slTriggerPx <price>] [--slOrdPx <price|-1>]\n                   [--posSide <net|long|short>] [--tdMode <cross|isolated>] [--reduceOnly]",
             description: "Place a futures algo order (take-profit/stop-loss)"
           },
           amend: {
+            toolName: "futures_amend_algo_order",
             usage: "okx futures algo amend --instId <id> --algoId <id> [--newSz <n>]\n                   [--newTpTriggerPx <price>] [--newTpOrdPx <price|-1>]\n                   [--newSlTriggerPx <price>] [--newSlOrdPx <price|-1>]",
             description: "Amend a pending futures algo order"
           },
           cancel: {
+            toolName: "futures_cancel_algo_orders",
             usage: "okx futures algo cancel --instId <id> --algoId <id>",
             description: "Cancel a pending futures algo order"
           }
@@ -9957,51 +10384,90 @@ var HELP_TREE = {
       }
     }
   },
+  // ── option ─────────────────────────────────────────────────────────────────
   option: {
     description: "Options trading (orders, positions, greeks)",
     commands: {
       orders: {
+        toolName: "option_get_orders",
         usage: "okx option orders [--instId <id>] [--uly <uly>] [--history] [--archive]",
         description: "List open or historical option orders"
       },
       get: {
+        toolName: "option_get_order",
         usage: "okx option get --instId <id> [--ordId <id>] [--clOrdId <id>]",
         description: "Get details of a specific option order"
       },
       positions: {
+        toolName: "option_get_positions",
         usage: "okx option positions [--instId <id>] [--uly <uly>]",
         description: "Get current option positions"
       },
       fills: {
+        toolName: "option_get_fills",
         usage: "okx option fills [--instId <id>] [--ordId <id>] [--archive]",
         description: "Get trade fill history for option orders"
       },
       instruments: {
+        toolName: "option_get_instruments",
         usage: "okx option instruments --uly <uly> [--expTime <date>]",
         description: "List tradable option instruments for an underlying"
       },
       greeks: {
+        toolName: "option_get_greeks",
         usage: "okx option greeks --uly <uly> [--expTime <date>]",
         description: "Get option greeks (delta, gamma, theta, vega)"
       },
       place: {
+        toolName: "option_place_order",
         usage: "okx option place --instId <id> --tdMode <cash|cross|isolated> --side <buy|sell> --ordType <type> --sz <n>\n               [--px <price>] [--reduceOnly] [--clOrdId <id>]",
         description: "Place a new option order"
       },
       cancel: {
+        toolName: "option_cancel_order",
         usage: "okx option cancel --instId <id> [--ordId <id>] [--clOrdId <id>]",
         description: "Cancel a pending option order"
       },
       amend: {
+        toolName: "option_amend_order",
         usage: "okx option amend --instId <id> [--ordId <id>] [--clOrdId <id>] [--newSz <n>] [--newPx <price>]",
         description: "Amend a pending option order"
       },
       "batch-cancel": {
+        toolName: "option_batch_cancel",
         usage: "okx option batch-cancel --orders '<json>'",
         description: "Batch cancel option orders"
       }
+    },
+    subgroups: {
+      algo: {
+        description: "Option algo orders (conditional, TP/SL)",
+        commands: {
+          orders: {
+            toolName: "option_get_algo_orders",
+            usage: "okx option algo orders [--instId <id>] [--history] [--ordType <conditional|oco>]",
+            description: "List option algo orders"
+          },
+          place: {
+            toolName: "option_place_algo_order",
+            usage: "okx option algo place --instId <id> --tdMode <cash|cross|isolated> --side <buy|sell> --sz <n>\n                   [--ordType <conditional|oco>] [--tpTriggerPx <price>] [--tpOrdPx <price|-1>]\n                   [--slTriggerPx <price>] [--slOrdPx <price|-1>] [--reduceOnly] [--clOrdId <id>]",
+            description: "Place an option algo order (take-profit/stop-loss)"
+          },
+          amend: {
+            toolName: "option_amend_algo_order",
+            usage: "okx option algo amend --instId <id> --algoId <id> [--newSz <n>]\n                   [--newTpTriggerPx <price>] [--newTpOrdPx <price|-1>]\n                   [--newSlTriggerPx <price>] [--newSlOrdPx <price|-1>]",
+            description: "Amend a pending option algo order"
+          },
+          cancel: {
+            toolName: "option_cancel_algo_orders",
+            usage: "okx option algo cancel --instId <id> --algoId <id>",
+            description: "Cancel a pending option algo order"
+          }
+        }
+      }
     }
   },
+  // ── earn ───────────────────────────────────────────────────────────────────
   earn: {
     description: "Earn products \u2014 Simple Earn, On-chain Earn, and DCD (Dual Currency Deposit)",
     subgroups: {
@@ -10009,38 +10475,47 @@ var HELP_TREE = {
         description: "Simple Earn \u2014 flexible savings, fixed-term, and lending",
         commands: {
           balance: {
+            toolName: "earn_get_savings_balance",
             usage: "okx earn savings balance [<ccy>]",
             description: "Get savings balance (optionally filter by currency)"
           },
           purchase: {
+            toolName: "earn_savings_purchase",
             usage: "okx earn savings purchase --ccy <ccy> --amt <n> [--rate <rate>]",
             description: "Purchase Simple Earn (flexible savings). Rate defaults to 0.01 (1%)"
           },
           redeem: {
+            toolName: "earn_savings_redeem",
             usage: "okx earn savings redeem --ccy <ccy> --amt <n>",
             description: "Redeem Simple Earn (flexible savings)"
           },
           "set-rate": {
+            toolName: "earn_set_lending_rate",
             usage: "okx earn savings set-rate --ccy <ccy> --rate <rate>",
             description: "Set lending rate for a currency"
           },
           "lending-history": {
+            toolName: "earn_get_lending_history",
             usage: "okx earn savings lending-history [--ccy <ccy>] [--limit <n>]",
             description: "Get personal lending records (requires auth)"
           },
           "rate-history": {
+            toolName: "earn_get_lending_rate_history",
             usage: "okx earn savings rate-history [--ccy <ccy>] [--limit <n>]",
             description: "Query Simple Earn lending rates and fixed-term offers (requires auth)"
           },
           "fixed-orders": {
+            toolName: "earn_get_fixed_order_list",
             usage: "okx earn savings fixed-orders [--ccy <ccy>] [--state <pending|earning|expired|settled|cancelled>]",
             description: "List fixed-term earn orders"
           },
           "fixed-purchase": {
+            toolName: "earn_fixed_purchase",
             usage: "okx earn savings fixed-purchase --ccy <ccy> --amt <n> --term <term> [--confirm]",
             description: "Purchase Simple Earn Fixed (\u5B9A\u671F). Preview by default; add --confirm to execute. Funds locked until maturity"
           },
           "fixed-redeem": {
+            toolName: "earn_fixed_redeem",
             usage: "okx earn savings fixed-redeem <reqId>",
             description: "Redeem a fixed-term earn order (full amount)"
           }
@@ -10050,26 +10525,32 @@ var HELP_TREE = {
         description: "On-chain Earn \u2014 staking and DeFi products",
         commands: {
           offers: {
+            toolName: "onchain_earn_get_offers",
             usage: "okx earn onchain offers [--productId <id>] [--protocolType <type>] [--ccy <ccy>]",
             description: "Browse available on-chain earn products (staking, DeFi)"
           },
           purchase: {
+            toolName: "onchain_earn_purchase",
             usage: "okx earn onchain purchase --productId <id> --ccy <ccy> --amt <n> [--term <term>] [--tag <tag>]",
             description: "Purchase an on-chain earn product (stake/deposit)"
           },
           redeem: {
+            toolName: "onchain_earn_redeem",
             usage: "okx earn onchain redeem --ordId <id> --protocolType <type> [--allowEarlyRedeem]",
             description: "Redeem an on-chain earn position"
           },
           cancel: {
+            toolName: "onchain_earn_cancel",
             usage: "okx earn onchain cancel --ordId <id> --protocolType <type>",
             description: "Cancel a pending on-chain earn order"
           },
           orders: {
+            toolName: "onchain_earn_get_active_orders",
             usage: "okx earn onchain orders [--productId <id>] [--protocolType <type>] [--ccy <ccy>] [--state <state>]",
             description: "List active on-chain earn orders"
           },
           history: {
+            toolName: "onchain_earn_get_order_history",
             usage: "okx earn onchain history [--productId <id>] [--protocolType <type>] [--ccy <ccy>]",
             description: "Get on-chain earn order history"
           }
@@ -10079,14 +10560,19 @@ var HELP_TREE = {
         description: "Auto-earn \u2014 automatically lend, stake, or earn on idle assets",
         commands: {
           status: {
+            // CLI reads from account_get_balance; earn_auto_set is covered by 'on' command below
+            toolName: null,
             usage: "okx earn auto-earn status [<ccy>]",
             description: "Query auto-earn status for all or a specific currency"
           },
           on: {
+            toolName: "earn_auto_set",
             usage: "okx earn auto-earn on <ccy>",
             description: "Enable auto-earn for a currency (auto-detects lend/stake vs USDG earn)"
           },
           off: {
+            // same tool as 'on'; earn_auto_set already registered above
+            toolName: "earn_auto_set",
             usage: "okx earn auto-earn off <ccy>",
             description: "Disable auto-earn for a currency"
           }
@@ -10096,26 +10582,32 @@ var HELP_TREE = {
         description: "DCD (Dual Currency Deposit) \u2014 structured products with fixed yield",
         commands: {
           pairs: {
+            toolName: "dcd_get_currency_pairs",
             usage: "okx earn dcd pairs",
             description: "List available DCD currency pairs"
           },
           products: {
+            toolName: "dcd_get_products",
             usage: "okx earn dcd products --baseCcy <ccy> --quoteCcy <ccy> --optType <C|P>\n                         [--minYield <n>] [--strikeNear <price>]\n                         [--termDays <n>] [--minTermDays <n>] [--maxTermDays <n>]\n                         [--expDate <YYYY-MM-DD|YYYY-MM-DDTHH:mm>]",
             description: "List active DCD products (baseCcy, quoteCcy, optType required). Client-side filters: minYield (e.g. 0.05=5%), strikeNear (\xB110%), term range, expDate"
           },
           "quote-and-buy": {
+            toolName: "dcd_subscribe",
             usage: "okx earn dcd quote-and-buy --productId <id> --sz <n> --notionalCcy <ccy> [--clOrdId <id>] [--minAnnualizedYield <pct>]",
             description: "[CAUTION] Subscribe to a DCD product atomically (quote + execute in one step)"
           },
           "redeem-execute": {
+            toolName: "dcd_redeem",
             usage: "okx earn dcd redeem-execute --ordId <id>",
             description: "[CAUTION] Re-quote and execute early redemption in one step (recommended for AI agent use)"
           },
           order: {
+            toolName: "dcd_get_order_state",
             usage: "okx earn dcd order --ordId <id>",
             description: "Query current state of a DCD order"
           },
           orders: {
+            toolName: "dcd_get_orders",
             usage: "okx earn dcd orders [--ordId <id>] [--productId <id>] [--uly <uly>] [--state <state>] [--limit <n>]",
             description: "Get DCD order history. State: initial|live|pending_settle|settled|pending_redeem|redeemed|rejected"
           }
@@ -10123,6 +10615,7 @@ var HELP_TREE = {
       }
     }
   },
+  // ── bot ────────────────────────────────────────────────────────────────────
   bot: {
     description: "Trading bot strategies (grid, dca)",
     subgroups: {
@@ -10130,22 +10623,27 @@ var HELP_TREE = {
         description: "Grid trading bot \u2014 create, monitor, and stop grid orders",
         commands: {
           orders: {
+            toolName: "grid_get_orders",
             usage: "okx bot grid orders --algoOrdType <grid|contract_grid|moon_grid> [--instId <id>] [--algoId <id>] [--history]",
             description: "List active or historical grid bot orders"
           },
           details: {
+            toolName: "grid_get_order_details",
             usage: "okx bot grid details --algoOrdType <type> --algoId <id>",
             description: "Get details of a specific grid bot order"
           },
           "sub-orders": {
+            toolName: "grid_get_sub_orders",
             usage: "okx bot grid sub-orders --algoOrdType <type> --algoId <id> [--live]",
             description: "List sub-orders of a grid bot (filled or live)"
           },
           create: {
+            toolName: "grid_create_order",
             usage: "okx bot grid create --instId <id> --algoOrdType <grid|contract_grid> --maxPx <px> --minPx <px> --gridNum <n>\n                   [--runType <1|2>] [--quoteSz <n>] [--baseSz <n>]\n                   [--direction <long|short|neutral>] [--lever <n>] [--sz <n>] [--basePos] [--no-basePos]\n                   [--tpTriggerPx <px>] [--slTriggerPx <px>] [--tpRatio <n>] [--slRatio <n>] [--algoClOrdId <id>]",
             description: "Create a new grid bot order (contract grid opens base position by default)"
           },
           stop: {
+            toolName: "grid_stop_order",
             usage: "okx bot grid stop --algoId <id> --algoOrdType <type> --instId <id> [--stopType <1|2|3|5|6>]",
             description: "Stop a running grid bot order"
           }
@@ -10155,22 +10653,27 @@ var HELP_TREE = {
         description: "DCA (Martingale) bot \u2014 spot or contract recurring buys",
         commands: {
           orders: {
+            toolName: "dca_get_orders",
             usage: "okx bot dca orders [--algoOrdType <spot_dca|contract_dca>] [--algoId <id>] [--instId <id>] [--history]",
             description: "List DCA bots (spot and/or contract)"
           },
           details: {
+            toolName: "dca_get_order_details",
             usage: "okx bot dca details --algoOrdType <spot_dca|contract_dca> --algoId <id>",
             description: "Get DCA bot details (spot or contract)"
           },
           "sub-orders": {
+            toolName: "dca_get_sub_orders",
             usage: "okx bot dca sub-orders --algoOrdType <spot_dca|contract_dca> --algoId <id> [--cycleId <id>]",
             description: "Get DCA cycles/orders (spot or contract)"
           },
           create: {
+            toolName: "dca_create_order",
             usage: "okx bot dca create --algoOrdType <spot_dca|contract_dca> --instId <id> --direction <long|short>\n                 --initOrdAmt <n> --maxSafetyOrds <n> --tpPct <n>\n                 [--lever <n>] [--safetyOrdAmt <n>] [--pxSteps <n>] [--pxStepsMult <n>] [--volMult <n>]\n                 [--slPct <n>] [--slMode <limit|market>] [--allowReinvest <true|false>]\n                 [--triggerStrategy <instant|price|rsi>] [--triggerPx <price>]\n                 [--triggerCond <cross_up|cross_down>] [--thold <n>] [--timeframe <tf>] [--timePeriod <n>]\n                 [--algoClOrdId <id>] [--reserveFunds <true|false>] [--tradeQuoteCcy <ccy>]\n                 Note: --lever required for contract_dca; safetyOrdAmt, pxSteps, pxStepsMult, volMult required when maxSafetyOrds > 0\n                 triggerStrategy: contract_dca supports instant|price|rsi; spot_dca supports instant|rsi",
             description: "Create a DCA (Martingale) bot (spot or contract)"
           },
           stop: {
+            toolName: "dca_stop_order",
             usage: "okx bot dca stop --algoOrdType <spot_dca|contract_dca> --algoId <id> [--stopType <1|2>]\n                 Note: --stopType required for spot_dca (1=sell all, 2=keep tokens)",
             description: "Stop a DCA bot (spot or contract)"
           }
@@ -10178,73 +10681,254 @@ var HELP_TREE = {
       }
     }
   },
+  // ── config ─────────────────────────────────────────────────────────────────
   config: {
     description: "Manage CLI configuration profiles",
     commands: {
       init: {
+        toolName: null,
         usage: "okx config init [--lang zh]",
         description: "Initialize a new configuration profile interactively"
       },
       show: {
+        toolName: null,
         usage: "okx config show",
         description: `Show current configuration (file: ${configFilePath()})`
       },
       set: {
+        toolName: null,
         usage: "okx config set <key> <value>",
         description: "Set a configuration value"
       },
       "setup-clients": {
+        toolName: null,
         usage: "okx config setup-clients",
         description: "Set up MCP client integrations (Cursor, Windsurf, etc.)"
       }
     }
   },
+  // ── setup ──────────────────────────────────────────────────────────────────
   setup: {
     description: "Set up client integrations (Cursor, Windsurf, Claude, etc.)",
     usage: `okx setup --client <${SUPPORTED_CLIENTS.join("|")}> [--profile <name>] [--modules <list>]`
   },
+  // ── doh ────────────────────────────────────────────────────────────────────
+  doh: {
+    description: "Manage DoH (DNS-over-HTTPS) resolver binary",
+    commands: {
+      status: {
+        toolName: null,
+        usage: "okx doh status [--json]",
+        description: "Show DoH binary info, checksum, and CDN match status"
+      },
+      install: {
+        toolName: null,
+        usage: "okx doh install [--json]",
+        description: "Download or update the DoH resolver binary"
+      },
+      remove: {
+        toolName: null,
+        usage: "okx doh remove [--force] [--json]",
+        description: "Remove the DoH resolver binary (prompts for confirmation without --force)"
+      }
+    }
+  },
+  // ── diagnose ───────────────────────────────────────────────────────────────
   diagnose: {
     description: "Run network / MCP server diagnostics",
     usage: "okx diagnose [--cli | --mcp | --all] [--profile <name>] [--demo | --live] [--output <file>]"
   },
+  // ── skill ──────────────────────────────────────────────────────────────────
   skill: {
     description: "OKX Skills Marketplace \u2014 search, install, and manage agent skills",
     commands: {
       search: {
+        toolName: "skills_search",
         usage: "okx skill search [--keyword <kw>] [--categories <id>] [--page <n>] [--limit <n>]",
         description: "Search for skills in the marketplace"
       },
       categories: {
+        toolName: "skills_get_categories",
         usage: "okx skill categories",
         description: "List available skill categories"
       },
       add: {
+        // Composite: downloads + installs via npx; no single ToolSpec
+        toolName: null,
         usage: "okx skill add <name>",
         description: "Download and install a skill to detected agents"
       },
       download: {
+        // CLI calls downloadSkillZip directly (same capability as skills_download ToolSpec)
+        toolName: "skills_download",
         usage: "okx skill download <name> [--dir <path>] [--format zip|skill]",
         description: "Download a skill package without installing"
       },
       remove: {
+        toolName: null,
         usage: "okx skill remove <name>",
         description: "Remove an installed skill"
       },
       check: {
+        // Uses skills_search internally; skills_search already registered above
+        toolName: null,
         usage: "okx skill check <name>",
         description: "Check if an installed skill has a newer version"
       },
       list: {
+        toolName: null,
         usage: "okx skill list",
         description: "List all locally installed skills"
       }
     }
   },
+  // ── upgrade ────────────────────────────────────────────────────────────────
   upgrade: {
     description: "Upgrade okx CLI and MCP server to the latest stable version",
     usage: "okx upgrade [--check] [--beta] [--force] [--json]"
   }
 };
+
+// src/help-generator.ts
+function buildSpecMap() {
+  return new Map(allToolSpecs().map((s) => [s.name, s]));
+}
+function resolveCommandDescription(entry, specMap, fallback = "(no description)") {
+  if (entry.description) return entry.description;
+  if (entry.toolName != null) {
+    const spec = specMap.get(entry.toolName);
+    if (spec?.description) return spec.description.split(/\.\s/)[0] + ".";
+  }
+  return fallback;
+}
+function buildCommands(commands, specMap) {
+  const result = {};
+  for (const [name, entry] of Object.entries(commands)) {
+    result[name] = {
+      usage: entry.usage,
+      description: resolveCommandDescription(entry, specMap)
+    };
+  }
+  return result;
+}
+function buildGroupInfo(key, mod, specMap) {
+  const description = mod.description ?? MODULE_DESCRIPTIONS[key] ?? key;
+  return {
+    description,
+    usage: mod.usage,
+    commands: mod.commands ? buildCommands(mod.commands, specMap) : void 0,
+    subgroups: mod.subgroups ? buildSubgroups(mod.subgroups, specMap) : void 0
+  };
+}
+function buildSubgroups(subgroups, specMap) {
+  const result = {};
+  for (const [name, entry] of Object.entries(subgroups)) {
+    result[name] = buildGroupInfo(name, entry, specMap);
+  }
+  return result;
+}
+var _cached = null;
+function generateHelpTree() {
+  if (_cached) return _cached;
+  const specMap = buildSpecMap();
+  const tree = {};
+  for (const [key, mod] of Object.entries(CLI_REGISTRY)) {
+    tree[key] = buildGroupInfo(key, mod, specMap);
+  }
+  _cached = tree;
+  return tree;
+}
+
+// src/commands/discovery.ts
+function extractParameters(toolName, specMap) {
+  if (toolName == null) return [];
+  const spec = specMap.get(toolName);
+  if (!spec?.inputSchema) return [];
+  const schema = spec.inputSchema;
+  if (!schema.properties) return [];
+  const required = new Set(schema.required ?? []);
+  return Object.entries(schema.properties).map(([name, prop]) => ({
+    name,
+    type: prop.type ?? "string",
+    required: required.has(name),
+    description: prop.description
+  }));
+}
+function collectCommands(modulePath, mod, specMap, commands) {
+  for (const [cmdName, entry] of Object.entries(mod.commands ?? {})) {
+    commands.push({
+      path: `${modulePath} ${cmdName}`,
+      toolName: entry.toolName,
+      description: resolveCommandDescription(entry, specMap, ""),
+      parameters: extractParameters(entry.toolName, specMap)
+    });
+  }
+  for (const [sgName, sg] of Object.entries(mod.subgroups ?? {})) {
+    collectCommands(`${modulePath} ${sgName}`, sg, specMap, commands);
+  }
+}
+function getDiscoveryOutput() {
+  const specs = allToolSpecs();
+  const specMap = new Map(specs.map((s) => [s.name, s]));
+  const moduleDescMap = new Map(specs.map((s) => [s.module, s.description]));
+  const version = readCliVersion();
+  const modules = [];
+  for (const [moduleKey, moduleEntry] of Object.entries(CLI_REGISTRY)) {
+    const commands = [];
+    collectCommands(`okx ${moduleKey}`, moduleEntry, specMap, commands);
+    const description = moduleEntry.description ?? MODULE_DESCRIPTIONS[moduleKey] ?? moduleDescMap.get(moduleKey) ?? moduleKey;
+    modules.push({
+      name: moduleKey,
+      description,
+      commands
+    });
+  }
+  const totalTools = modules.reduce(
+    (sum, m) => sum + m.commands.filter((c) => c.toolName !== null).length,
+    0
+  );
+  return { version, totalTools, modules };
+}
+function cmdListTools(json) {
+  const data = getDiscoveryOutput();
+  if (json) {
+    output(JSON.stringify(data, null, 2) + "\n");
+    return;
+  }
+  const lines = [
+    "",
+    `OKX CLI v${data.version} \u2014 ${data.totalTools} tool-backed commands across ${data.modules.length} modules`,
+    "",
+    "Modules:"
+  ];
+  for (const mod of data.modules) {
+    const toolCmds = mod.commands.filter((c) => c.toolName !== null).length;
+    if (toolCmds > 0) {
+      lines.push(`  ${mod.name.padEnd(14)}${toolCmds} commands`);
+    }
+  }
+  lines.push("", 'Use "okx list-tools --json" for machine-readable output.', "");
+  output(lines.join("\n"));
+}
+
+// src/config/loader.ts
+function loadProfileConfig(opts) {
+  return loadConfig({
+    profile: opts.profile,
+    modules: opts.modules,
+    readOnly: opts.readOnly ?? false,
+    demo: opts.demo,
+    live: opts.live,
+    site: opts.site,
+    userAgent: opts.userAgent,
+    sourceTag: opts.sourceTag,
+    verbose: opts.verbose
+  });
+}
+
+// src/help.ts
+import { EOL as EOL2 } from "os";
+var HELP_TREE = generateHelpTree();
 function printGlobalHelp() {
   const lines = [
     "",
@@ -13366,14 +14050,14 @@ async function cmdDcdQuoteAndBuy(run, opts) {
 }
 
 // src/commands/skill.ts
-import { tmpdir, homedir as homedir9 } from "os";
-import { join as join11, dirname as dirname7 } from "path";
-import { mkdirSync as mkdirSync9, rmSync, existsSync as existsSync7, copyFileSync as copyFileSync2 } from "fs";
+import { tmpdir, homedir as homedir10 } from "os";
+import { join as join12, dirname as dirname8 } from "path";
+import { mkdirSync as mkdirSync10, rmSync, existsSync as existsSync8, copyFileSync as copyFileSync2 } from "fs";
 import { execFileSync as execFileSync2 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
 function resolveNpx() {
-  const sibling = join11(dirname7(process.execPath), "npx");
-  if (existsSync7(sibling)) return sibling;
+  const sibling = join12(dirname8(process.execPath), "npx");
+  if (existsSync8(sibling)) return sibling;
   return "npx";
 }
 var THIRD_PARTY_INSTALL_NOTICE = "Note: This skill was created by a third-party developer, not by OKX. Review SKILL.md before use.";
@@ -13426,13 +14110,13 @@ async function cmdSkillCategories(run, json) {
   outputLine("");
 }
 async function cmdSkillAdd(name, config, json) {
-  const tmpBase = join11(tmpdir(), `okx-skill-${randomUUID2()}`);
-  mkdirSync9(tmpBase, { recursive: true });
+  const tmpBase = join12(tmpdir(), `okx-skill-${randomUUID2()}`);
+  mkdirSync10(tmpBase, { recursive: true });
   try {
     outputLine(`Downloading ${name}...`);
     const client = new OkxRestClient(config);
     const zipPath = await downloadSkillZip(client, name, tmpBase);
-    const contentDir = await extractSkillZip(zipPath, join11(tmpBase, "content"));
+    const contentDir = await extractSkillZip(zipPath, join12(tmpBase, "content"));
     const meta = readMetaJson(contentDir);
     validateSkillMdExists(contentDir);
     outputLine("Installing to detected agents...");
@@ -13442,7 +14126,7 @@ async function cmdSkillAdd(name, config, json) {
         timeout: 6e4
       });
     } catch (e) {
-      const savedZip = join11(process.cwd(), `${name}.zip`);
+      const savedZip = join12(process.cwd(), `${name}.zip`);
       try {
         copyFileSync2(zipPath, savedZip);
       } catch {
@@ -13481,7 +14165,7 @@ function cmdSkillRemove(name, json) {
       timeout: 6e4
     });
   } catch {
-    const agentsPath = join11(homedir9(), ".agents", "skills", name);
+    const agentsPath = join12(homedir10(), ".agents", "skills", name);
     try {
       rmSync(agentsPath, { recursive: true, force: true });
     } catch {
@@ -13554,10 +14238,171 @@ function printSkillInstallResult(meta, json) {
   }
 }
 
+// src/commands/doh.ts
+import readline from "readline";
+function resolveChecksumMatch(local, cdnChecksum, cdnError) {
+  if (!local.exists) return "not-installed";
+  if (cdnError || !cdnChecksum) return "unavailable";
+  if (cdnChecksum.sha256 === local.sha256) return "match";
+  return "mismatch";
+}
+function checksumMatchLabel(match) {
+  if (match === "match") return "\u2713 match";
+  if (match === "mismatch") return "\u2717 mismatch (update available)";
+  return "CDN unreachable";
+}
+function formatStatusText(local, checksumMatch, cdnChecksum, runtimeMode) {
+  outputLine("");
+  outputLine("  DoH Resolver Status");
+  outputLine("  " + "\u2500".repeat(40));
+  outputLine(`  Binary path : ${local.binaryPath}`);
+  outputLine(`  Installed   : ${local.exists ? "yes" : "no"}`);
+  outputLine(`  Platform    : ${local.platform ?? "(unsupported)"}`);
+  if (local.exists) {
+    outputLine(`  File size   : ${formatBytes(local.fileSize)}`);
+    outputLine(`  SHA-256     : ${local.sha256 ?? "(unknown)"}`);
+    outputLine(`  CDN check   : ${checksumMatchLabel(checksumMatch)}`);
+    if (cdnChecksum) {
+      outputLine(`  CDN source  : ${cdnChecksum.source}`);
+    }
+  }
+  outputLine(`  Runtime mode: ${runtimeMode}`);
+  outputLine("");
+}
+async function cmdDohStatus(json, binaryPath) {
+  const local = getDohStatus(binaryPath);
+  let runtimeMode = "no cache";
+  try {
+    const cacheEntry = readCache("www.okx.com");
+    if (cacheEntry) {
+      runtimeMode = cacheEntry.mode;
+    }
+  } catch {
+  }
+  let cdnChecksum = null;
+  let cdnError = null;
+  if (local.exists) {
+    try {
+      cdnChecksum = await fetchCdnChecksum(void 0, 5e3);
+    } catch (err) {
+      cdnError = err instanceof Error ? err.message : String(err);
+    }
+  }
+  const checksumMatch = resolveChecksumMatch(local, cdnChecksum, cdnError);
+  if (json) {
+    outputLine(
+      JSON.stringify({
+        binaryPath: local.binaryPath,
+        exists: local.exists,
+        platform: local.platform,
+        fileSize: local.fileSize ?? null,
+        sha256: local.sha256 ?? null,
+        cdnMatch: checksumMatch,
+        cdnSha256: cdnChecksum?.sha256 ?? null,
+        cdnSource: cdnChecksum?.source ?? null,
+        runtimeMode
+      })
+    );
+    return;
+  }
+  formatStatusText(local, checksumMatch, cdnChecksum, runtimeMode);
+}
+async function cmdDohInstall(json, binaryPath) {
+  const messages2 = [];
+  const onProgress = (msg) => {
+    if (!json) {
+      outputLine(`  ${msg}`);
+    }
+    messages2.push(msg);
+  };
+  if (!json) {
+    outputLine("");
+    outputLine("  Installing DoH resolver...");
+  }
+  const result = await installDohBinary(binaryPath, void 0, onProgress);
+  if (json) {
+    outputLine(JSON.stringify({ status: result.status, source: result.source ?? null, error: result.error ?? null, messages: messages2 }));
+    if (result.status === "failed") {
+      process.exitCode = 1;
+    }
+    return;
+  }
+  if (result.status === "installed") {
+    outputLine(`  \u2713 DoH resolver installed successfully (${result.source ?? ""})`);
+  } else if (result.status === "up-to-date") {
+    outputLine("  \u2713 DoH resolver is already up to date");
+  } else {
+    errorLine(`  \u2717 Installation failed: ${result.error ?? "unknown error"}`);
+    errorLine("  Hint: check network connectivity or try again later");
+    process.exitCode = 1;
+  }
+  outputLine("");
+}
+async function cmdDohRemove(force, json, binaryPath) {
+  const local = getDohStatus(binaryPath);
+  if (!local.exists) {
+    if (json) {
+      outputLine(JSON.stringify({ status: "not-installed" }));
+    } else {
+      outputLine("  DoH resolver is not installed.");
+    }
+    return;
+  }
+  if (!force) {
+    if (!process.stdin.isTTY) {
+      errorLine("  Error: stdin is not a TTY. Use --force to skip confirmation.");
+      process.exitCode = 1;
+      return;
+    }
+    const confirmed = await askConfirmation(
+      `  Remove DoH resolver at ${local.binaryPath}? [y/N] `
+    );
+    if (!confirmed) {
+      outputLine("  Cancelled.");
+      return;
+    }
+  }
+  const result = removeDohBinary(binaryPath);
+  if (json) {
+    outputLine(JSON.stringify({ status: result.status, path: local.binaryPath }));
+    return;
+  }
+  if (result.status === "removed") {
+    outputLine(`  \u2713 Removed: ${local.binaryPath}`);
+  } else {
+    outputLine("  DoH resolver is not installed.");
+  }
+}
+function formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
+}
+function askConfirmation(prompt2) {
+  return new Promise((resolve3) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    rl.question(prompt2, (answer) => {
+      rl.close();
+      resolve3(answer.trim().toLowerCase() === "y");
+    });
+  });
+}
+
 // src/index.ts
 var _require3 = createRequire3(import.meta.url);
 var CLI_VERSION2 = _require3("../package.json").version;
-var GIT_HASH2 = true ? "980de10" : "dev";
+var GIT_HASH2 = true ? "63a5613" : "dev";
+function handleDohCommand(action, json, force, binaryPath) {
+  if (action === "status") return cmdDohStatus(json, binaryPath);
+  if (action === "install") return cmdDohInstall(json, binaryPath);
+  if (action === "remove") return cmdDohRemove(force, json, binaryPath);
+  errorLine(`Unknown doh command: ${action}`);
+  errorLine("Usage: okx doh <status|install|remove>");
+  process.exitCode = 1;
+}
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);
@@ -14409,6 +15254,24 @@ async function runDiagnose(v) {
   }
   return cmdDiagnose(config, v.profile ?? "default", { mcp: v.mcp, cli: v.cli, all: v.all, output: v.output });
 }
+function printVersion() {
+  outputLine(`${CLI_VERSION2} (${GIT_HASH2})`);
+  const dohStatus = getDohStatus(void 0, { skipHash: true });
+  if (dohStatus.exists) {
+    outputLine(`DoH resolver: installed (${dohStatus.platform ?? "unknown"})`);
+  } else {
+    outputLine("DoH resolver: not installed");
+  }
+}
+function routeManagementCommand(module, action, rest, json, v) {
+  if (module === "config") return handleConfigCommand(action, rest, json, v.lang, v.force);
+  if (module === "setup") return handleSetupCommand(v);
+  if (module === "upgrade") return cmdUpgrade(CLI_VERSION2, { beta: v.beta, check: v.check, force: v.force }, json);
+  if (module === "doh") return handleDohCommand(action, json, v.force ?? false);
+  if (module === "diagnose") return runDiagnose(v);
+  if (module === "list-tools") return cmdListTools(json);
+  return void 0;
+}
 async function main() {
   setOutput({
     out: (m) => process.stdout.write(m),
@@ -14417,7 +15280,7 @@ async function main() {
   checkForUpdates("@okx_ai/okx-trade-cli", CLI_VERSION2);
   const { values, positionals } = parseCli(process.argv.slice(2));
   if (values.version) {
-    outputLine(`${CLI_VERSION2} (${GIT_HASH2})`);
+    printVersion();
     return;
   }
   if (values.help || positionals.length === 0) {
@@ -14427,10 +15290,8 @@ async function main() {
   const [module, action, ...rest] = positionals;
   const v = values;
   const json = v.json ?? false;
-  if (module === "config") return handleConfigCommand(action, rest, json, v.lang, v.force);
-  if (module === "setup") return handleSetupCommand(v);
-  if (module === "upgrade") return cmdUpgrade(CLI_VERSION2, { beta: v.beta, check: v.check, force: v.force }, json);
-  if (module === "diagnose") return runDiagnose(v);
+  const mgmt = routeManagementCommand(module, action, rest, json, v);
+  if (mgmt) return mgmt;
   const config = loadProfileConfig({ profile: v.profile, demo: v.demo, live: v.live, verbose: v.verbose, userAgent: `okx-trade-cli/${CLI_VERSION2}`, sourceTag: "CLI" });
   setEnvContext({ demo: config.demo, profile: v.profile ?? "default" });
   setJsonEnvEnabled(v.env ?? false);
@@ -14468,6 +15329,7 @@ export {
   handleBotDcaCommand,
   handleBotGridCommand,
   handleConfigCommand,
+  handleDohCommand,
   handleEarnCommand,
   handleFuturesAlgoCommand,
   handleFuturesCommand,