@okx_ai/okx-trade-cli 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/index.js

@@ -4,37 +4,25 @@
 import { createRequire as createRequire3 } from "module";
 
 // ../core/dist/index.js
-import { Agent, ProxyAgent } from "undici";
-import { execFile } from "child_process";
-import { homedir } from "os";
-import { join } from "path";
-import {
-  readFileSync,
-  writeFileSync,
-  mkdirSync,
-  unlinkSync,
-  renameSync
-} from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join2, dirname } from "path";
+import { ProxyAgent } from "undici";
 import { createHmac } from "crypto";
 import fs from "fs";
 import path from "path";
 import os from "os";
-import { writeFileSync as writeFileSync2, renameSync as renameSync2, unlinkSync as unlinkSync2, mkdirSync as mkdirSync2 } from "fs";
-import { join as join3, resolve, basename, sep } from "path";
+import { writeFileSync, renameSync, unlinkSync, mkdirSync } from "fs";
+import { join, resolve, basename, sep } from "path";
 import { randomUUID } from "crypto";
 import yauzl from "yauzl";
-import { createWriteStream, mkdirSync as mkdirSync3 } from "fs";
-import { resolve as resolve2, dirname as dirname2 } from "path";
-import { readFileSync as readFileSync2, existsSync } from "fs";
-import { join as join4 } from "path";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4, existsSync as existsSync2 } from "fs";
-import { join as join5, dirname as dirname3 } from "path";
-import { homedir as homedir3 } from "os";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync5, existsSync as existsSync3 } from "fs";
-import { join as join6, dirname as dirname4 } from "path";
-import { homedir as homedir4 } from "os";
+import { createWriteStream, mkdirSync as mkdirSync2 } from "fs";
+import { resolve as resolve2, dirname } from "path";
+import { readFileSync, existsSync } from "fs";
+import { join as join2 } from "path";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3, existsSync as existsSync2 } from "fs";
+import { join as join3, dirname as dirname2 } from "path";
+import { homedir } from "os";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4, existsSync as existsSync3 } from "fs";
+import { join as join4, dirname as dirname3 } from "path";
+import { homedir as homedir2 } from "os";
 
 // ../../node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/error.js
 function getLineColFromPtr(string, ptr) {
@@ -863,137 +851,16 @@ function stringify(obj, { maxDepth = 1e3, numbersAsFloat = false } = {}) {
 }
 
 // ../core/dist/index.js
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6, existsSync as existsSync4 } from "fs";
-import { join as join7 } from "path";
-import { homedir as homedir5 } from "os";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync5, existsSync as existsSync4 } from "fs";
+import { join as join5 } from "path";
+import { homedir as homedir3 } from "os";
+import fs2 from "fs";
+import path2 from "path";
+import os2 from "os";
 import * as fs3 from "fs";
 import * as path3 from "path";
 import * as os3 from "os";
 import { execFileSync } from "child_process";
-var EXEC_TIMEOUT_MS = 3e4;
-var DOH_BIN_DIR = join(homedir(), ".okx", "bin");
-function getDohBinaryPath() {
-  if (process.env.OKX_DOH_BINARY_PATH) {
-    return process.env.OKX_DOH_BINARY_PATH;
-  }
-  const ext = process.platform === "win32" ? ".exe" : "";
-  return join(DOH_BIN_DIR, `okx-doh-resolver${ext}`);
-}
-function execDohBinary(domain, exclude = [], userAgent) {
-  const binPath = getDohBinaryPath();
-  const args = ["--domain", domain];
-  if (exclude.length > 0) {
-    args.push("--exclude", exclude.join(","));
-  }
-  if (userAgent) {
-    args.push("--user-agent", userAgent);
-  }
-  return new Promise((resolve3) => {
-    execFile(
-      binPath,
-      args,
-      { timeout: EXEC_TIMEOUT_MS, encoding: "utf-8" },
-      (error, stdout) => {
-        if (error) {
-          resolve3(null);
-          return;
-        }
-        try {
-          const result = JSON.parse(stdout);
-          if (result.code === 0 && result.data) {
-            resolve3(result.data);
-          } else {
-            resolve3(null);
-          }
-        } catch {
-          resolve3(null);
-        }
-      }
-    );
-  });
-}
-var DOH_CACHE_PATH = join2(homedir2(), ".okx", "doh-node-cache.json");
-function readCache(hostname, cachePath = DOH_CACHE_PATH) {
-  try {
-    const raw = readFileSync(cachePath, "utf-8");
-    const file = JSON.parse(raw);
-    return file[hostname] ?? null;
-  } catch {
-    return null;
-  }
-}
-function writeCache(hostname, entry, cachePath = DOH_CACHE_PATH) {
-  try {
-    const dir = dirname(cachePath);
-    mkdirSync(dir, { recursive: true });
-    let file = {};
-    try {
-      file = JSON.parse(readFileSync(cachePath, "utf-8"));
-    } catch {
-    }
-    file[hostname] = entry;
-    const tmpPath = `${cachePath}.tmp`;
-    writeFileSync(tmpPath, JSON.stringify(file));
-    renameSync(tmpPath, cachePath);
-  } catch {
-  }
-}
-var FAILED_NODE_TTL_MS = 60 * 60 * 1e3;
-function classifyAndCache(node, hostname, failedNodes) {
-  if (!node) {
-    if (failedNodes.length > 0) {
-      writeCache(hostname, {
-        mode: "direct",
-        node: null,
-        failedNodes,
-        updatedAt: Date.now()
-      });
-    }
-    return { mode: null, node: null };
-  }
-  if (node.ip === hostname || node.host === hostname) {
-    writeCache(hostname, {
-      mode: "direct",
-      node: null,
-      failedNodes,
-      updatedAt: Date.now()
-    });
-    return { mode: "direct", node: null };
-  }
-  writeCache(hostname, {
-    mode: "proxy",
-    node,
-    failedNodes,
-    updatedAt: Date.now()
-  });
-  return { mode: "proxy", node };
-}
-function getActiveFailedNodes(nodes) {
-  if (!nodes || nodes.length === 0) return [];
-  const now = Date.now();
-  return nodes.filter((n) => now - n.failedAt < FAILED_NODE_TTL_MS);
-}
-async function resolveDoh(hostname) {
-  const entry = readCache(hostname);
-  if (entry) {
-    if (entry.mode === "direct") {
-      return { mode: "direct", node: null };
-    }
-    if (entry.mode === "proxy" && entry.node) {
-      return { mode: "proxy", node: entry.node };
-    }
-  }
-  return { mode: null, node: null };
-}
-async function reResolveDoh(hostname, failedIp, userAgent) {
-  const entry = readCache(hostname);
-  const active = getActiveFailedNodes(entry?.failedNodes);
-  const now = Date.now();
-  const failedNodes = failedIp ? active.some((n) => n.ip === failedIp) ? active : [...active, { ip: failedIp, failedAt: now }] : active;
-  const excludeIps = failedNodes.map((n) => n.ip);
-  const node = await execDohBinary(hostname, excludeIps, userAgent);
-  return classifyAndCache(node, hostname, failedNodes);
-}
 function getNow() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -1212,14 +1079,6 @@ var OkxRestClient = class _OkxRestClient {
   config;
   rateLimiter;
   dispatcher;
-  // DoH proxy state (lazy-resolved on first request)
-  dohResolved = false;
-  dohRetried = false;
-  directUnverified = false;
-  // The first direct connection has not yet been verified
-  dohNode = null;
-  dohAgent = null;
-  dohBaseUrl = null;
   constructor(config) {
     this.config = config;
     this.rateLimiter = new RateLimiter(3e4, config.verbose);
@@ -1227,97 +1086,6 @@ var OkxRestClient = class _OkxRestClient {
       this.dispatcher = new ProxyAgent(config.proxyUrl);
     }
   }
-  /**
-   * Lazily resolve the DoH proxy node on the first request.
-   * Uses cache-first strategy via the resolver.
-   */
-  async ensureDoh() {
-    if (this.dohResolved || this.dispatcher) return;
-    this.dohResolved = true;
-    try {
-      const { hostname, protocol } = new URL(this.config.baseUrl);
-      const result = await resolveDoh(hostname);
-      if (!result.mode) {
-        this.directUnverified = true;
-        if (this.config.verbose) {
-          vlog("DoH: no cache, trying direct connection first");
-        }
-        return;
-      }
-      if (result.mode === "direct") {
-        if (this.config.verbose) {
-          vlog("DoH: mode=direct (overseas or cached), using direct connection");
-        }
-        return;
-      }
-      if (result.node) {
-        this.applyDohNode(result.node, protocol);
-      }
-    } catch (err) {
-      if (this.config.verbose) {
-        const cause = err instanceof Error ? err.message : String(err);
-        vlog(`DoH resolution failed, falling back to direct: ${cause}`);
-      }
-    }
-  }
-  /** Apply a DoH node: set up the custom Agent + base URL. */
-  applyDohNode(node, protocol) {
-    this.dohNode = node;
-    this.dohBaseUrl = `${protocol}//${node.host}`;
-    this.dohAgent = new Agent({
-      connect: {
-        lookup: (_hostname, options, callback) => {
-          if (options?.all) {
-            callback(null, [{ address: node.ip, family: 4 }]);
-          } else {
-            callback(null, node.ip, 4);
-          }
-        }
-      }
-    });
-    if (this.config.verbose) {
-      vlog(`DoH proxy active: \u2192 ${node.host} (${node.ip}), ttl=${node.ttl}s`);
-    }
-  }
-  /**
-   * Handle network failure: re-resolve with --exclude and retry once.
-   * Returns true if retry should proceed, false if already retried.
-   */
-  async handleDohNetworkFailure() {
-    if (this.dohRetried) return false;
-    this.dohRetried = true;
-    const failedIp = this.dohNode?.ip ?? "";
-    const { hostname, protocol } = new URL(this.config.baseUrl);
-    this.dohNode = null;
-    this.dohAgent = null;
-    this.dohBaseUrl = null;
-    if (!failedIp) this.directUnverified = false;
-    if (this.config.verbose) {
-      vlog(failedIp ? `DoH: proxy node ${failedIp} failed, re-resolving with --exclude` : "DoH: direct connection failed, calling binary for DoH resolution");
-    }
-    try {
-      const result = await reResolveDoh(hostname, failedIp, this.dohUserAgent);
-      if (result.mode === "proxy" && result.node) {
-        this.applyDohNode(result.node, protocol);
-        return true;
-      }
-    } catch {
-    }
-    if (this.config.verbose) {
-      vlog("DoH: re-resolution failed or switched to direct, retrying with direct connection");
-    }
-    return true;
-  }
-  get activeBaseUrl() {
-    return this.dohNode ? this.dohBaseUrl : this.config.baseUrl;
-  }
-  get activeDispatcher() {
-    return this.dispatcher ?? this.dohAgent ?? void 0;
-  }
-  /** User-Agent for DoH proxy requests: OKX/@okx_ai/{packageName}/{version} */
-  get dohUserAgent() {
-    return `OKX/@okx_ai/${this.config.userAgent ?? "unknown"}`;
-  }
   logRequest(method, url, auth) {
     if (!this.config.verbose) return;
     vlog(`\u2192 ${method} ${url}`);
@@ -1332,13 +1100,14 @@ var OkxRestClient = class _OkxRestClient {
       vlog(`\u2190 ${status} | code=${code ?? "0"} | ${rawLen}B | ${elapsed}ms | trace=${traceId ?? "-"}`);
     }
   }
-  async publicGet(path42, query, rateLimit) {
+  async publicGet(path42, query, rateLimit, simulatedTrading) {
     return this.request({
       method: "GET",
       path: path42,
       auth: "public",
       query,
-      rateLimit
+      rateLimit,
+      simulatedTrading
     });
   }
   async privateGet(path42, query, rateLimit) {
@@ -1487,17 +1256,13 @@ var OkxRestClient = class _OkxRestClient {
    * Security: validates Content-Type and enforces maxBytes limit.
    */
   async privatePostBinary(path42, body, opts) {
-    await this.ensureDoh();
     const maxBytes = opts?.maxBytes ?? _OkxRestClient.DEFAULT_MAX_BYTES;
     const expectedCT = opts?.expectedContentType ?? "application/octet-stream";
     const bodyJson = body ? JSON.stringify(body) : "";
     const endpoint = `POST ${path42}`;
-    this.logRequest("POST", `${this.activeBaseUrl}${path42}`, "private");
+    this.logRequest("POST", `${this.config.baseUrl}${path42}`, "private");
     const reqConfig = { method: "POST", path: path42, auth: "private" };
     const headers = this.buildHeaders(reqConfig, path42, bodyJson, getNow());
-    if (this.dohNode) {
-      headers.set("User-Agent", this.dohUserAgent);
-    }
     const t0 = Date.now();
     const response = await this.fetchBinary(path42, endpoint, headers, bodyJson, t0);
     const elapsed = Date.now() - t0;
@@ -1531,10 +1296,10 @@ var OkxRestClient = class _OkxRestClient {
         method: "POST",
         headers,
         body: bodyJson || void 0,
-        signal: AbortSignal.timeout(this.config.timeoutMs),
-        dispatcher: this.activeDispatcher
+        signal: AbortSignal.timeout(this.config.timeoutMs)
       };
-      return await fetch(`${this.activeBaseUrl}${path42}`, fetchOptions);
+      if (this.dispatcher) fetchOptions.dispatcher = this.dispatcher;
+      return await fetch(`${this.config.baseUrl}${path42}`, fetchOptions);
     } catch (error) {
       if (this.config.verbose) {
         vlog(`\u2717 NetworkError after ${Date.now() - t0}ms: ${error instanceof Error ? error.message : String(error)}`);
@@ -1556,7 +1321,8 @@ var OkxRestClient = class _OkxRestClient {
     if (reqConfig.auth === "private") {
       this.setAuthHeaders(headers, reqConfig.method, requestPath, bodyJson, timestamp);
     }
-    if (this.config.demo) {
+    const useSimulated = reqConfig.simulatedTrading !== void 0 ? reqConfig.simulatedTrading : this.config.demo;
+    if (useSimulated) {
       headers.set("x-simulated-trading", "1");
     }
     return headers;
@@ -1565,10 +1331,9 @@ var OkxRestClient = class _OkxRestClient {
   // JSON request
   // ---------------------------------------------------------------------------
   async request(reqConfig) {
-    await this.ensureDoh();
     const queryString = buildQueryString(reqConfig.query);
     const requestPath = queryString.length > 0 ? `${reqConfig.path}?${queryString}` : reqConfig.path;
-    const url = `${this.activeBaseUrl}${requestPath}`;
+    const url = `${this.config.baseUrl}${requestPath}`;
     const bodyJson = reqConfig.body ? JSON.stringify(reqConfig.body) : "";
     const timestamp = getNow();
     this.logRequest(reqConfig.method, url, reqConfig.auth);
@@ -1576,9 +1341,6 @@ var OkxRestClient = class _OkxRestClient {
       await this.rateLimiter.consume(reqConfig.rateLimit);
     }
     const headers = this.buildHeaders(reqConfig, requestPath, bodyJson, timestamp);
-    if (this.dohNode) {
-      headers.set("User-Agent", this.dohUserAgent);
-    }
     const t0 = Date.now();
     let response;
     try {
@@ -1586,20 +1348,13 @@ var OkxRestClient = class _OkxRestClient {
         method: reqConfig.method,
         headers,
         body: reqConfig.method === "POST" ? bodyJson : void 0,
-        signal: AbortSignal.timeout(this.config.timeoutMs),
-        dispatcher: this.activeDispatcher
+        signal: AbortSignal.timeout(this.config.timeoutMs)
       };
+      if (this.dispatcher) {
+        fetchOptions.dispatcher = this.dispatcher;
+      }
       response = await fetch(url, fetchOptions);
     } catch (error) {
-      if (!this.dohRetried) {
-        if (this.config.verbose) {
-          vlog(`Network failure, refreshing DoH: ${error instanceof Error ? error.message : String(error)}`);
-        }
-        const shouldRetry = await this.handleDohNetworkFailure();
-        if (shouldRetry && reqConfig.method === "GET") {
-          return this.request(reqConfig);
-        }
-      }
       if (this.config.verbose) {
         const elapsed2 = Date.now() - t0;
         const cause = error instanceof Error ? error.message : String(error);
@@ -1614,19 +1369,6 @@ var OkxRestClient = class _OkxRestClient {
     const rawText = await response.text();
     const elapsed = Date.now() - t0;
     const traceId = extractTraceId(response.headers);
-    if (this.directUnverified && !this.dohNode) {
-      this.directUnverified = false;
-      const { hostname: h } = new URL(this.config.baseUrl);
-      writeCache(h, {
-        mode: "direct",
-        node: null,
-        failedNodes: [],
-        updatedAt: Date.now()
-      });
-      if (this.config.verbose) {
-        vlog("DoH: direct connection succeeded, cached mode=direct");
-      }
-    }
     return this.processResponse(rawText, response, elapsed, traceId, reqConfig, requestPath);
   }
 };
@@ -1766,14 +1508,137 @@ var INDICATOR_BARS = [
   "1Wutc"
 ];
 var INDICATOR_CODE_OVERRIDES = {
+  // Aliases
+  "boll": "BB",
+  // server supports BB not BOLL
+  // Names where default rule produces underscores but backend uses no separator
   "rainbow": "BTCRAINBOW",
-  "range-filter": "RANGEFILTER",
+  // default: RAINBOW
   "stoch-rsi": "STOCHRSI",
-  "pi-cycle-top": "PI_CYCLE_TOP",
-  "pi-cycle-bottom": "PI_CYCLE_BOTTOM",
-  // boll is an alias for bb; server supports BB not BOLL
-  "boll": "BB"
+  // default: STOCH_RSI
+  "bull-engulf": "BULLENGULF",
+  // default: BULL_ENGULF
+  "bear-engulf": "BEARENGULF",
+  // default: BEAR_ENGULF
+  "bull-harami": "BULLHARAMI",
+  // default: BULL_HARAMI
+  "bear-harami": "BEARHARAMI",
+  // default: BEAR_HARAMI
+  "bull-harami-cross": "BULLHARAMICROSS",
+  // default: BULL_HARAMI_CROSS
+  "bear-harami-cross": "BEARHARAMICROSS",
+  // default: BEAR_HARAMI_CROSS
+  "three-soldiers": "THREESOLDIERS",
+  // default: THREE_SOLDIERS
+  "three-crows": "THREECROWS",
+  // default: THREE_CROWS
+  "hanging-man": "HANGINGMAN",
+  // default: HANGING_MAN
+  "inverted-hammer": "INVERTEDH",
+  // default: INVERTED_HAMMER (backend uses INVERTEDH)
+  "shooting-star": "SHOOTINGSTAR",
+  // default: SHOOTING_STAR
+  "nvi-pvi": "NVIPVI",
+  // default: NVI_PVI
+  "top-long-short": "TOPLONGSHORT"
+  // default: TOP_LONG_SHORT
+  // Note: range-filter → RANGE_FILTER is correct via the default rule; no override needed.
 };
+var KNOWN_INDICATORS = [
+  // Moving Averages
+  { name: "ma", description: "Simple Moving Average" },
+  { name: "ema", description: "Exponential Moving Average" },
+  { name: "wma", description: "Weighted Moving Average" },
+  { name: "dema", description: "Double Exponential Moving Average" },
+  { name: "tema", description: "Triple Exponential Moving Average" },
+  { name: "zlema", description: "Zero-Lag Exponential Moving Average" },
+  { name: "hma", description: "Hull Moving Average" },
+  { name: "kama", description: "Kaufman Adaptive Moving Average" },
+  // Trend
+  { name: "macd", description: "MACD" },
+  { name: "sar", description: "Parabolic SAR" },
+  { name: "adx", description: "Average Directional Index" },
+  { name: "aroon", description: "Aroon Indicator" },
+  { name: "cci", description: "Commodity Channel Index" },
+  { name: "dpo", description: "Detrended Price Oscillator" },
+  { name: "envelope", description: "Envelope" },
+  { name: "halftrend", description: "HalfTrend" },
+  { name: "alphatrend", description: "AlphaTrend" },
+  // Momentum
+  { name: "rsi", description: "Relative Strength Index" },
+  { name: "stoch-rsi", description: "Stochastic RSI" },
+  { name: "stoch", description: "Stochastic Oscillator" },
+  { name: "roc", description: "Rate of Change" },
+  { name: "mom", description: "Momentum" },
+  { name: "ppo", description: "Price Percentage Oscillator" },
+  { name: "trix", description: "TRIX" },
+  { name: "ao", description: "Awesome Oscillator" },
+  { name: "uo", description: "Ultimate Oscillator" },
+  { name: "wr", description: "Williams %R" },
+  // Volatility
+  { name: "bb", description: "Bollinger Bands" },
+  { name: "boll", description: "Bollinger Bands (alias for bb)" },
+  { name: "bbwidth", description: "Bollinger Band Width" },
+  { name: "bbpct", description: "Bollinger Band %B" },
+  { name: "atr", description: "Average True Range" },
+  { name: "keltner", description: "Keltner Channel" },
+  { name: "donchian", description: "Donchian Channel" },
+  { name: "hv", description: "Historical Volatility" },
+  { name: "stddev", description: "Standard Deviation" },
+  // Volume
+  { name: "obv", description: "On-Balance Volume" },
+  { name: "vwap", description: "Volume Weighted Average Price" },
+  { name: "mvwap", description: "Moving VWAP" },
+  { name: "cmf", description: "Chaikin Money Flow" },
+  { name: "mfi", description: "Money Flow Index" },
+  { name: "ad", description: "Accumulation/Distribution" },
+  // Statistical
+  { name: "lr", description: "Linear Regression" },
+  { name: "slope", description: "Linear Regression Slope" },
+  { name: "angle", description: "Linear Regression Angle" },
+  { name: "variance", description: "Variance" },
+  { name: "meandev", description: "Mean Deviation" },
+  { name: "sigma", description: "Sigma" },
+  { name: "stderr", description: "Standard Error" },
+  // Custom
+  { name: "kdj", description: "KDJ Stochastic Oscillator" },
+  { name: "supertrend", description: "Supertrend" },
+  // Ichimoku
+  { name: "tenkan", description: "Ichimoku Tenkan-sen (Conversion Line)" },
+  { name: "kijun", description: "Ichimoku Kijun-sen (Base Line)" },
+  { name: "senkoa", description: "Ichimoku Senkou Span A (Leading Span A)" },
+  { name: "senkob", description: "Ichimoku Senkou Span B (Leading Span B)" },
+  { name: "chikou", description: "Ichimoku Chikou Span (Lagging Span)" },
+  // Candlestick Patterns
+  { name: "doji", description: "Doji candlestick pattern" },
+  { name: "bull-engulf", description: "Bullish Engulfing pattern" },
+  { name: "bear-engulf", description: "Bearish Engulfing pattern" },
+  { name: "bull-harami", description: "Bullish Harami pattern" },
+  { name: "bear-harami", description: "Bearish Harami pattern" },
+  { name: "bull-harami-cross", description: "Bullish Harami Cross pattern" },
+  { name: "bear-harami-cross", description: "Bearish Harami Cross pattern" },
+  { name: "three-soldiers", description: "Three White Soldiers pattern" },
+  { name: "three-crows", description: "Three Black Crows pattern" },
+  { name: "hanging-man", description: "Hanging Man pattern" },
+  { name: "inverted-hammer", description: "Inverted Hammer pattern" },
+  { name: "shooting-star", description: "Shooting Star pattern" },
+  // Bitcoin On-Chain
+  { name: "ahr999", description: "AHR999 Bitcoin accumulation index" },
+  { name: "rainbow", description: "Bitcoin Rainbow Chart" },
+  // Other
+  { name: "fisher", description: "Fisher Transform" },
+  { name: "nvi-pvi", description: "Negative/Positive Volume Index (returns both)" },
+  { name: "pmax", description: "PMAX" },
+  { name: "qqe", description: "QQE Mod" },
+  { name: "tdi", description: "Traders Dynamic Index" },
+  { name: "waddah", description: "Waddah Attar Explosion" },
+  { name: "range-filter", description: "Range Filter" },
+  { name: "cho", description: "Chande Momentum Oscillator" },
+  { name: "tr", description: "True Range" },
+  { name: "tp", description: "Typical Price" },
+  { name: "mp", description: "Median Price" },
+  { name: "top-long-short", description: "Top Trader Long/Short Ratio (timeframe-independent)" }
+];
 function resolveIndicatorCode(name) {
   const lower = name.toLowerCase();
   return INDICATOR_CODE_OVERRIDES[lower] ?? name.toUpperCase().replace(/-/g, "_");
@@ -1800,7 +1665,7 @@ function registerIndicatorTools() {
           },
           indicator: {
             type: "string",
-            description: "Indicator name (case-insensitive). Examples: ma, ema, rsi, macd, bb, kdj, supertrend, ahr999, rainbow, pi-cycle-top, pi-cycle-bottom, mayer, envelope, halftrend, alphatrend, pmax, waddah, tdi, qqe, range-filter"
+            description: "Indicator name (case-insensitive). Call market_list_indicators to see all supported names."
           },
           bar: {
             type: "string",
@@ -1857,6 +1722,14 @@ function registerIndicatorTools() {
         );
         return normalizeResponse(response);
       }
+    },
+    {
+      name: "market_list_indicators",
+      module: "market",
+      description: "List all supported technical indicator names and descriptions. Call this before market_get_indicator to discover valid indicator names. No credentials required.",
+      isWrite: false,
+      inputSchema: { type: "object", properties: {} },
+      handler: async () => ({ data: KNOWN_INDICATORS })
     }
   ];
 }
@@ -2454,6 +2327,118 @@ function registerAccountTools() {
     }
   ];
 }
+function extractInstrumentParams(instId, data) {
+  const instruments = Array.isArray(data) ? data : [];
+  if (instruments.length === 0) {
+    throw new Error(`Failed to fetch instrument info for ${instId}: empty instrument list. Cannot determine ctVal for conversion.`);
+  }
+  const inst = instruments[0];
+  const ctValStr = String(inst.ctVal ?? "");
+  const ctVal = parseFloat(ctValStr);
+  if (!isFinite(ctVal) || ctVal <= 0) {
+    throw new Error(`Invalid ctVal "${ctValStr}" for ${instId}. ctVal must be a positive number for conversion.`);
+  }
+  const minSzStr = String(inst.minSz ?? "1");
+  const minSz = parseFloat(minSzStr);
+  if (!isFinite(minSz) || minSz <= 0) {
+    throw new Error(`Invalid minSz "${minSzStr}" for ${instId}. minSz must be a positive number for conversion.`);
+  }
+  const lotSzStr = String(inst.lotSz ?? "1");
+  const lotSz = parseFloat(lotSzStr);
+  if (!isFinite(lotSz) || lotSz <= 0) {
+    throw new Error(`Invalid lotSz "${lotSzStr}" for ${instId}. lotSz must be a positive number for conversion.`);
+  }
+  return { ctVal, ctValStr, minSz, minSzStr, lotSz, lotSzStr };
+}
+function extractLastPx(instId, data) {
+  const tickers = Array.isArray(data) ? data : [];
+  if (tickers.length === 0) {
+    throw new Error(`Failed to fetch ticker price for ${instId}: empty ticker response. Cannot determine last price for conversion.`);
+  }
+  const lastStr = String(tickers[0].last ?? "");
+  const lastPx = parseFloat(lastStr);
+  if (!isFinite(lastPx) || lastPx <= 0) {
+    throw new Error(`Invalid last price "${lastStr}" for ${instId}. Last price must be a positive number for conversion.`);
+  }
+  return { lastPx, lastStr };
+}
+function extractLeverage(instId, mgnMode, data) {
+  const leverageData = Array.isArray(data) ? data : [];
+  if (leverageData.length === 0) {
+    throw new Error(
+      `Failed to fetch leverage info for ${instId} (mgnMode=${mgnMode}): empty response. Cannot determine leverage for margin conversion. Please set leverage first using set_leverage.`
+    );
+  }
+  const leverStr = String(leverageData[0].lever ?? "1");
+  const lever = parseFloat(leverStr);
+  if (!isFinite(lever) || lever <= 0) {
+    throw new Error(`Invalid leverage "${leverStr}" for ${instId}. Leverage must be a positive number for margin conversion.`);
+  }
+  return { lever, leverStr };
+}
+function computeContracts(p) {
+  const { instId, sz, isMarginMode, inst, lastPx, lastStr, lever, leverStr } = p;
+  const { ctVal, ctValStr, minSz, minSzStr, lotSz, lotSzStr } = inst;
+  const userAmount = parseFloat(sz);
+  const contractValue = ctVal * lastPx;
+  const effectiveNotional = isMarginMode ? userAmount * lever : userAmount;
+  const lotSzDecimals = lotSzStr.includes(".") ? lotSzStr.split(".")[1].length : 0;
+  const precision = 10 ** (lotSzDecimals + 4);
+  const rawContracts = Math.round(effectiveNotional / contractValue * precision) / precision;
+  const rawLots = Math.round(rawContracts / lotSz * precision) / precision;
+  const contractsRounded = parseFloat((Math.floor(rawLots) * lotSz).toFixed(lotSzDecimals));
+  if (contractsRounded < minSz) {
+    const minAmount = isMarginMode ? (minSz * contractValue / lever).toFixed(2) : (minSz * contractValue).toFixed(2);
+    const unit = isMarginMode ? "USDT margin" : "USDT";
+    throw new Error(
+      `sz=${sz} ${unit} is too small for ${instId}. Minimum order size is ${minSzStr} contracts (\u2248 ${minAmount} ${unit}). (ctVal=${ctValStr}, lastPx=${lastStr}, minSz=${minSzStr}, lotSz=${lotSzStr}` + (isMarginMode ? `, lever=${leverStr}` : "") + `).
+`
+    );
+  }
+  const contractsStr = contractsRounded.toFixed(lotSzDecimals);
+  const conversionNote = isMarginMode ? `Converting ${sz} USDT margin (${leverStr}x leverage) \u2192 ${contractsStr} contracts (notional value \u2248 ${(contractsRounded * contractValue).toFixed(2)} USDT, ctVal=${ctValStr}, lastPx=${lastStr}, lever=${leverStr}, minSz=${minSzStr}, lotSz=${lotSzStr})` : `Converting ${sz} USDT \u2192 ${contractsStr} contracts (ctVal=${ctValStr}, lastPx=${lastStr}, minSz=${minSzStr}, lotSz=${lotSzStr})`;
+  return { contractsStr, conversionNote };
+}
+async function resolveQuoteCcySz(instId, sz, tgtCcy, instType, client, tdMode) {
+  if (tgtCcy === void 0 || tgtCcy === "base_ccy") {
+    return { sz, tgtCcy, conversionNote: void 0 };
+  }
+  if (tgtCcy !== "quote_ccy" && tgtCcy !== "margin") {
+    throw new ValidationError(
+      `Unknown tgtCcy value "${tgtCcy}". Valid values: base_ccy, quote_ccy, margin.`,
+      `Check the --tgtCcy flag. Use base_ccy (default, sz in contracts), quote_ccy (sz in USDT notional), or margin (sz in USDT margin cost).`
+    );
+  }
+  const isMarginMode = tgtCcy === "margin";
+  if (isMarginMode && !tdMode) {
+    throw new Error(
+      "tdMode (cross or isolated) is required when tgtCcy=margin. Cannot determine leverage without knowing the margin mode."
+    );
+  }
+  const mgnMode = tdMode === "cross" ? "cross" : "isolated";
+  const fetchPromises = [
+    client.publicGet("/api/v5/public/instruments", { instType, instId }),
+    client.publicGet("/api/v5/market/ticker", { instId })
+  ];
+  if (isMarginMode) {
+    fetchPromises.push(client.privateGet("/api/v5/account/leverage-info", { instId, mgnMode }));
+  }
+  const results = await Promise.all(fetchPromises);
+  const inst = extractInstrumentParams(instId, results[0].data);
+  const { lastPx, lastStr } = extractLastPx(instId, results[1].data);
+  const { lever, leverStr } = isMarginMode ? extractLeverage(instId, mgnMode, results[2].data) : { lever: 1, leverStr: "1" };
+  const { contractsStr, conversionNote } = computeContracts({
+    instId,
+    sz,
+    isMarginMode,
+    inst,
+    lastPx,
+    lastStr,
+    lever,
+    leverStr
+  });
+  return { sz: contractsStr, tgtCcy: void 0, conversionNote };
+}
 function registerAlgoTradeTools() {
   return [
     {
@@ -2532,8 +2517,8 @@ function registerAlgoTradeTools() {
           },
           tgtCcy: {
             type: "string",
-            enum: ["base_ccy", "quote_ccy"],
-            description: "Size unit. base_ccy(default): sz in contracts, quote_ccy: sz in USDT"
+            enum: ["base_ccy", "quote_ccy", "margin"],
+            description: "Size unit. base_ccy(default): sz in contracts; quote_ccy: sz in USDT notional value; margin: sz in USDT margin cost (actual position = sz * leverage)"
           },
           reduceOnly: {
             type: "boolean",
@@ -2549,6 +2534,14 @@ function registerAlgoTradeTools() {
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const reduceOnly = args.reduceOnly;
+        const resolved = await resolveQuoteCcySz(
+          requireString(args, "instId"),
+          requireString(args, "sz"),
+          readString(args, "tgtCcy"),
+          "SWAP",
+          context.client,
+          readString(args, "tdMode")
+        );
         const response = await context.client.privatePost(
           "/api/v5/trade/order-algo",
           compactObject({
@@ -2557,8 +2550,8 @@ function registerAlgoTradeTools() {
             side: requireString(args, "side"),
             posSide: readString(args, "posSide"),
             ordType: requireString(args, "ordType"),
-            sz: requireString(args, "sz"),
-            tgtCcy: readString(args, "tgtCcy"),
+            sz: resolved.sz,
+            tgtCcy: resolved.tgtCcy,
             tpTriggerPx: readString(args, "tpTriggerPx"),
             tpOrdPx: readString(args, "tpOrdPx"),
             tpTriggerPxType: readString(args, "tpTriggerPxType"),
@@ -2574,7 +2567,11 @@ function registerAlgoTradeTools() {
           }),
           privateRateLimit("swap_place_algo_order", 20)
         );
-        return normalizeResponse(response);
+        const result = normalizeResponse(response);
+        if (resolved.conversionNote) {
+          result._conversion = resolved.conversionNote;
+        }
+        return result;
       }
     },
     {
@@ -2865,8 +2862,8 @@ function registerFuturesAlgoTools() {
           },
           tgtCcy: {
             type: "string",
-            enum: ["base_ccy", "quote_ccy"],
-            description: "Size unit. base_ccy(default): sz in contracts, quote_ccy: sz in USDT"
+            enum: ["base_ccy", "quote_ccy", "margin"],
+            description: "Size unit. base_ccy(default): sz in contracts; quote_ccy: sz in USDT notional value; margin: sz in USDT margin cost (actual position = sz * leverage)"
           },
           reduceOnly: {
             type: "boolean",
@@ -2882,6 +2879,14 @@ function registerFuturesAlgoTools() {
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const reduceOnly = args.reduceOnly;
+        const resolved = await resolveQuoteCcySz(
+          requireString(args, "instId"),
+          requireString(args, "sz"),
+          readString(args, "tgtCcy"),
+          "FUTURES",
+          context.client,
+          readString(args, "tdMode")
+        );
         const response = await context.client.privatePost(
           "/api/v5/trade/order-algo",
           compactObject({
@@ -2890,8 +2895,8 @@ function registerFuturesAlgoTools() {
             side: requireString(args, "side"),
             posSide: readString(args, "posSide"),
             ordType: requireString(args, "ordType"),
-            sz: requireString(args, "sz"),
-            tgtCcy: readString(args, "tgtCcy"),
+            sz: resolved.sz,
+            tgtCcy: resolved.tgtCcy,
             tpTriggerPx: readString(args, "tpTriggerPx"),
             tpOrdPx: readString(args, "tpOrdPx"),
             tpTriggerPxType: readString(args, "tpTriggerPxType"),
@@ -2907,7 +2912,11 @@ function registerFuturesAlgoTools() {
           }),
           privateRateLimit("futures_place_algo_order", 20)
         );
-        return normalizeResponse(response);
+        const result = normalizeResponse(response);
+        if (resolved.conversionNote) {
+          result._conversion = resolved.conversionNote;
+        }
+        return result;
       }
     },
     {
@@ -3238,19 +3247,19 @@ function safeWriteFile(targetDir, fileName, data) {
     throw new Error(`Invalid file name: "${fileName}"`);
   }
   const resolvedDir = resolve(targetDir);
-  const filePath = join3(resolvedDir, safeName);
+  const filePath = join(resolvedDir, safeName);
   const resolvedPath = resolve(filePath);
   if (!resolvedPath.startsWith(resolvedDir + sep)) {
     throw new Error(`Path traversal detected: "${fileName}" resolves outside target directory`);
   }
-  mkdirSync2(resolvedDir, { recursive: true });
+  mkdirSync(resolvedDir, { recursive: true });
   const tmpPath = `${resolvedPath}.${randomUUID()}.tmp`;
   try {
-    writeFileSync2(tmpPath, data);
-    renameSync2(tmpPath, resolvedPath);
+    writeFileSync(tmpPath, data);
+    renameSync(tmpPath, resolvedPath);
   } catch (err) {
     try {
-      unlinkSync2(tmpPath);
+      unlinkSync(tmpPath);
     } catch {
     }
     throw err;
@@ -3266,13 +3275,14 @@ function validateZipEntryPath(targetDir, entryName) {
   return resolvedEntry;
 }
 var MAX_DOWNLOAD_BYTES = 50 * 1024 * 1024;
-async function downloadSkillZip(client, name, targetDir) {
+async function downloadSkillZip(client, name, targetDir, format = "zip") {
   const result = await client.privatePostBinary(
     "/api/v5/skill/download",
     { name },
     { maxBytes: MAX_DOWNLOAD_BYTES }
   );
-  const fileName = `${name}.zip`;
+  const ext = format === "skill" ? "skill" : "zip";
+  const fileName = `${name}.${ext}`;
   const filePath = safeWriteFile(targetDir, fileName, result.data);
   return filePath;
 }
@@ -3315,7 +3325,7 @@ async function extractSkillZip(zipPath, targetDir, limits) {
   const maxFiles = limits?.maxFiles ?? DEFAULT_MAX_FILES;
   const maxCompressionRatio = limits?.maxCompressionRatio ?? DEFAULT_MAX_COMPRESSION_RATIO;
   const resolvedTarget = resolve2(targetDir);
-  mkdirSync3(resolvedTarget, { recursive: true });
+  mkdirSync2(resolvedTarget, { recursive: true });
   return new Promise((resolvePromise, reject) => {
     yauzl.open(zipPath, { lazyEntries: true }, (err, zipfile) => {
       if (err) return reject(err);
@@ -3338,7 +3348,7 @@ async function extractSkillZip(zipPath, targetDir, limits) {
             zipfile.close();
             return reject(streamErr);
           }
-          mkdirSync3(dirname2(resolvedPath), { recursive: true });
+          mkdirSync2(dirname(resolvedPath), { recursive: true });
           const writeStream = createWriteStream(resolvedPath);
           readStream.pipe(writeStream);
           writeStream.on("close", () => zipfile.readEntry());
@@ -3354,11 +3364,11 @@ async function extractSkillZip(zipPath, targetDir, limits) {
   });
 }
 function readMetaJson(contentDir) {
-  const metaPath = join4(contentDir, "_meta.json");
+  const metaPath = join2(contentDir, "_meta.json");
   if (!existsSync(metaPath)) {
     throw new Error(`_meta.json not found in ${contentDir}. Invalid skill package.`);
   }
-  const raw = readFileSync2(metaPath, "utf-8");
+  const raw = readFileSync(metaPath, "utf-8");
   let parsed;
   try {
     parsed = JSON.parse(raw);
@@ -3380,26 +3390,26 @@ function readMetaJson(contentDir) {
   };
 }
 function validateSkillMdExists(contentDir) {
-  const skillMdPath = join4(contentDir, "SKILL.md");
+  const skillMdPath = join2(contentDir, "SKILL.md");
   if (!existsSync(skillMdPath)) {
     throw new Error(`SKILL.md not found in ${contentDir}. Invalid skill package.`);
   }
 }
-var DEFAULT_REGISTRY_PATH = join5(homedir3(), ".okx", "skills", "registry.json");
+var DEFAULT_REGISTRY_PATH = join3(homedir(), ".okx", "skills", "registry.json");
 function readRegistry(registryPath = DEFAULT_REGISTRY_PATH) {
   if (!existsSync2(registryPath)) {
     return { version: 1, skills: {} };
   }
   try {
-    const raw = readFileSync3(registryPath, "utf-8");
+    const raw = readFileSync2(registryPath, "utf-8");
     return JSON.parse(raw);
   } catch {
     return { version: 1, skills: {} };
   }
 }
 function writeRegistry(registry, registryPath = DEFAULT_REGISTRY_PATH) {
-  mkdirSync4(dirname3(registryPath), { recursive: true });
-  writeFileSync3(registryPath, JSON.stringify(registry, null, 2) + "\n", "utf-8");
+  mkdirSync3(dirname2(registryPath), { recursive: true });
+  writeFileSync2(registryPath, JSON.stringify(registry, null, 2) + "\n", "utf-8");
 }
 function upsertSkillRecord(meta, registryPath = DEFAULT_REGISTRY_PATH) {
   const registry = readRegistry(registryPath);
@@ -3472,7 +3482,7 @@ function registerSkillsTools() {
     {
       name: "skills_download",
       module: "skills",
-      description: "Download a skill zip file from OKX Skills Marketplace to a local directory. Always call skills_search first to confirm the skill name exists. Downloads the latest approved version. NOTE: This only downloads the zip \u2014 it does NOT install to agents. For full installation use CLI: okx skill add <name>. Use when the user wants to inspect or manually install a skill package.",
+      description: "Download a skill package from OKX Skills Marketplace to a local directory. Always call skills_search first to confirm the skill name exists. Downloads the latest approved version. NOTE: Downloads third-party developer content \u2014 does NOT install to agents. For full installation use CLI: okx skill add <name>. Use when the user wants to inspect or manually install a skill package.",
       inputSchema: {
         type: "object",
         properties: {
@@ -3482,7 +3492,12 @@ function registerSkillsTools() {
           },
           targetDir: {
             type: "string",
-            description: "Directory path where the zip file will be saved"
+            description: "Directory path where the file will be saved"
+          },
+          format: {
+            type: "string",
+            description: "Output file format: 'zip' or 'skill' (default: 'skill')",
+            enum: ["zip", "skill"]
           }
         },
         required: ["name", "targetDir"],
@@ -3515,7 +3530,8 @@ async function handleSearch(args, ctx) {
 async function handleDownload(args, ctx) {
   const name = String(args.name);
   const targetDir = String(args.targetDir);
-  const filePath = await downloadSkillZip(ctx.client, name, targetDir);
+  const format = args.format === "zip" ? "zip" : "skill";
+  const filePath = await downloadSkillZip(ctx.client, name, targetDir, format);
   return {
     endpoint: "POST /api/v5/skill/download",
     requestTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -4078,7 +4094,7 @@ function registerEarnTools() {
     {
       name: "earn_get_savings_balance",
       module: "earn.savings",
-      description: "Get Simple Earn (savings/flexible earn) balance. Returns current holdings, lent amount, pending interest, and the user's set rate. Response fields: amt (total held), loanAmt (actively lent), pendingAmt (awaiting match), earnings (cumulative interest), rate (user's own minimum lending rate setting \u2014 NOT market yield, NOT APY). To get the actual market lending rate, call earn_get_lending_rate_history instead.",
+      description: "Get Simple Earn (savings/flexible earn) balance. Returns current holdings for all currencies or a specific one. To show market rates alongside balance (\u5E02\u573A\u5747\u5229\u7387), call earn_get_lending_rate_history. earn_get_lending_rate_history also returns fixed-term (\u5B9A\u671F) product offers, so one call gives a complete view of both flexible and fixed options. Do NOT use for fixed-term (\u5B9A\u671F) order queries \u2014 use earn_get_fixed_order_list instead.",
       isWrite: false,
       inputSchema: {
         type: "object",
@@ -4099,6 +4115,43 @@ function registerEarnTools() {
         return normalizeResponse(response);
       }
     },
+    {
+      name: "earn_get_fixed_order_list",
+      module: "earn.savings",
+      description: "Get Simple Earn Fixed (\u5B9A\u671F\u8D5A\u5E01) lending order list. Returns orders sorted by creation time descending. Use this to check status of fixed-term lending orders (pending/earning/expired/settled/cancelled). Do NOT use for flexible earn balance \u2014 use earn_get_savings_balance instead. If the result is empty, do NOT display any fixed-term section in the output.",
+      isWrite: false,
+      inputSchema: {
+        type: "object",
+        properties: {
+          ccy: {
+            type: "string",
+            description: "Currency, e.g. USDT. Omit for all."
+          },
+          state: {
+            type: "string",
+            description: "Order state: pending (\u5339\u914D\u4E2D), earning (\u8D5A\u5E01\u4E2D), expired (\u903E\u671F), settled (\u5DF2\u7ED3\u7B97), cancelled (\u5DF2\u64A4\u9500). Omit for all."
+          }
+        }
+      },
+      handler: async (rawArgs, context) => {
+        const args = asRecord(rawArgs);
+        const response = await context.client.privateGet(
+          "/api/v5/finance/simple-earn-fixed/order-list",
+          compactObject({
+            ccy: readString(args, "ccy"),
+            state: readString(args, "state")
+          }),
+          privateRateLimit("earn_get_fixed_order_list", 3)
+        );
+        const result = normalizeResponse(response);
+        if (Array.isArray(result["data"])) {
+          result["data"] = result["data"].map(
+            ({ finalSettlementDate: _, ...rest }) => rest
+          );
+        }
+        return result;
+      }
+    },
     {
       name: "earn_savings_purchase",
       module: "earn.savings",
@@ -4243,10 +4296,112 @@ function registerEarnTools() {
         return normalizeResponse(response);
       }
     },
+    {
+      name: "earn_fixed_purchase",
+      module: "earn.savings",
+      description: "Purchase Simple Earn Fixed (\u5B9A\u671F) product, two-step flow. First call (confirm omitted or false): returns purchase preview with product details and risk warning. Preview offer fields: lendQuota = remaining quota (\u5269\u4F59\u989D\u5EA6), soldOut = whether product is sold out (lendQuota is 0). YOU MUST display the 'warning' field from the preview response to the user VERBATIM before asking for confirmation \u2014 do NOT omit or summarize it. Second call (confirm=true): executes the purchase. Only proceed after the user explicitly confirms. IMPORTANT: Orders in 'pending' (\u5339\u914D\u4E2D) state can still be cancelled via earn_fixed_redeem; once the status changes to 'earning' (\u8D5A\u5E01\u4E2D), funds are LOCKED until maturity \u2014 no early redemption allowed.",
+      isWrite: true,
+      inputSchema: {
+        type: "object",
+        properties: {
+          ccy: {
+            type: "string",
+            description: "Currency, e.g. USDT"
+          },
+          amt: {
+            type: "string",
+            description: "Purchase amount"
+          },
+          term: {
+            type: "string",
+            description: "Term, e.g. 90D"
+          },
+          confirm: {
+            type: "boolean",
+            description: "Omit or false on the first call to preview the purchase details; set to true on the second call to execute after user confirms."
+          }
+        },
+        required: ["ccy", "amt", "term"]
+      },
+      handler: async (rawArgs, context) => {
+        const args = asRecord(rawArgs);
+        const ccy = requireString(args, "ccy");
+        const amt = requireString(args, "amt");
+        const term = requireString(args, "term");
+        const confirm = readBoolean(args, "confirm") ?? false;
+        if (!confirm) {
+          const [rateResponse, fixedResponse] = await Promise.all([
+            context.client.publicGet(
+              "/api/v5/finance/savings/lending-rate-history",
+              compactObject({ ccy, limit: 1 }),
+              publicRateLimit("earn_get_lending_rate_history", 6)
+            ),
+            context.client.privateGet(
+              "/api/v5/finance/simple-earn-fixed/offers",
+              compactObject({ ccy }),
+              privateRateLimit("earn_fixed_purchase_preview_offers", 2)
+            ).catch(() => null)
+          ]);
+          const rateResult = normalizeResponse(rateResponse);
+          const fixedResult = fixedResponse ? normalizeResponse(fixedResponse) : { data: [] };
+          const rateArr = Array.isArray(rateResult["data"]) ? rateResult["data"] : [];
+          const allOffers = Array.isArray(fixedResult["data"]) ? fixedResult["data"] : [];
+          const matchedOffer = allOffers.find(
+            (o) => o["term"] === term && o["ccy"] === ccy
+          );
+          const { borrowingOrderQuota: _, ...offerWithoutTotal } = matchedOffer ?? {};
+          const offerWithSoldOut = matchedOffer ? { ...offerWithoutTotal, soldOut: offerWithoutTotal["lendQuota"] === "0" } : null;
+          return {
+            preview: true,
+            ccy,
+            amt,
+            term,
+            offer: offerWithSoldOut,
+            currentFlexibleRate: rateArr[0]?.["lendingRate"] ?? null,
+            warning: "\u26A0\uFE0F Orders still in 'pending' state can be cancelled before matching completes. Once the status changes to 'earning', funds are LOCKED until maturity \u2014 early redemption is NOT allowed. Please call again with confirm=true to proceed."
+          };
+        }
+        assertNotDemo(context.config, "earn_fixed_purchase");
+        const response = await context.client.privatePost(
+          "/api/v5/finance/simple-earn-fixed/purchase",
+          { ccy, amt, term },
+          privateRateLimit("earn_fixed_purchase", 2)
+        );
+        return normalizeResponse(response);
+      }
+    },
+    {
+      name: "earn_fixed_redeem",
+      module: "earn.savings",
+      description: "Redeem Simple Earn Fixed (\u5B9A\u671F\u8D5A\u5E01) order. [CAUTION] Redeems a fixed-term lending order. Always redeems the full order amount. Only orders in 'pending' (\u5339\u914D\u4E2D) state can be redeemed \u2014 orders in 'earning' state are locked until maturity and cannot be redeemed early. Do NOT use for flexible earn redemption \u2014 use earn_savings_redeem instead.",
+      isWrite: true,
+      inputSchema: {
+        type: "object",
+        properties: {
+          reqId: {
+            type: "string",
+            description: "Request ID of the fixed-term order to redeem"
+          }
+        },
+        required: ["reqId"]
+      },
+      handler: async (rawArgs, context) => {
+        assertNotDemo(context.config, "earn_fixed_redeem");
+        const args = asRecord(rawArgs);
+        const response = await context.client.privatePost(
+          "/api/v5/finance/simple-earn-fixed/redeem",
+          {
+            reqId: requireString(args, "reqId")
+          },
+          privateRateLimit("earn_fixed_redeem", 2)
+        );
+        return normalizeResponse(response);
+      }
+    },
     {
       name: "earn_get_lending_rate_history",
       module: "earn.savings",
-      description: "Query Simple Earn lending rates. Public endpoint (no API key required). Use this tool when the user asks about current or historical lending rates for Simple Earn, or when displaying savings balance with market rate context. Response fields per record: rate (market lending rate \u2014 the rate borrowers pay this period; user's minimum setting must be \u2264 this to be eligible), lendingRate (actual yield received by lenders; stablecoins e.g. USDT/USDC only: subject to pro-rata dilution \u2014 when eligible supply exceeds borrowing demand total interest is shared so lendingRate < rate; non-stablecoins: lendingRate = rate, no dilution; always use lendingRate as the true APY to show users), ts (settlement timestamp ms). To get current APY: use limit=1 and read lendingRate.",
+      description: "Query Simple Earn lending rates and fixed-term offers. Use this tool when the user asks about Simple Earn products, current or historical lending rates, or when displaying savings balance with market rate context (\u5E02\u573A\u5747\u5229\u7387). Returns lending rate history (lendingRate field, newest-first) AND available fixed-term (\u5B9A\u671F) offers with APR, term, min amount, and quota \u2014 one call gives a complete view of both flexible and fixed options. In fixedOffers: lendQuota = remaining quota (\u5269\u4F59\u989D\u5EA6), soldOut = whether product is sold out (lendQuota is 0). To get current flexible APY: use limit=1 and read lendingRate.",
       isWrite: false,
       inputSchema: {
         type: "object",
@@ -4265,23 +4420,45 @@ function registerEarnTools() {
           },
           limit: {
             type: "number",
-            description: "Max results (default 100)"
+            description: "Max results (default 7)"
           }
         }
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
-        const response = await context.client.publicGet(
-          "/api/v5/finance/savings/lending-rate-history",
-          compactObject({
-            ccy: readString(args, "ccy"),
-            after: readString(args, "after"),
-            before: readString(args, "before"),
-            limit: readNumber(args, "limit")
-          }),
-          publicRateLimit("earn_get_lending_rate_history", 6)
-        );
-        return normalizeResponse(response);
+        const ccy = readString(args, "ccy");
+        const [rateResponse, fixedResponse] = await Promise.all([
+          context.client.publicGet(
+            "/api/v5/finance/savings/lending-rate-history",
+            compactObject({
+              ccy,
+              after: readString(args, "after"),
+              before: readString(args, "before"),
+              limit: readNumber(args, "limit") ?? 7
+            }),
+            publicRateLimit("earn_get_lending_rate_history", 6)
+          ),
+          context.client.privateGet(
+            "/api/v5/finance/simple-earn-fixed/offers",
+            compactObject({ ccy }),
+            privateRateLimit("earn_get_lending_rate_history_fixed", 2)
+          ).catch(() => null)
+        ]);
+        const rateResult = normalizeResponse(rateResponse);
+        const rateData = Array.isArray(rateResult["data"]) ? rateResult["data"].map(
+          ({ rate: _, ...rest }) => rest
+        ) : [];
+        const fixedResult = fixedResponse ? normalizeResponse(fixedResponse) : { data: [] };
+        const allOffers = fixedResult["data"] ?? [];
+        const fixedOffers = allOffers.map(({ borrowingOrderQuota: _, ...rest }) => ({
+          ...rest,
+          soldOut: rest["lendQuota"] === "0"
+        }));
+        return {
+          ...rateResult,
+          data: rateData,
+          fixedOffers
+        };
       }
     }
   ];
@@ -4620,7 +4797,7 @@ function registerDcdTools() {
     {
       name: "dcd_get_products",
       module: "earn.dcd",
-      description: "Get DCD products with yield and quota info.",
+      description: "Get DCD products with yield and quota info. Yields in response are decimal fractions, not percentages.",
       isWrite: false,
       inputSchema: {
         type: "object",
@@ -4674,7 +4851,7 @@ function registerDcdTools() {
     {
       name: "dcd_get_orders",
       module: "earn.dcd",
-      description: "Get DCD order history.",
+      description: "Get DCD order history. Yields in response are decimal fractions, not percentages.",
       isWrite: false,
       inputSchema: {
         type: "object",
@@ -4718,7 +4895,7 @@ function registerDcdTools() {
     {
       name: "dcd_subscribe",
       module: "earn.dcd",
-      description: "Subscribe to a DCD product: get quote and execute atomically. Confirm product, amount, and currency with user before calling. Optional minAnnualizedYield (percent) rejects the order if quote yield falls below threshold. Returns order result with quote snapshot (annualizedYield, absYield).",
+      description: "Subscribe to a DCD product: get quote and execute atomically. Confirm product, amount, and currency with user before calling. Optional minAnnualizedYield rejects the order if quote yield falls below threshold. Returns order result with quote snapshot (minAnnualizedYield is in percent; response yields are decimal fractions).",
       isWrite: true,
       inputSchema: {
         type: "object",
@@ -4757,13 +4934,23 @@ function registerDcdTools() {
             });
           }
           if (minAnnualizedYield !== void 0) {
-            const actualYield = parseFloat(quote["annualizedYield"]);
-            if (!isNaN(actualYield) && actualYield < minAnnualizedYield) {
+            const rawYield = parseFloat(quote["annualizedYield"]);
+            if (isNaN(rawYield)) {
+              throw new OkxApiError(
+                "Quote returned non-numeric annualizedYield, cannot verify minimum yield threshold.",
+                {
+                  code: "INVALID_YIELD_VALUE",
+                  suggestion: "Order not placed. The quote did not include a valid annualizedYield. Retry or pick a different product."
+                }
+              );
+            }
+            const actualYieldPct = rawYield * 100;
+            if (actualYieldPct < minAnnualizedYield) {
               throw new OkxApiError(
-                `Quote yield ${actualYield}% is below the minimum threshold of ${minAnnualizedYield}%.`,
+                `Quote yield ${actualYieldPct.toFixed(2)}% is below the minimum threshold of ${minAnnualizedYield}%.`,
                 {
                   code: "YIELD_BELOW_MIN",
-                  suggestion: `Order not placed. Actual: ${actualYield}%, required: >= ${minAnnualizedYield}%. Try a different product or lower your minimum yield.`
+                  suggestion: `Order not placed. Actual: ${actualYieldPct.toFixed(2)}%, required: >= ${minAnnualizedYield}%. Try a different product or lower your minimum yield.`
                 }
               );
             }
@@ -4908,7 +5095,7 @@ function registerAutoEarnTools() {
 }
 var EARN_DEMO_MESSAGE = "Earn features (savings, DCD, on-chain staking, auto-earn) are not available in simulated trading mode.";
 var EARN_DEMO_SUGGESTION = "Switch to a live account to use Earn features.";
-var DEMO_GUARD_SKIP = /* @__PURE__ */ new Set(["dcd_redeem"]);
+var DEMO_GUARD_SKIP = /* @__PURE__ */ new Set(["dcd_redeem", "earn_fixed_purchase"]);
 function withDemoGuard(tool) {
   if (!tool.isWrite || DEMO_GUARD_SKIP.has(tool.name)) return tool;
   const originalHandler = tool.handler;
@@ -4969,12 +5156,12 @@ function buildContractTradeTools(cfg) {
           },
           sz: {
             type: "string",
-            description: "Number of contracts. Each contract = ctVal units (e.g. 0.1 ETH for ETH-USDT-SWAP). Query market_get_instruments for exact ctVal. Set tgtCcy=quote_ccy to specify sz in USDT instead."
+            description: "Number of contracts. Each contract = ctVal units (e.g. 0.1 ETH for ETH-USDT-SWAP). Query market_get_instruments for exact ctVal. Set tgtCcy=quote_ccy to specify sz in USDT notional value; set tgtCcy=margin to specify sz as margin cost (notional = sz * leverage)."
           },
           tgtCcy: {
             type: "string",
-            enum: ["base_ccy", "quote_ccy"],
-            description: "Size unit. base_ccy(default): sz in contracts, quote_ccy: sz in USDT"
+            enum: ["base_ccy", "quote_ccy", "margin"],
+            description: "Size unit. base_ccy(default): sz in contracts; quote_ccy: sz in USDT notional value; margin: sz in USDT margin cost (actual position = sz * leverage)"
           },
           px: { type: "string", description: "Required for limit/post_only/fok/ioc" },
           reduceOnly: {
@@ -4993,6 +5180,14 @@ function buildContractTradeTools(cfg) {
         const args = asRecord(rawArgs);
         const reduceOnly = args.reduceOnly;
         const attachAlgoOrds = buildAttachAlgoOrds(args);
+        const resolved = await resolveQuoteCcySz(
+          requireString(args, "instId"),
+          requireString(args, "sz"),
+          readString(args, "tgtCcy"),
+          defaultType,
+          context.client,
+          readString(args, "tdMode")
+        );
         const response = await context.client.privatePost(
           "/api/v5/trade/order",
           compactObject({
@@ -5001,8 +5196,8 @@ function buildContractTradeTools(cfg) {
             side: requireString(args, "side"),
             posSide: readString(args, "posSide"),
             ordType: requireString(args, "ordType"),
-            sz: requireString(args, "sz"),
-            tgtCcy: readString(args, "tgtCcy"),
+            sz: resolved.sz,
+            tgtCcy: resolved.tgtCcy,
             px: readString(args, "px"),
             reduceOnly: typeof reduceOnly === "boolean" ? String(reduceOnly) : void 0,
             clOrdId: readString(args, "clOrdId"),
@@ -5011,7 +5206,11 @@ function buildContractTradeTools(cfg) {
           }),
           privateRateLimit(n("place_order"), 60)
         );
-        return normalizeResponse(response);
+        const result = normalizeResponse(response);
+        if (resolved.conversionNote) {
+          result._conversion = resolved.conversionNote;
+        }
+        return result;
       }
     },
     // ── cancel_order ─────────────────────────────────────────────────────────
@@ -5479,6 +5678,12 @@ function registerFuturesTools() {
   ];
 }
 var TWO_DAYS_MS = 2 * 24 * 60 * 60 * 1e3;
+var DEMO_PROPERTY = {
+  demo: {
+    type: "boolean",
+    description: "Query simulated trading (demo) market data. Default: false (live market data)."
+  }
+};
 function registerMarketTools() {
   return [
     {
@@ -5492,7 +5697,8 @@ function registerMarketTools() {
           instId: {
             type: "string",
             description: "e.g. BTC-USDT, BTC-USDT-SWAP"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
@@ -5501,7 +5707,8 @@ function registerMarketTools() {
         const response = await context.client.publicGet(
           "/api/v5/market/ticker",
           { instId: requireString(args, "instId") },
-          publicRateLimit("market_get_ticker", 20)
+          publicRateLimit("market_get_ticker", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5525,7 +5732,8 @@ function registerMarketTools() {
           instFamily: {
             type: "string",
             description: "e.g. BTC-USD"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instType"]
       },
@@ -5538,7 +5746,8 @@ function registerMarketTools() {
             uly: readString(args, "uly"),
             instFamily: readString(args, "instFamily")
           }),
-          publicRateLimit("market_get_tickers", 20)
+          publicRateLimit("market_get_tickers", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5558,7 +5767,8 @@ function registerMarketTools() {
           sz: {
             type: "number",
             description: "Depth per side, default 1, max 400"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
@@ -5570,7 +5780,8 @@ function registerMarketTools() {
             instId: requireString(args, "instId"),
             sz: readNumber(args, "sz")
           }),
-          publicRateLimit("market_get_orderbook", 20)
+          publicRateLimit("market_get_orderbook", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5603,7 +5814,8 @@ function registerMarketTools() {
           limit: {
             type: "number",
             description: "Max results (default 100)"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
@@ -5611,6 +5823,7 @@ function registerMarketTools() {
         const args = asRecord(rawArgs);
         const afterTs = readString(args, "after");
         const beforeTs = readString(args, "before");
+        const demo = readBoolean(args, "demo") ?? false;
         const query = compactObject({
           instId: requireString(args, "instId"),
           bar: readString(args, "bar"),
@@ -5622,9 +5835,9 @@ function registerMarketTools() {
         const hasTimestamp = afterTs !== void 0 || beforeTs !== void 0;
         const useHistory = afterTs !== void 0 && Number(afterTs) < Date.now() - TWO_DAYS_MS;
         const path42 = useHistory ? "/api/v5/market/history-candles" : "/api/v5/market/candles";
-        const response = await context.client.publicGet(path42, query, rateLimit);
+        const response = await context.client.publicGet(path42, query, rateLimit, demo);
         if (!useHistory && hasTimestamp && Array.isArray(response.data) && response.data.length === 0) {
-          return normalizeResponse(await context.client.publicGet("/api/v5/market/history-candles", query, rateLimit));
+          return normalizeResponse(await context.client.publicGet("/api/v5/market/history-candles", query, rateLimit, demo));
         }
         return normalizeResponse(response);
       }
@@ -5652,7 +5865,8 @@ function registerMarketTools() {
           instFamily: {
             type: "string",
             description: "e.g. BTC-USD"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instType"]
       },
@@ -5666,7 +5880,8 @@ function registerMarketTools() {
             uly: readString(args, "uly"),
             instFamily: readString(args, "instFamily")
           }),
-          publicRateLimit("market_get_instruments", 20)
+          publicRateLimit("market_get_instruments", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5698,13 +5913,15 @@ function registerMarketTools() {
           limit: {
             type: "number",
             description: "History records (default 20, max 100)"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const isHistory = readBoolean(args, "history") ?? false;
+        const demo = readBoolean(args, "demo") ?? false;
         if (isHistory) {
           const response2 = await context.client.publicGet(
             "/api/v5/public/funding-rate-history",
@@ -5714,14 +5931,16 @@ function registerMarketTools() {
               before: readString(args, "before"),
               limit: readNumber(args, "limit") ?? 20
             }),
-            publicRateLimit("market_get_funding_rate", 20)
+            publicRateLimit("market_get_funding_rate", 20),
+            demo
           );
           return normalizeResponse(response2);
         }
         const response = await context.client.publicGet(
           "/api/v5/public/funding-rate",
           { instId: requireString(args, "instId") },
-          publicRateLimit("market_get_funding_rate", 20)
+          publicRateLimit("market_get_funding_rate", 20),
+          demo
         );
         return normalizeResponse(response);
       }
@@ -5748,7 +5967,8 @@ function registerMarketTools() {
           },
           instFamily: {
             type: "string"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instType"]
       },
@@ -5762,7 +5982,8 @@ function registerMarketTools() {
             uly: readString(args, "uly"),
             instFamily: readString(args, "instFamily")
           }),
-          publicRateLimit("market_get_mark_price", 10)
+          publicRateLimit("market_get_mark_price", 10),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5782,7 +6003,8 @@ function registerMarketTools() {
           limit: {
             type: "number",
             description: "Default 20, max 500"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
@@ -5794,7 +6016,8 @@ function registerMarketTools() {
             instId: requireString(args, "instId"),
             limit: readNumber(args, "limit") ?? 20
           }),
-          publicRateLimit("market_get_trades", 20)
+          publicRateLimit("market_get_trades", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5814,7 +6037,8 @@ function registerMarketTools() {
           quoteCcy: {
             type: "string",
             description: "e.g. USD or USDT"
-          }
+          },
+          ...DEMO_PROPERTY
         }
       },
       handler: async (rawArgs, context) => {
@@ -5825,7 +6049,8 @@ function registerMarketTools() {
             instId: readString(args, "instId"),
             quoteCcy: readString(args, "quoteCcy")
           }),
-          publicRateLimit("market_get_index_ticker", 20)
+          publicRateLimit("market_get_index_ticker", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5862,7 +6087,8 @@ function registerMarketTools() {
           history: {
             type: "boolean",
             description: "true=older historical data"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
@@ -5879,7 +6105,8 @@ function registerMarketTools() {
             before: readString(args, "before"),
             limit: readNumber(args, "limit")
           }),
-          publicRateLimit("market_get_index_candles", 20)
+          publicRateLimit("market_get_index_candles", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5895,7 +6122,8 @@ function registerMarketTools() {
           instId: {
             type: "string",
             description: "SWAP or FUTURES ID, e.g. BTC-USDT-SWAP"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instId"]
       },
@@ -5904,7 +6132,8 @@ function registerMarketTools() {
         const response = await context.client.publicGet(
           "/api/v5/public/price-limit",
           { instId: requireString(args, "instId") },
-          publicRateLimit("market_get_price_limit", 20)
+          publicRateLimit("market_get_price_limit", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5931,7 +6160,8 @@ function registerMarketTools() {
           },
           instFamily: {
             type: "string"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instType"]
       },
@@ -5945,7 +6175,8 @@ function registerMarketTools() {
             uly: readString(args, "uly"),
             instFamily: readString(args, "instFamily")
           }),
-          publicRateLimit("market_get_open_interest", 20)
+          publicRateLimit("market_get_open_interest", 20),
+          readBoolean(args, "demo") ?? false
         );
         return normalizeResponse(response);
       }
@@ -5966,7 +6197,8 @@ function registerMarketTools() {
           instId: {
             type: "string",
             description: "Optional: filter by specific instrument ID, e.g. AAPL-USDT-SWAP"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: []
       },
@@ -5977,7 +6209,8 @@ function registerMarketTools() {
         const response = await context.client.publicGet(
           "/api/v5/public/instruments",
           compactObject({ instType, instId }),
-          publicRateLimit("market_get_stock_tokens", 20)
+          publicRateLimit("market_get_stock_tokens", 20),
+          readBoolean(args, "demo") ?? false
         );
         const data = response.data;
         const filtered = Array.isArray(data) ? data.filter((item) => item.instCategory === "3") : data;
@@ -5987,7 +6220,7 @@ function registerMarketTools() {
     {
       name: "market_get_instruments_by_category",
       module: "market",
-      description: "Discover tradeable instruments by asset category. Stock tokens (instCategory=3, e.g. AAPL-USDT-SWAP, TSLA-USDT-SWAP), Metals (4, e.g. XAUUSDT-USDT-SWAP for gold), Commodities (5, e.g. OIL-USDT-SWAP for crude oil), Forex (6, e.g. EURUSDT-USDT-SWAP for EUR/USD), Bonds (7, e.g. US30Y-USDT-SWAP). Use this to find instIds before querying prices or placing orders. Filters client-side by instCategory.",
+      description: "Discover tradeable instruments by asset category. Stock tokens (instCategory=3, e.g. AAPL-USDT-SWAP, TSLA-USDT-SWAP), Metals (4, e.g. XAUUSDT-USDT-SWAP for gold), Commodities (5, e.g. OIL-USDT-SWAP for crude oil), Forex (6, e.g. EURUSDT-USDT-SWAP for EUR/USD), Bonds (7, e.g. US30Y-USDT-SWAP for crude oil). Use this to find instIds before querying prices or placing orders. Filters client-side by instCategory.",
       isWrite: false,
       inputSchema: {
         type: "object",
@@ -6005,7 +6238,8 @@ function registerMarketTools() {
           instId: {
             type: "string",
             description: "Optional: filter by specific instrument ID"
-          }
+          },
+          ...DEMO_PROPERTY
         },
         required: ["instCategory"]
       },
@@ -6017,7 +6251,8 @@ function registerMarketTools() {
         const response = await context.client.publicGet(
           "/api/v5/public/instruments",
           compactObject({ instType, instId }),
-          publicRateLimit("market_get_instruments_by_category", 20)
+          publicRateLimit("market_get_instruments_by_category", 20),
+          readBoolean(args, "demo") ?? false
         );
         const data = response.data;
         const filtered = Array.isArray(data) ? data.filter((item) => item.instCategory === instCategory) : data;
@@ -6085,8 +6320,8 @@ function registerOptionAlgoTools() {
           },
           tgtCcy: {
             type: "string",
-            enum: ["base_ccy", "quote_ccy"],
-            description: "Size unit. base_ccy(default): sz in contracts, quote_ccy: sz in USDT (may not be supported for options)"
+            enum: ["base_ccy", "quote_ccy", "margin"],
+            description: "Size unit. base_ccy(default): sz in contracts; quote_ccy: sz in USDT notional value; margin: sz in USDT margin cost (actual position = sz * leverage)"
           },
           reduceOnly: {
             type: "boolean",
@@ -6102,6 +6337,14 @@ function registerOptionAlgoTools() {
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const reduceOnly = readBoolean(args, "reduceOnly");
+        const resolved = await resolveQuoteCcySz(
+          requireString(args, "instId"),
+          requireString(args, "sz"),
+          readString(args, "tgtCcy"),
+          "OPTION",
+          context.client,
+          readString(args, "tdMode")
+        );
         const response = await context.client.privatePost(
           "/api/v5/trade/order-algo",
           compactObject({
@@ -6109,8 +6352,8 @@ function registerOptionAlgoTools() {
             tdMode: requireString(args, "tdMode"),
             side: requireString(args, "side"),
             ordType: requireString(args, "ordType"),
-            sz: requireString(args, "sz"),
-            tgtCcy: readString(args, "tgtCcy"),
+            sz: resolved.sz,
+            tgtCcy: resolved.tgtCcy,
             tpTriggerPx: readString(args, "tpTriggerPx"),
             tpOrdPx: readString(args, "tpOrdPx"),
             tpTriggerPxType: readString(args, "tpTriggerPxType"),
@@ -6317,7 +6560,12 @@ function registerOptionTools() {
           },
           sz: {
             type: "string",
-            description: "Contracts count (NOT USDT). Use market_get_instruments for ctVal."
+            description: "Contracts count by default. Set tgtCcy=quote_ccy to specify USDT notional value; set tgtCcy=margin to specify USDT margin cost (notional = sz * leverage)."
+          },
+          tgtCcy: {
+            type: "string",
+            enum: ["base_ccy", "quote_ccy", "margin"],
+            description: "Size unit. base_ccy(default): sz in contracts; quote_ccy: sz in USDT notional value; margin: sz in USDT margin cost (actual position = sz * leverage)"
           },
           px: {
             type: "string",
@@ -6354,6 +6602,14 @@ function registerOptionTools() {
         const args = asRecord(rawArgs);
         const reduceOnly = args.reduceOnly;
         const attachAlgoOrds = buildAttachAlgoOrds(args);
+        const resolved = await resolveQuoteCcySz(
+          requireString(args, "instId"),
+          requireString(args, "sz"),
+          readString(args, "tgtCcy"),
+          "OPTION",
+          context.client,
+          readString(args, "tdMode")
+        );
         const response = await context.client.privatePost(
           "/api/v5/trade/order",
           compactObject({
@@ -6361,7 +6617,8 @@ function registerOptionTools() {
             tdMode: requireString(args, "tdMode"),
             side: requireString(args, "side"),
             ordType: requireString(args, "ordType"),
-            sz: requireString(args, "sz"),
+            sz: resolved.sz,
+            tgtCcy: resolved.tgtCcy,
             px: readString(args, "px"),
             reduceOnly: typeof reduceOnly === "boolean" ? String(reduceOnly) : void 0,
             clOrdId: readString(args, "clOrdId"),
@@ -7517,12 +7774,12 @@ function createToolRunner(client, config) {
   };
 }
 function configFilePath() {
-  return join6(homedir4(), ".okx", "config.toml");
+  return join4(homedir2(), ".okx", "config.toml");
 }
 function readFullConfig() {
   const path42 = configFilePath();
   if (!existsSync3(path42)) return { profiles: {} };
-  const raw = readFileSync4(path42, "utf-8");
+  const raw = readFileSync3(path42, "utf-8");
   try {
     return parse(raw);
   } catch (err) {
@@ -7550,11 +7807,11 @@ var CONFIG_HEADER = `# OKX Trade Kit Configuration
 `;
 function writeFullConfig(config) {
   const path42 = configFilePath();
-  const dir = dirname4(path42);
+  const dir = dirname3(path42);
   if (!existsSync3(dir)) {
-    mkdirSync5(dir, { recursive: true });
+    mkdirSync4(dir, { recursive: true });
   }
-  writeFileSync4(path42, CONFIG_HEADER + stringify(config), "utf-8");
+  writeFileSync3(path42, CONFIG_HEADER + stringify(config), "utf-8");
 }
 function expandShorthand(moduleId) {
   if (moduleId === "all") return [...MODULES];
@@ -7668,21 +7925,21 @@ function loadConfig(cli) {
     verbose: cli.verbose ?? false
   };
 }
-var CACHE_FILE = join7(homedir5(), ".okx", "update-check.json");
+var CACHE_FILE = join5(homedir3(), ".okx", "update-check.json");
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
-function readCache2() {
+function readCache() {
   try {
     if (existsSync4(CACHE_FILE)) {
-      return JSON.parse(readFileSync5(CACHE_FILE, "utf-8"));
+      return JSON.parse(readFileSync4(CACHE_FILE, "utf-8"));
     }
   } catch {
   }
   return {};
 }
-function writeCache2(cache) {
+function writeCache(cache) {
   try {
-    mkdirSync6(join7(homedir5(), ".okx"), { recursive: true });
-    writeFileSync5(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+    mkdirSync5(join5(homedir3(), ".okx"), { recursive: true });
+    writeFileSync4(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
   } catch {
   }
 }
@@ -7729,14 +7986,14 @@ async function fetchLatestVersion(packageName) {
 function refreshCacheInBackground(packageName) {
   fetchLatestVersion(packageName).then((latest) => {
     if (!latest) return;
-    const cache = readCache2();
+    const cache = readCache();
     cache[packageName] = { latestVersion: latest, checkedAt: Date.now() };
-    writeCache2(cache);
+    writeCache(cache);
   }).catch(() => {
   });
 }
 function checkForUpdates(packageName, currentVersion) {
-  const cache = readCache2();
+  const cache = readCache();
   const entry = cache[packageName];
   if (entry && isNewerVersion(currentVersion, entry.latestVersion)) {
     process.stderr.write(
@@ -7751,6 +8008,69 @@ Run: npm install -g ${packageName}
     refreshCacheInBackground(packageName);
   }
 }
+var LOG_LEVEL_PRIORITY = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3
+};
+var SENSITIVE_KEY_PATTERN = /apiKey|secretKey|passphrase|password|secret/i;
+function sanitize(value) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map(sanitize);
+  }
+  if (typeof value === "object") {
+    const result = {};
+    for (const [k, v] of Object.entries(value)) {
+      if (SENSITIVE_KEY_PATTERN.test(k)) {
+        result[k] = "[REDACTED]";
+      } else {
+        result[k] = sanitize(v);
+      }
+    }
+    return result;
+  }
+  return value;
+}
+var TradeLogger = class {
+  logLevel;
+  logDir;
+  constructor(logLevel = "info", logDir) {
+    this.logLevel = logLevel;
+    this.logDir = logDir ?? path2.join(os2.homedir(), ".okx", "logs");
+  }
+  getLogPath(date) {
+    const d = date ?? /* @__PURE__ */ new Date();
+    const yyyy = d.getUTCFullYear();
+    const mm = String(d.getUTCMonth() + 1).padStart(2, "0");
+    const dd = String(d.getUTCDate()).padStart(2, "0");
+    return path2.join(this.logDir, `trade-${yyyy}-${mm}-${dd}.log`);
+  }
+  log(level, tool, params, result, durationMs) {
+    if (LOG_LEVEL_PRIORITY[level] > LOG_LEVEL_PRIORITY[this.logLevel]) {
+      return;
+    }
+    const entry = {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      level: level.toUpperCase(),
+      tool,
+      durationMs,
+      params: sanitize(params),
+      result: sanitize(result)
+    };
+    try {
+      fs2.mkdirSync(this.logDir, { recursive: true });
+      fs2.appendFileSync(this.getLogPath(), JSON.stringify(entry) + "\n", "utf8");
+    } catch {
+    }
+  }
+  static sanitize(params) {
+    return sanitize(params);
+  }
+};
 var CLIENT_NAMES = {
   "claude-desktop": "Claude Desktop",
   cursor: "Cursor",
@@ -7900,11 +8220,11 @@ function runSetup(options) {
 // src/commands/diagnose.ts
 import dns from "dns/promises";
 import net from "net";
-import os4 from "os";
+import os5 from "os";
 import tls from "tls";
 
 // src/commands/diagnose-utils.ts
-import fs2 from "fs";
+import fs4 from "fs";
 import { createRequire } from "module";
 
 // src/formatter.ts
@@ -7917,6 +8237,10 @@ var activeOutput = stdioOutput;
 function setOutput(impl) {
   activeOutput = impl;
 }
+var envContext = null;
+function setEnvContext(ctx) {
+  envContext = ctx;
+}
 function output(message) {
   activeOutput.out(message);
 }
@@ -7929,10 +8253,23 @@ function outputLine(message) {
 function errorLine(message) {
   activeOutput.err(message + EOL);
 }
+var jsonEnvEnabled = false;
+function setJsonEnvEnabled(enabled) {
+  jsonEnvEnabled = enabled;
+}
 function printJson(data) {
-  activeOutput.out(JSON.stringify(data, null, 2) + EOL);
+  const payload = jsonEnvEnabled && envContext ? {
+    env: envContext.demo ? "demo" : "live",
+    profile: envContext.profile,
+    data
+  } : data;
+  activeOutput.out(JSON.stringify(payload, null, 2) + EOL);
 }
 function printTable(rows) {
+  if (envContext) {
+    const envLabel = envContext.demo ? "demo (simulated trading)" : "live";
+    activeOutput.out(`Environment: ${envLabel}` + EOL + EOL);
+  }
   if (rows.length === 0) {
     activeOutput.out("(no data)" + EOL);
     return;
@@ -8009,7 +8346,7 @@ var Report = class {
         lines.push(`${key.padEnd(14)} ${value}`);
       }
       lines.push(sep2, "");
-      fs2.writeFileSync(filePath, lines.join("\n"), "utf8");
+      fs4.writeFileSync(filePath, lines.join("\n"), "utf8");
       return true;
     } catch (_e) {
       return false;
@@ -8044,7 +8381,7 @@ function writeReportIfRequested(report, outputPath) {
     errorLine(`  Warning: failed to write report to: ${outputPath}`);
   }
 }
-function sanitize(value) {
+function sanitize2(value) {
   value = value.replace(
     /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi,
     "****-uuid-****"
@@ -8055,14 +8392,14 @@ function sanitize(value) {
 }
 
 // src/commands/diagnose-mcp.ts
-import fs4 from "fs";
-import path2 from "path";
-import os2 from "os";
+import fs5 from "fs";
+import path4 from "path";
+import os4 from "os";
 import { spawnSync, spawn } from "child_process";
 import { createRequire as createRequire2 } from "module";
 import { fileURLToPath } from "url";
 var _require2 = createRequire2(import.meta.url);
-var __dirname = path2.dirname(fileURLToPath(import.meta.url));
+var __dirname = path4.dirname(fileURLToPath(import.meta.url));
 function readMcpVersion() {
   const candidates = [
     // Installed as global or local dependency
@@ -8115,13 +8452,13 @@ function checkMcpEntryPoint(report) {
   if (!entryPath) {
     const candidates = [
       // Installed locally
-      path2.join(process.cwd(), "node_modules", ".bin", "okx-trade-mcp"),
+      path4.join(process.cwd(), "node_modules", ".bin", "okx-trade-mcp"),
       // Monorepo workspace (e.g. running from source)
-      path2.join(__dirname, "..", "..", "..", "..", "mcp", "dist", "index.js")
+      path4.join(__dirname, "..", "..", "..", "..", "mcp", "dist", "index.js")
     ];
     for (const candidate of candidates) {
       try {
-        fs4.accessSync(candidate, fs4.constants.X_OK | fs4.constants.R_OK);
+        fs5.accessSync(candidate, fs5.constants.X_OK | fs5.constants.R_OK);
         entryPath = candidate;
         break;
       } catch (_e) {
@@ -8146,9 +8483,9 @@ var CLIENT_LIMITS = {
   cursor: { perServer: 40, total: 80 }
 };
 function checkJsonMcpConfig(configPath) {
-  if (!fs4.existsSync(configPath)) return "missing";
+  if (!fs5.existsSync(configPath)) return "missing";
   try {
-    const raw = fs4.readFileSync(configPath, "utf8");
+    const raw = fs5.readFileSync(configPath, "utf8");
     const parsed = JSON.parse(raw);
     const mcpServers = parsed["mcpServers"];
     if (!mcpServers) return "not-configured";
@@ -8166,15 +8503,15 @@ function checkJsonMcpConfig(configPath) {
   }
 }
 function checkClaudeCodeConfig() {
-  const home = os2.homedir();
+  const home = os4.homedir();
   const candidates = [
-    path2.join(home, ".claude", "settings.json"),
-    path2.join(home, ".claude.json")
+    path4.join(home, ".claude", "settings.json"),
+    path4.join(home, ".claude.json")
   ];
   let anyFound = false;
   let anyParseError = false;
   for (const cfgPath of candidates) {
-    if (!fs4.existsSync(cfgPath)) continue;
+    if (!fs5.existsSync(cfgPath)) continue;
     anyFound = true;
     const result = checkJsonMcpConfig(cfgPath);
     if (result === "found") return "found";
@@ -8191,8 +8528,8 @@ function handleJsonClient(clientId, report, configuredClients) {
   const status = checkJsonMcpConfig(configPath);
   if (status === "missing") return false;
   if (status === "found") {
-    ok(name, `configured (${sanitize(configPath)})`);
-    report.add(`client_${clientId}`, `OK ${sanitize(configPath)}`);
+    ok(name, `configured (${sanitize2(configPath)})`);
+    report.add(`client_${clientId}`, `OK ${sanitize2(configPath)}`);
     configuredClients.push(clientId);
     return false;
   }
@@ -8200,8 +8537,8 @@ function handleJsonClient(clientId, report, configuredClients) {
     fail(name, "okx-trade-mcp not found in mcpServers", [`Run: okx setup --client ${clientId}`]);
     report.add(`client_${clientId}`, "NOT_CONFIGURED");
   } else {
-    fail(name, `JSON parse error in ${sanitize(configPath)}`, [
-      `Check ${sanitize(configPath)} for JSON syntax errors`,
+    fail(name, `JSON parse error in ${sanitize2(configPath)}`, [
+      `Check ${sanitize2(configPath)} for JSON syntax errors`,
       `Then run: okx setup --client ${clientId}`
     ]);
     report.add(`client_${clientId}`, "PARSE_ERROR");
@@ -8294,37 +8631,37 @@ function checkToolCount(report, configuredClients, getSpecs = allToolSpecs) {
   }
 }
 function readLogTail(logPath) {
-  const stat = fs4.statSync(logPath);
+  const stat = fs5.statSync(logPath);
   const readSize = Math.min(8192, stat.size);
   const buffer = Buffer.alloc(readSize);
-  const fd = fs4.openSync(logPath, "r");
+  const fd = fs5.openSync(logPath, "r");
   try {
-    fs4.readSync(fd, buffer, 0, readSize, Math.max(0, stat.size - readSize));
+    fs5.readSync(fd, buffer, 0, readSize, Math.max(0, stat.size - readSize));
   } finally {
-    fs4.closeSync(fd);
+    fs5.closeSync(fd);
   }
   return buffer.toString("utf8").split("\n").filter((l) => l.trim()).slice(-5);
 }
 function getMcpLogCandidates() {
   if (process.platform === "darwin") {
-    const logsDir = path2.join(os2.homedir(), "Library", "Logs", "Claude");
+    const logsDir = path4.join(os4.homedir(), "Library", "Logs", "Claude");
     const candidates = [
-      path2.join(logsDir, "mcp.log"),
-      path2.join(logsDir, "mcp-server-okx-trade-mcp.log")
+      path4.join(logsDir, "mcp.log"),
+      path4.join(logsDir, "mcp-server-okx-trade-mcp.log")
     ];
     try {
-      const extra = fs4.readdirSync(logsDir).filter((f) => f.startsWith("mcp") && f.endsWith(".log")).map((f) => path2.join(logsDir, f));
+      const extra = fs5.readdirSync(logsDir).filter((f) => f.startsWith("mcp") && f.endsWith(".log")).map((f) => path4.join(logsDir, f));
       candidates.push(...extra);
     } catch (_e) {
     }
     return candidates;
   }
   if (process.platform === "win32") {
-    const appData2 = process.env.APPDATA ?? path2.join(os2.homedir(), "AppData", "Roaming");
-    return [path2.join(appData2, "Claude", "logs", "mcp.log")];
+    const appData2 = process.env.APPDATA ?? path4.join(os4.homedir(), "AppData", "Roaming");
+    return [path4.join(appData2, "Claude", "logs", "mcp.log")];
   }
-  const configHome = process.env.XDG_CONFIG_HOME ?? path2.join(os2.homedir(), ".config");
-  return [path2.join(configHome, "Claude", "logs", "mcp.log")];
+  const configHome = process.env.XDG_CONFIG_HOME ?? path4.join(os4.homedir(), ".config");
+  return [path4.join(configHome, "Claude", "logs", "mcp.log")];
 }
 function checkMcpLogs(report) {
   section("MCP Server Logs (recent)");
@@ -8338,7 +8675,7 @@ function checkMcpLogs(report) {
       report.add("mcp_log", logPath);
       if (lines.length > 0) {
         ok("last lines", `(${lines.length} shown)`);
-        for (const line of lines) outputLine(`    ${sanitize(line)}`);
+        for (const line of lines) outputLine(`    ${sanitize2(line)}`);
       } else {
         ok("last lines", "(empty log)");
       }
@@ -8464,11 +8801,11 @@ function checkModuleLoading(entryPath, report) {
     return true;
   } else {
     const errMsg = result.stderr?.trim() || result.error?.message || "non-zero exit";
-    fail("module load", `failed: ${sanitize(errMsg)}`, [
+    fail("module load", `failed: ${sanitize2(errMsg)}`, [
       "MCP server may have import errors or missing dependencies",
       `Try: node ${entryPath} --version`
     ]);
-    report.add("module_load", `FAIL ${sanitize(errMsg)}`);
+    report.add("module_load", `FAIL ${sanitize2(errMsg)}`);
     return false;
   }
 }
@@ -8479,7 +8816,7 @@ async function cmdDiagnoseMcp(options = {}) {
   const report = new Report();
   report.add("ts", (/* @__PURE__ */ new Date()).toISOString());
   report.add("mode", "mcp");
-  report.add("os", `${process.platform} ${process.arch} ${os2.release()}`);
+  report.add("os", `${process.platform} ${process.arch} ${os4.release()}`);
   checkMcpPackageVersion(report);
   const nodePassed = checkNodeCompat(report);
   const { entryPath, passed: entryPassed } = checkMcpEntryPoint(report);
@@ -8511,7 +8848,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "19e8da3" : "dev";
+var GIT_HASH = true ? "ee71999" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -8591,14 +8928,14 @@ function checkEnvironment(report) {
   }
   ok("CLI", `v${CLI_VERSION} (${GIT_HASH})`);
   ok("OS", `${process.platform} ${process.arch}`);
-  ok("OS release", os4.release());
+  ok("OS release", os5.release());
   ok("Shell", process.env.SHELL ?? "(unknown)");
   ok("Locale", `${process.env.LANG ?? process.env.LC_ALL ?? "(unknown)"}`);
   ok("Timezone", Intl.DateTimeFormat().resolvedOptions().timeZone);
   report.add("cli", `${CLI_VERSION} (${GIT_HASH})`);
   report.add("node", `${nodeVersion} ${process.platform} ${process.arch}`);
-  const machine = typeof os4.machine === "function" ? os4.machine() : process.arch;
-  report.add("os", `${os4.type()} ${os4.release()} ${machine}`);
+  const machine = typeof os5.machine === "function" ? os5.machine() : process.arch;
+  report.add("os", `${os5.type()} ${os5.release()} ${machine}`);
   report.add("shell", process.env.SHELL ?? "-");
   report.add("locale", process.env.LANG ?? process.env.LC_ALL ?? "-");
   report.add("tz", Intl.DateTimeFormat().resolvedOptions().timeZone);
@@ -8755,10 +9092,10 @@ async function cmdDiagnose(config, profile, options = {}) {
 }
 function checkConfigFile(report) {
   section("Config File");
-  const path5 = configFilePath();
+  const path6 = configFilePath();
   try {
     readFullConfig();
-    ok("Config parse", `${path5} OK`);
+    ok("Config parse", `${path6} OK`);
     report.add("config_parse", "OK");
     return true;
   } catch (e) {
@@ -8808,24 +9145,24 @@ 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 readFileSync6, writeFileSync as writeFileSync6, mkdirSync as mkdirSync7 } from "fs";
+import { dirname as dirname5, join as join7 } from "path";
+import { homedir as homedir5 } 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 = join7(homedir5(), ".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 = join7(dirname5(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
 function readLastCheck() {
   try {
-    return parseInt(readFileSync7(CACHE_FILE2, "utf-8").trim(), 10) || 0;
+    return parseInt(readFileSync6(CACHE_FILE2, "utf-8").trim(), 10) || 0;
   } catch {
     return 0;
   }
 }
 function writeLastCheck() {
   try {
-    mkdirSync8(join9(homedir7(), ".okx"), { recursive: true });
-    writeFileSync7(CACHE_FILE2, String(Math.floor(Date.now() / 1e3)), "utf-8");
+    mkdirSync7(join7(homedir5(), ".okx"), { recursive: true });
+    writeFileSync6(CACHE_FILE2, String(Math.floor(Date.now() / 1e3)), "utf-8");
   } catch {
   }
 }
@@ -8928,7 +9265,7 @@ function loadProfileConfig(opts) {
 import { EOL as EOL2 } from "os";
 
 // src/commands/client-setup.ts
-import * as fs5 from "fs";
+import * as fs6 from "fs";
 var DETECTABLE_CLIENTS = ["claude-desktop", "cursor", "windsurf"];
 function cmdSetupClient(options) {
   runSetup(options);
@@ -8937,14 +9274,14 @@ function cmdSetupClients() {
   const detected = [];
   for (const id of DETECTABLE_CLIENTS) {
     const p = getConfigPath(id);
-    if (p && fs5.existsSync(p)) {
+    if (p && fs6.existsSync(p)) {
       detected.push({ id, path: p });
     }
   }
   if (detected.length > 0) {
     outputLine("Detected clients:");
-    for (const { id, path: path5 } of detected) {
-      outputLine(`  ${id.padEnd(16)} ${path5}`);
+    for (const { id, path: path6 } of detected) {
+      outputLine(`  ${id.padEnd(16)} ${path6}`);
     }
     outputLine("");
   }
@@ -9328,7 +9665,7 @@ var HELP_TREE = {
     description: "Earn products \u2014 Simple Earn, On-chain Earn, and DCD (Dual Currency Deposit)",
     subgroups: {
       savings: {
-        description: "Simple Earn \u2014 flexible savings and lending",
+        description: "Simple Earn \u2014 flexible savings, fixed-term, and lending",
         commands: {
           balance: {
             usage: "okx earn savings balance [<ccy>]",
@@ -9352,7 +9689,19 @@ var HELP_TREE = {
           },
           "rate-history": {
             usage: "okx earn savings rate-history [--ccy <ccy>] [--limit <n>]",
-            description: "Query Simple Earn lending rates (public, no auth needed)"
+            description: "Query Simple Earn lending rates and fixed-term offers (requires auth)"
+          },
+          "fixed-orders": {
+            usage: "okx earn savings fixed-orders [--ccy <ccy>] [--state <pending|earning|expired|settled|cancelled>]",
+            description: "List fixed-term earn orders"
+          },
+          "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": {
+            usage: "okx earn savings fixed-redeem <reqId>",
+            description: "Redeem a fixed-term earn order (full amount)"
           }
         }
       },
@@ -9517,6 +9866,39 @@ var HELP_TREE = {
     description: "Run network / MCP server diagnostics",
     usage: "okx diagnose [--cli | --mcp | --all] [--profile <name>] [--demo | --live] [--output <file>]"
   },
+  skill: {
+    description: "OKX Skills Marketplace \u2014 search, install, and manage agent skills",
+    commands: {
+      search: {
+        usage: "okx skill search [--keyword <kw>] [--categories <id>] [--page <n>] [--limit <n>]",
+        description: "Search for skills in the marketplace"
+      },
+      categories: {
+        usage: "okx skill categories",
+        description: "List available skill categories"
+      },
+      add: {
+        usage: "okx skill add <name>",
+        description: "Download and install a skill to detected agents"
+      },
+      download: {
+        usage: "okx skill download <name> [--dir <path>] [--format zip|skill]",
+        description: "Download a skill package without installing"
+      },
+      remove: {
+        usage: "okx skill remove <name>",
+        description: "Remove an installed skill"
+      },
+      check: {
+        usage: "okx skill check <name>",
+        description: "Check if an installed skill has a newer version"
+      },
+      list: {
+        usage: "okx skill list",
+        description: "List all locally installed skills"
+      }
+    }
+  },
   upgrade: {
     description: "Upgrade okx CLI and MCP server to the latest stable version",
     usage: "okx upgrade [--check] [--beta] [--force] [--json]"
@@ -9532,6 +9914,7 @@ function printGlobalHelp() {
     "  --demo             Use simulated trading (demo) mode",
     "  --live             Force live trading mode (overrides profile demo=true; mutually exclusive with --demo)",
     "  --json             Output raw JSON",
+    "  --env              With --json, wrap output as {env, profile, data}",
     "  --verbose          Show detailed network request/response info (stderr)",
     "  --version, -v      Show version",
     "  --help             Show this help",
@@ -9646,8 +10029,8 @@ function printCommandList(lines, commands) {
     lines.push("");
   }
 }
-function printHelp(...path5) {
-  const [moduleName, subgroupName] = path5;
+function printHelp(...path6) {
+  const [moduleName, subgroupName] = path6;
   if (!moduleName) {
     printGlobalHelp();
   } else if (!subgroupName) {
@@ -9663,6 +10046,7 @@ var CLI_OPTIONS = {
   profile: { type: "string" },
   demo: { type: "boolean", default: false },
   json: { type: "boolean", default: false },
+  env: { type: "boolean", default: false },
   help: { type: "boolean", default: false },
   version: { type: "boolean", short: "v", default: false },
   // setup command
@@ -9768,6 +10152,8 @@ var CLI_OPTIONS = {
   orders: { type: "string" },
   // earn
   rate: { type: "string" },
+  reqId: { type: "string" },
+  confirm: { type: "boolean", default: false },
   // audit
   since: { type: "string" },
   tool: { type: "string" },
@@ -9808,6 +10194,7 @@ var CLI_OPTIONS = {
   categories: { type: "string" },
   dir: { type: "string" },
   page: { type: "string" },
+  format: { type: "string" },
   // diagnostics — cli/mcp/all/output are diagnose-specific; verbose is shared
   verbose: { type: "boolean", default: false },
   mcp: { type: "boolean", default: false },
@@ -9847,7 +10234,7 @@ function getData(result) {
   return result.data;
 }
 async function cmdMarketInstruments(run, opts) {
-  const result = await run("market_get_instruments", { instType: opts.instType, instId: opts.instId });
+  const result = await run("market_get_instruments", { instType: opts.instType, instId: opts.instId, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   printTable(
@@ -9862,7 +10249,7 @@ async function cmdMarketInstruments(run, opts) {
   );
 }
 async function cmdMarketFundingRate(run, instId, opts) {
-  const result = await run("market_get_funding_rate", { instId, history: opts.history, limit: opts.limit });
+  const result = await run("market_get_funding_rate", { instId, history: opts.history, limit: opts.limit, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   if (opts.history) {
@@ -9890,7 +10277,7 @@ async function cmdMarketFundingRate(run, instId, opts) {
   }
 }
 async function cmdMarketMarkPrice(run, opts) {
-  const result = await run("market_get_mark_price", { instType: opts.instType, instId: opts.instId });
+  const result = await run("market_get_mark_price", { instType: opts.instType, instId: opts.instId, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   printTable(
@@ -9903,7 +10290,7 @@ async function cmdMarketMarkPrice(run, opts) {
   );
 }
 async function cmdMarketTrades(run, instId, opts) {
-  const result = await run("market_get_trades", { instId, limit: opts.limit });
+  const result = await run("market_get_trades", { instId, limit: opts.limit, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   printTable(
@@ -9917,7 +10304,7 @@ async function cmdMarketTrades(run, instId, opts) {
   );
 }
 async function cmdMarketIndexTicker(run, opts) {
-  const result = await run("market_get_index_ticker", { instId: opts.instId, quoteCcy: opts.quoteCcy });
+  const result = await run("market_get_index_ticker", { instId: opts.instId, quoteCcy: opts.quoteCcy, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   printTable(
@@ -9931,7 +10318,7 @@ async function cmdMarketIndexTicker(run, opts) {
   );
 }
 async function cmdMarketIndexCandles(run, instId, opts) {
-  const result = await run("market_get_index_candles", { instId, bar: opts.bar, limit: opts.limit, history: opts.history });
+  const result = await run("market_get_index_candles", { instId, bar: opts.bar, limit: opts.limit, history: opts.history, demo: opts.demo ?? false });
   const candles = getData(result);
   if (opts.json) return printJson(candles);
   printTable(
@@ -9944,8 +10331,8 @@ async function cmdMarketIndexCandles(run, instId, opts) {
     }))
   );
 }
-async function cmdMarketPriceLimit(run, instId, json) {
-  const result = await run("market_get_price_limit", { instId });
+async function cmdMarketPriceLimit(run, instId, json, demo) {
+  const result = await run("market_get_price_limit", { instId, demo: demo ?? false });
   const items = getData(result);
   if (json) return printJson(items);
   const r = items?.[0];
@@ -9961,7 +10348,7 @@ async function cmdMarketPriceLimit(run, instId, json) {
   });
 }
 async function cmdMarketOpenInterest(run, opts) {
-  const result = await run("market_get_open_interest", { instType: opts.instType, instId: opts.instId });
+  const result = await run("market_get_open_interest", { instType: opts.instType, instId: opts.instId, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   printTable(
@@ -9973,8 +10360,8 @@ async function cmdMarketOpenInterest(run, opts) {
     }))
   );
 }
-async function cmdMarketTicker(run, instId, json) {
-  const result = await run("market_get_ticker", { instId });
+async function cmdMarketTicker(run, instId, json, demo) {
+  const result = await run("market_get_ticker", { instId, demo: demo ?? false });
   const items = getData(result);
   if (json) return printJson(items);
   if (!items?.length) {
@@ -9997,8 +10384,8 @@ async function cmdMarketTicker(run, instId, json) {
     time: new Date(Number(t["ts"])).toLocaleString()
   });
 }
-async function cmdMarketTickers(run, instType, json) {
-  const result = await run("market_get_tickers", { instType });
+async function cmdMarketTickers(run, instType, json, demo) {
+  const result = await run("market_get_tickers", { instType, demo: demo ?? false });
   const items = getData(result);
   if (json) return printJson(items);
   printTable(
@@ -10011,8 +10398,8 @@ async function cmdMarketTickers(run, instType, json) {
     }))
   );
 }
-async function cmdMarketOrderbook(run, instId, sz, json) {
-  const result = await run("market_get_orderbook", { instId, sz });
+async function cmdMarketOrderbook(run, instId, sz, json, demo) {
+  const result = await run("market_get_orderbook", { instId, sz, demo: demo ?? false });
   const data = getData(result);
   if (json) return printJson(data);
   const book = data[0];
@@ -10029,7 +10416,7 @@ async function cmdMarketOrderbook(run, instId, sz, json) {
   for (const [p, s] of bids) outputLine(`  ${p.padStart(16)}  ${s}`);
 }
 async function cmdMarketCandles(run, instId, opts) {
-  const result = await run("market_get_candles", { instId, bar: opts.bar, limit: opts.limit, after: opts.after, before: opts.before });
+  const result = await run("market_get_candles", { instId, bar: opts.bar, limit: opts.limit, after: opts.after, before: opts.before, demo: opts.demo ?? false });
   const candles = getData(result);
   if (opts.json) return printJson(candles);
   printTable(
@@ -10043,6 +10430,10 @@ async function cmdMarketCandles(run, instId, opts) {
     }))
   );
 }
+function cmdMarketIndicatorList(json) {
+  if (json) return printJson(KNOWN_INDICATORS);
+  printTable(KNOWN_INDICATORS.map(({ name, description }) => ({ name, description })));
+}
 async function cmdMarketIndicator(run, indicator, instId, opts) {
   const params = opts.params ? opts.params.split(",").map((p) => Number(p.trim())).filter((n) => !Number.isNaN(n)) : void 0;
   const result = await run("market_get_indicator", {
@@ -10095,7 +10486,8 @@ async function cmdMarketInstrumentsByCategory(run, opts) {
   const result = await run("market_get_instruments_by_category", {
     instCategory: opts.instCategory,
     instType: opts.instType,
-    instId: opts.instId
+    instId: opts.instId,
+    demo: opts.demo ?? false
   });
   const items = getData(result);
   if (opts.json) return printJson(items);
@@ -10123,7 +10515,7 @@ async function cmdMarketInstrumentsByCategory(run, opts) {
   );
 }
 async function cmdMarketStockTokens(run, opts) {
-  const result = await run("market_get_stock_tokens", { instType: opts.instType, instId: opts.instId });
+  const result = await run("market_get_stock_tokens", { instType: opts.instType, instId: opts.instId, demo: opts.demo ?? false });
   const items = getData(result);
   if (opts.json) return printJson(items);
   printTable(
@@ -10140,9 +10532,9 @@ async function cmdMarketStockTokens(run, opts) {
 }
 
 // src/commands/account.ts
-import * as fs6 from "fs";
-import * as path4 from "path";
-import * as os5 from "os";
+import * as fs7 from "fs";
+import * as path5 from "path";
+import * as os6 from "os";
 function getData2(result) {
   return result.data;
 }
@@ -10353,10 +10745,10 @@ function readAuditLogs(logDir, days = 7) {
     const yyyy = d.getUTCFullYear();
     const mm = String(d.getUTCMonth() + 1).padStart(2, "0");
     const dd = String(d.getUTCDate()).padStart(2, "0");
-    const filePath = path4.join(logDir, `trade-${yyyy}-${mm}-${dd}.log`);
+    const filePath = path5.join(logDir, `trade-${yyyy}-${mm}-${dd}.log`);
     let content;
     try {
-      content = fs6.readFileSync(filePath, "utf8");
+      content = fs7.readFileSync(filePath, "utf8");
     } catch {
       continue;
     }
@@ -10372,7 +10764,7 @@ function readAuditLogs(logDir, days = 7) {
   return entries;
 }
 function cmdAccountAudit(opts) {
-  const logDir = path4.join(os5.homedir(), ".okx", "logs");
+  const logDir = path5.join(os6.homedir(), ".okx", "logs");
   const limit = Math.min(Number(opts.limit) || 20, 100);
   let entries = readAuditLogs(logDir);
   if (opts.tool) entries = entries.filter((e) => e.tool === opts.tool);
@@ -11360,6 +11752,7 @@ async function cmdOptionPlace(run, opts) {
     side: opts.side,
     ordType: opts.ordType,
     sz: opts.sz,
+    tgtCcy: opts.tgtCcy,
     px: opts.px,
     reduceOnly: opts.reduceOnly,
     clOrdId: opts.clOrdId,
@@ -11827,6 +12220,22 @@ async function cmdEarnSavingsBalance(run, ccy, json) {
     pendingAmt: r["pendingAmt"]
   }));
 }
+async function cmdEarnFixedOrderList(run, opts) {
+  const data = extractData(await run("earn_get_fixed_order_list", {
+    ccy: opts.ccy,
+    state: opts.state
+  }));
+  printDataList(data, opts.json, "No fixed earn orders", (r) => ({
+    reqId: r["reqId"],
+    ccy: r["ccy"],
+    amt: r["amt"],
+    rate: r["rate"],
+    term: r["term"],
+    state: r["state"],
+    accruedInterest: r["accruedInterest"],
+    cTime: new Date(Number(r["cTime"])).toLocaleString()
+  }));
+}
 async function cmdEarnSavingsPurchase(run, opts) {
   const data = extractData(await run("earn_savings_purchase", { ccy: opts.ccy, amt: opts.amt, rate: opts.rate }));
   if (opts.json) {
@@ -11872,14 +12281,107 @@ async function cmdEarnLendingHistory(run, opts) {
     ts: new Date(Number(r["ts"])).toLocaleString()
   }));
 }
+function printFixedPurchasePreview(rec) {
+  const offer = rec["offer"];
+  outputLine("");
+  outputLine("\u{1F4CB} Fixed Earn Purchase Preview");
+  outputLine(`  Currency: ${rec["ccy"]}`);
+  outputLine(`  Amount:   ${rec["amt"]}`);
+  outputLine(`  Term:     ${rec["term"]}`);
+  if (rec["currentFlexibleRate"]) {
+    outputLine(`  Current flexible rate: ${rec["currentFlexibleRate"]}`);
+  }
+  if (offer) {
+    printKv({
+      rate: offer["rate"],
+      minLend: offer["minLend"],
+      remainingQuota: offer["lendQuota"],
+      soldOut: offer["soldOut"] ? "Yes" : "No"
+    });
+  } else {
+    outputLine("  \u26A0\uFE0F  No matching offer found for this term.");
+  }
+  outputLine("");
+  outputLine(rec["warning"] ?? "");
+  outputLine("");
+  outputLine("Re-run with --confirm to execute.");
+}
+async function cmdEarnFixedPurchase(run, opts) {
+  const result = await run("earn_fixed_purchase", {
+    ccy: opts.ccy,
+    amt: opts.amt,
+    term: opts.term,
+    confirm: opts.confirm
+  });
+  if (!result || typeof result !== "object") {
+    outputLine("No response data");
+    return;
+  }
+  const rec = result;
+  if (rec["preview"]) {
+    if (opts.json) {
+      printJson(rec);
+      return;
+    }
+    printFixedPurchasePreview(rec);
+    return;
+  }
+  const data = extractData(result);
+  if (opts.json) {
+    printJson(data);
+    return;
+  }
+  const r = data[0];
+  if (!r) {
+    outputLine("No response data");
+    return;
+  }
+  printKv({ reqId: r["reqId"], ccy: r["ccy"], amt: r["amt"], term: r["term"] });
+}
+async function cmdEarnFixedRedeem(run, opts) {
+  const data = extractData(await run("earn_fixed_redeem", { reqId: opts.reqId }));
+  if (opts.json) {
+    printJson(data);
+    return;
+  }
+  if (!data.length) {
+    outputLine("No response data");
+    return;
+  }
+  printTable(data.map((r) => ({ reqId: r["reqId"] })));
+}
 async function cmdEarnLendingRateHistory(run, opts) {
-  const data = extractData(await run("earn_get_lending_rate_history", { ccy: opts.ccy, limit: opts.limit }));
-  printDataList(data, opts.json, "No rate history data", (r) => ({
+  const result = await run("earn_get_lending_rate_history", { ccy: opts.ccy, limit: opts.limit });
+  const data = extractData(result);
+  const fixedOffers = extractFixedOffers(result);
+  if (opts.json) {
+    printJson({ data, fixedOffers });
+    return;
+  }
+  printDataList(data, false, "No rate history data", (r) => ({
     ccy: r["ccy"],
     lendingRate: r["lendingRate"],
-    rate: r["rate"],
     ts: new Date(Number(r["ts"])).toLocaleString()
   }));
+  if (fixedOffers.length > 0) {
+    outputLine("");
+    outputLine("Fixed-term offers:");
+    printTable(fixedOffers.map((r) => ({
+      ccy: r["ccy"],
+      term: r["term"],
+      rate: r["rate"],
+      minLend: r["minLend"],
+      remainingQuota: r["lendQuota"],
+      soldOut: r["soldOut"] ? "Yes" : "No"
+    })));
+  }
+}
+function extractFixedOffers(result) {
+  if (result && typeof result === "object") {
+    const offers = result["fixedOffers"];
+    if (Array.isArray(offers)) return offers;
+  }
+  return [];
 }
 
 // src/commands/auto-earn.ts
@@ -12406,7 +12908,7 @@ async function cmdDcdRedeemExecute(run, opts) {
     ordId: r["ordId"],
     state: r["state"],
     redeemSz: q["redeemSz"] ? `${parseFloat(q["redeemSz"]).toFixed(8)} ${q["redeemCcy"]}` : "\u2014",
-    termRate: q["termRate"] ? `${q["termRate"]}%` : "\u2014"
+    termRate: q["termRate"] ? `${(parseFloat(q["termRate"]) * 100).toFixed(2)}%` : "\u2014"
   });
 }
 async function cmdDcdOrderState(run, opts) {
@@ -12459,7 +12961,7 @@ async function cmdDcdOrders(run, opts) {
     quoteCcy: r["quoteCcy"],
     strike: r["strike"],
     notionalSz: r["notionalSz"],
-    annualizedYield: r["annualizedYield"],
+    annualizedYield: r["annualizedYield"] ? `${(parseFloat(r["annualizedYield"]) * 100).toFixed(2)}%` : "\u2014",
     yieldSz: r["yieldSz"],
     settleTime: r["settleTime"] ? new Date(Number(r["settleTime"])).toLocaleDateString() : "",
     // scheduled settlement time
@@ -12499,7 +13001,7 @@ async function cmdDcdQuoteAndBuy(run, opts) {
     outputLine("Quote:");
     printKv({
       quoteId: q["quoteId"],
-      annualizedYield: q["annualizedYield"] ? `${q["annualizedYield"]}%` : "\u2014",
+      annualizedYield: q["annualizedYield"] ? `${(parseFloat(q["annualizedYield"]) * 100).toFixed(2)}%` : "\u2014",
       absYield: q["absYield"],
       notionalSz: q["notionalSz"],
       notionalCcy: q["notionalCcy"]
@@ -12523,16 +13025,17 @@ 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 homedir7 } from "os";
+import { join as join9, dirname as dirname6 } from "path";
+import { mkdirSync as mkdirSync8, rmSync, existsSync as existsSync7, 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");
+  const sibling = join9(dirname6(process.execPath), "npx");
   if (existsSync7(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.";
 async function cmdSkillSearch(run, opts) {
   const args = {};
   if (opts.keyword) args.keyword = opts.keyword;
@@ -12582,13 +13085,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 = join9(tmpdir(), `okx-skill-${randomUUID2()}`);
+  mkdirSync8(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, join9(tmpBase, "content"));
     const meta = readMetaJson(contentDir);
     validateSkillMdExists(contentDir);
     outputLine("Installing to detected agents...");
@@ -12598,7 +13101,7 @@ async function cmdSkillAdd(name, config, json) {
         timeout: 6e4
       });
     } catch (e) {
-      const savedZip = join11(process.cwd(), `${name}.zip`);
+      const savedZip = join9(process.cwd(), `${name}.zip`);
       try {
         copyFileSync2(zipPath, savedZip);
       } catch {
@@ -12608,23 +13111,19 @@ async function cmdSkillAdd(name, config, json) {
       throw e;
     }
     upsertSkillRecord(meta);
-    if (json) {
-      outputLine(JSON.stringify({ name: meta.name, version: meta.version, status: "installed" }, null, 2));
-    } else {
-      outputLine(`\u2713 Skill "${meta.name}" v${meta.version} installed`);
-    }
+    printSkillInstallResult(meta, json);
   } finally {
     rmSync(tmpBase, { recursive: true, force: true });
   }
 }
-async function cmdSkillDownload(name, targetDir, config, json) {
+async function cmdSkillDownload(name, targetDir, config, json, format = "zip") {
   outputLine(`Downloading ${name}...`);
   const client = new OkxRestClient(config);
-  const filePath = await downloadSkillZip(client, name, targetDir);
+  const filePath = await downloadSkillZip(client, name, targetDir, format);
   if (json) {
     outputLine(JSON.stringify({ name, filePath }, null, 2));
   } else {
-    outputLine(`\u2713 Downloaded ${name}.zip`);
+    outputLine(`\u2713 Downloaded ${name}.${format}`);
     outputLine(`  Path: ${filePath}`);
   }
 }
@@ -12641,7 +13140,7 @@ function cmdSkillRemove(name, json) {
       timeout: 6e4
     });
   } catch {
-    const agentsPath = join11(homedir9(), ".agents", "skills", name);
+    const agentsPath = join9(homedir7(), ".agents", "skills", name);
     try {
       rmSync(agentsPath, { recursive: true, force: true });
     } catch {
@@ -12705,11 +13204,19 @@ function cmdSkillList(json) {
   outputLine("");
   outputLine(`${skills.length} skills installed.`);
 }
+function printSkillInstallResult(meta, json) {
+  if (json) {
+    outputLine(JSON.stringify({ name: meta.name, version: meta.version, status: "installed" }, null, 2));
+  } else {
+    outputLine(`\u2713 Skill "${meta.name}" v${meta.version} installed`);
+    outputLine(`  ${THIRD_PARTY_INSTALL_NOTICE}`);
+  }
+}
 
 // src/index.ts
 var _require3 = createRequire3(import.meta.url);
 var CLI_VERSION2 = _require3("../package.json").version;
-var GIT_HASH2 = true ? "19e8da3" : "dev";
+var GIT_HASH2 = true ? "ee71999" : "dev";
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);
@@ -12739,51 +13246,54 @@ function handleSetupCommand(v) {
   });
 }
 function handleMarketPublicCommand(run, action, rest, v, json) {
-  if (action === "ticker") return cmdMarketTicker(run, rest[0], json);
-  if (action === "tickers") return cmdMarketTickers(run, rest[0], json);
+  if (action === "ticker") return cmdMarketTicker(run, rest[0], json, v.demo);
+  if (action === "tickers") return cmdMarketTickers(run, rest[0], json, v.demo);
   if (action === "instruments")
-    return cmdMarketInstruments(run, { instType: v.instType, instId: v.instId, json });
+    return cmdMarketInstruments(run, { instType: v.instType, instId: v.instId, json, demo: v.demo });
   if (action === "mark-price")
-    return cmdMarketMarkPrice(run, { instType: v.instType, instId: v.instId, json });
+    return cmdMarketMarkPrice(run, { instType: v.instType, instId: v.instId, json, demo: v.demo });
   if (action === "index-ticker")
-    return cmdMarketIndexTicker(run, { instId: v.instId, quoteCcy: v.quoteCcy, json });
-  if (action === "price-limit") return cmdMarketPriceLimit(run, rest[0], json);
+    return cmdMarketIndexTicker(run, { instId: v.instId, quoteCcy: v.quoteCcy, json, demo: v.demo });
+  if (action === "price-limit") return cmdMarketPriceLimit(run, rest[0], json, v.demo);
   if (action === "open-interest")
-    return cmdMarketOpenInterest(run, { instType: v.instType, instId: v.instId, json });
+    return cmdMarketOpenInterest(run, { instType: v.instType, instId: v.instId, json, demo: v.demo });
   if (action === "stock-tokens")
-    return cmdMarketStockTokens(run, { instType: v.instType, instId: v.instId, json });
+    return cmdMarketStockTokens(run, { instType: v.instType, instId: v.instId, json, demo: v.demo });
   if (action === "instruments-by-category")
     return cmdMarketInstrumentsByCategory(run, {
       instCategory: v.instCategory,
       instType: v.instType,
       instId: v.instId,
-      json
+      json,
+      demo: v.demo
     });
-  if (action === "indicator") {
-    const limit = v.limit !== void 0 ? Number(v.limit) : void 0;
-    const backtestTime = v["backtest-time"] !== void 0 ? Number(v["backtest-time"]) : void 0;
-    return cmdMarketIndicator(run, rest[0], rest[1], {
-      bar: v.bar,
-      params: v.params,
-      list: v.list,
-      limit,
-      backtestTime,
-      json
-    });
-  }
+  if (action === "indicator") return handleIndicatorAction(run, rest, v, json);
+}
+function handleIndicatorAction(run, rest, v, json) {
+  if (rest[0] === "list") return cmdMarketIndicatorList(json);
+  const limit = v.limit !== void 0 ? Number(v.limit) : void 0;
+  const backtestTime = v["backtest-time"] !== void 0 ? Number(v["backtest-time"]) : void 0;
+  return cmdMarketIndicator(run, rest[0], rest[1], {
+    bar: v.bar,
+    params: v.params,
+    list: v.list,
+    limit,
+    backtestTime,
+    json
+  });
 }
 function handleMarketDataCommand(run, action, rest, v, json) {
   const limit = v.limit !== void 0 ? Number(v.limit) : void 0;
   if (action === "orderbook")
-    return cmdMarketOrderbook(run, rest[0], v.sz !== void 0 ? Number(v.sz) : void 0, json);
+    return cmdMarketOrderbook(run, rest[0], v.sz !== void 0 ? Number(v.sz) : void 0, json, v.demo);
   if (action === "candles")
-    return cmdMarketCandles(run, rest[0], { bar: v.bar, limit, after: v.after, before: v.before, json });
+    return cmdMarketCandles(run, rest[0], { bar: v.bar, limit, after: v.after, before: v.before, json, demo: v.demo });
   if (action === "funding-rate")
-    return cmdMarketFundingRate(run, rest[0], { history: v.history ?? false, limit, json });
+    return cmdMarketFundingRate(run, rest[0], { history: v.history ?? false, limit, json, demo: v.demo });
   if (action === "trades")
-    return cmdMarketTrades(run, rest[0], { limit, json });
+    return cmdMarketTrades(run, rest[0], { limit, json, demo: v.demo });
   if (action === "index-candles")
-    return cmdMarketIndexCandles(run, rest[0], { bar: v.bar, limit, history: v.history ?? false, json });
+    return cmdMarketIndexCandles(run, rest[0], { bar: v.bar, limit, history: v.history ?? false, json, demo: v.demo });
 }
 function handleMarketCommand(run, action, rest, v, json) {
   return handleMarketPublicCommand(run, action, rest, v, json) ?? handleMarketDataCommand(run, action, rest, v, json);
@@ -13116,6 +13626,7 @@ function handleOptionCommand(run, action, rest, v, json) {
       side: v.side,
       ordType: v.ordType,
       sz: v.sz,
+      tgtCcy: v.tgtCcy,
       px: v.px,
       reduceOnly: v.reduceOnly,
       clOrdId: v.clOrdId,
@@ -13406,6 +13917,9 @@ function handleEarnSavingsCommand(run, action, rest, v, json) {
   if (action === "set-rate") return cmdEarnSetLendingRate(run, { ccy: v.ccy, rate: v.rate, json });
   if (action === "lending-history") return cmdEarnLendingHistory(run, { ccy: v.ccy, limit, json });
   if (action === "rate-history") return cmdEarnLendingRateHistory(run, { ccy: v.ccy, limit, json });
+  if (action === "fixed-orders") return cmdEarnFixedOrderList(run, { ccy: v.ccy, state: v.state, json });
+  if (action === "fixed-purchase") return cmdEarnFixedPurchase(run, { ccy: v.ccy, amt: v.amt, term: v.term, confirm: v.confirm ?? false, json });
+  if (action === "fixed-redeem") return cmdEarnFixedRedeem(run, { reqId: v.reqId, json });
   errorLine(`Unknown earn savings command: ${action}`);
   process.exitCode = 1;
 }
@@ -13488,8 +14002,9 @@ function handleSkillAdd(rest, config, json) {
   if (n) return cmdSkillAdd(n, config, json);
 }
 function handleSkillDownload(rest, v, config, json) {
-  const n = requireSkillName(rest, "Usage: okx skill download <name> [--dir <path>]");
-  if (n) return cmdSkillDownload(n, v.dir ?? process.cwd(), config, json);
+  const n = requireSkillName(rest, "Usage: okx skill download <name> [--dir <path>] [--format zip|skill]");
+  const format = v.format === "skill" ? "skill" : "zip";
+  if (n) return cmdSkillDownload(n, v.dir ?? process.cwd(), config, json, format);
 }
 function handleSkillRemove(rest, json) {
   const n = requireSkillName(rest, "Usage: okx skill remove <name>");
@@ -13524,6 +14039,35 @@ function printHelpForLevel(positionals) {
   else if (!subgroup) printHelp(module);
   else printHelp(module, subgroup);
 }
+function wrapRunnerWithLogger(baseRunner, logger, verbose = false) {
+  const writeToolNames = new Set(allToolSpecs().filter((t) => t.isWrite).map((t) => t.name));
+  return async (toolName, args) => {
+    const startTime = Date.now();
+    try {
+      const result = await baseRunner(toolName, args);
+      if (writeToolNames.has(toolName)) {
+        markFailedIfSCodeError(result.data);
+      }
+      const elapsed = Date.now() - startTime;
+      logger.log("info", toolName, args, { status: "ok" }, elapsed);
+      if (verbose) {
+        logger.log("debug", toolName, args, result, elapsed);
+      }
+      return result;
+    } catch (error) {
+      logger.log("error", toolName, args, error, Date.now() - startTime);
+      throw error;
+    }
+  };
+}
+async function runDiagnose(v) {
+  let config;
+  try {
+    config = loadProfileConfig({ profile: v.profile, demo: v.demo, live: v.live, verbose: v.verbose, userAgent: `okx-trade-cli/${CLI_VERSION2}`, sourceTag: "CLI" });
+  } catch {
+  }
+  return cmdDiagnose(config, v.profile ?? "default", { mcp: v.mcp, cli: v.cli, all: v.all, output: v.output });
+}
 async function main() {
   setOutput({
     out: (m) => process.stdout.write(m),
@@ -13545,25 +14089,14 @@ async function main() {
   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") {
-    let config2;
-    try {
-      config2 = loadProfileConfig({ profile: v.profile, demo: v.demo, live: v.live, verbose: v.verbose, userAgent: `okx-trade-cli/${CLI_VERSION2}`, sourceTag: "CLI" });
-    } catch {
-    }
-    return cmdDiagnose(config2, v.profile ?? "default", { mcp: v.mcp, cli: v.cli, all: v.all, output: v.output });
-  }
+  if (module === "diagnose") return runDiagnose(v);
   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);
   const client = new OkxRestClient(config);
   const baseRunner = createToolRunner(client, config);
-  const writeToolNames = new Set(allToolSpecs().filter((t) => t.isWrite).map((t) => t.name));
-  const run = async (toolName, args) => {
-    const result = await baseRunner(toolName, args);
-    if (writeToolNames.has(toolName)) {
-      markFailedIfSCodeError(result.data);
-    }
-    return result;
-  };
+  const logger = new TradeLogger(v.verbose ? "debug" : "info");
+  const run = wrapRunnerWithLogger(baseRunner, logger, v.verbose ?? false);
   const moduleHandlers = {
     market: () => handleMarketCommand(run, action, rest, v, json),
     account: () => handleAccountCommand(run, action, rest, v, json),
@@ -13608,7 +14141,8 @@ export {
   handleSpotCommand,
   handleSwapAlgoCommand,
   handleSwapCommand,
-  printHelp
+  printHelp,
+  wrapRunnerWithLogger
 };
 /*! Bundled license information: