@okx_ai/okx-trade-cli 1.2.3-beta.1 → 1.2.4-beta.0

package/dist/index.js

@@ -4,6 +4,7 @@
 import { createRequire as createRequire2 } from "module";
 
 // ../core/dist/index.js
+import { ProxyAgent } from "undici";
 import { createHmac } from "crypto";
 import fs from "fs";
 import path from "path";
@@ -1063,9 +1064,13 @@ function vlog(message) {
 var OkxRestClient = class {
   config;
   rateLimiter;
+  dispatcher;
   constructor(config) {
     this.config = config;
     this.rateLimiter = new RateLimiter(3e4, config.verbose);
+    if (config.proxyUrl) {
+      this.dispatcher = new ProxyAgent(config.proxyUrl);
+    }
   }
   logRequest(method, url, auth) {
     if (!this.config.verbose) return;
@@ -1225,12 +1230,16 @@ var OkxRestClient = class {
     const t0 = Date.now();
     let response;
     try {
-      response = await fetch(url, {
+      const fetchOptions = {
         method: reqConfig.method,
         headers,
         body: reqConfig.method === "POST" ? bodyJson : void 0,
         signal: AbortSignal.timeout(this.config.timeoutMs)
-      });
+      };
+      if (this.dispatcher) {
+        fetchOptions.dispatcher = this.dispatcher;
+      }
+      response = await fetch(url, fetchOptions);
     } catch (error) {
       if (this.config.verbose) {
         const elapsed2 = Date.now() - t0;
@@ -1982,7 +1991,7 @@ function registerAlgoTradeTools() {
           },
           sz: {
             type: "string",
-            description: "Contracts to close"
+            description: "Number of contracts to close (NOT USDT amount). Use market_get_instruments to get ctVal for conversion."
           },
           tpTriggerPx: {
             type: "string",
@@ -2077,7 +2086,7 @@ function registerAlgoTradeTools() {
           },
           sz: {
             type: "string",
-            description: "Contracts"
+            description: "Number of contracts (NOT USDT amount). Use market_get_instruments to get ctVal for conversion."
           },
           callbackRatio: {
             type: "string",
@@ -2382,7 +2391,7 @@ function registerGridTools() {
           algoOrdType: {
             type: "string",
             enum: ["grid", "contract_grid", "moon_grid"],
-            description: "grid=Spot, contract_grid=Contract, moon_grid=Moon"
+            description: "Grid bot type. grid=Spot, contract_grid=Contract, moon_grid=Moon. Must match the bot's actual type when filtering by algoId."
           },
           status: {
             type: "string",
@@ -2394,7 +2403,8 @@ function registerGridTools() {
             description: "e.g. BTC-USDT"
           },
           algoId: {
-            type: "string"
+            type: "string",
+            description: "Grid bot algo order ID (returned by grid_create_order or grid_get_orders). This is NOT a normal trade order ID."
           },
           after: {
             type: "string",
@@ -2442,10 +2452,11 @@ function registerGridTools() {
           algoOrdType: {
             type: "string",
             enum: ["grid", "contract_grid", "moon_grid"],
-            description: "grid=Spot, contract_grid=Contract, moon_grid=Moon"
+            description: "Must match the bot's actual type (use the algoOrdType value returned by grid_get_orders). grid=Spot, contract_grid=Contract, moon_grid=Moon."
           },
           algoId: {
-            type: "string"
+            type: "string",
+            description: "Grid bot algo order ID (returned by grid_create_order or grid_get_orders). This is NOT a normal trade order ID."
           }
         },
         required: ["algoOrdType", "algoId"]
@@ -2474,10 +2485,11 @@ function registerGridTools() {
           algoOrdType: {
             type: "string",
             enum: ["grid", "contract_grid", "moon_grid"],
-            description: "grid=Spot, contract_grid=Contract, moon_grid=Moon"
+            description: "Must match the bot's actual type (use the algoOrdType value returned by grid_get_orders). grid=Spot, contract_grid=Contract, moon_grid=Moon."
           },
           algoId: {
-            type: "string"
+            type: "string",
+            description: "Grid bot algo order ID (returned by grid_create_order or grid_get_orders). This is NOT a normal trade order ID."
           },
           type: {
             type: "string",
@@ -2485,7 +2497,8 @@ function registerGridTools() {
             description: "filled=executed trades (default); live=pending orders"
           },
           groupId: {
-            type: "string"
+            type: "string",
+            description: "Group ID \u2014 a buy-sell pair shares the same groupId. Use to filter a specific grid level."
           },
           after: {
             type: "string",
@@ -2620,12 +2633,13 @@ function registerGridTools() {
         type: "object",
         properties: {
           algoId: {
-            type: "string"
+            type: "string",
+            description: "Grid bot algo order ID (returned by grid_create_order or grid_get_orders). This is NOT a normal trade order ID."
           },
           algoOrdType: {
             type: "string",
             enum: ["grid", "contract_grid", "moon_grid"],
-            description: "grid=Spot, contract_grid=Contract, moon_grid=Moon"
+            description: "Must match the bot's actual type (use the algoOrdType value returned by grid_get_orders). grid=Spot, contract_grid=Contract, moon_grid=Moon."
           },
           instId: {
             type: "string",
@@ -2757,7 +2771,10 @@ function registerDcaTools() {
       inputSchema: {
         type: "object",
         properties: {
-          algoId: { type: "string", description: "Algo order ID of the DCA bot to stop" }
+          algoId: {
+            type: "string",
+            description: "DCA bot algo order ID (returned by dca_create_order or dca_get_orders). This is NOT a normal trade order ID."
+          }
         },
         required: ["algoId"]
       },
@@ -2785,7 +2802,10 @@ function registerDcaTools() {
             enum: ["active", "history"],
             description: "active=running (default); history=stopped"
           },
-          algoId: { type: "string" },
+          algoId: {
+            type: "string",
+            description: "DCA bot algo order ID (returned by dca_create_order or dca_get_orders). This is NOT a normal trade order ID."
+          },
           instId: { type: "string", description: "Filter by instrument, e.g. BTC-USDT-SWAP (optional)" },
           after: { type: "string", description: "Pagination: before this algo ID" },
           before: { type: "string", description: "Pagination: after this algo ID" },
@@ -2820,7 +2840,10 @@ function registerDcaTools() {
       inputSchema: {
         type: "object",
         properties: {
-          algoId: { type: "string" }
+          algoId: {
+            type: "string",
+            description: "DCA bot algo order ID (returned by dca_create_order or dca_get_orders). This is NOT a normal trade order ID."
+          }
         },
         required: ["algoId"]
       },
@@ -2843,7 +2866,10 @@ function registerDcaTools() {
       inputSchema: {
         type: "object",
         properties: {
-          algoId: { type: "string", description: "Algo order ID of the DCA bot" },
+          algoId: {
+            type: "string",
+            description: "DCA bot algo order ID (returned by dca_create_order or dca_get_orders). This is NOT a normal trade order ID."
+          },
           cycleId: { type: "string", description: "Omit to list all cycles; provide to get orders within a cycle" },
           after: { type: "string", description: "Pagination cursor \u2014 applies to cycle-list mode only (when cycleId is omitted)" },
           before: { type: "string", description: "Pagination cursor \u2014 applies to cycle-list mode only (when cycleId is omitted)" },
@@ -3130,639 +3156,645 @@ function registerEarnTools() {
     }
   ];
 }
-var FUTURES_INST_TYPES = ["FUTURES", "SWAP"];
-function normalize5(response) {
-  return {
-    endpoint: response.endpoint,
-    requestTime: response.requestTime,
-    data: response.data
-  };
-}
-function registerFuturesTools() {
+function registerOnchainEarnTools() {
   return [
+    // -------------------------------------------------------------------------
+    // Get Offers
+    // -------------------------------------------------------------------------
     {
-      name: "futures_place_order",
-      module: "futures",
-      description: "Place a FUTURES delivery contract order (e.g. instId: BTC-USDT-240329). Optionally attach TP/SL via tpTriggerPx/slTriggerPx. [CAUTION] Executes real trades. Private endpoint. Rate limit: 60 req/s.",
-      isWrite: true,
+      name: "onchain_earn_get_offers",
+      module: "earn.onchain",
+      description: "Get available on-chain earn (staking/DeFi) offers. Returns investment products with APY, terms, and limits. Private endpoint. Rate limit: 3 req/s.",
+      isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          instId: {
-            type: "string",
-            description: "e.g. BTC-USDT-240329"
-          },
-          tdMode: {
-            type: "string",
-            enum: ["cross", "isolated"],
-            description: "cross|isolated margin"
-          },
-          side: {
-            type: "string",
-            enum: ["buy", "sell"],
-            description: "one-way: buy=open long, sell=open short (use reduceOnly=true to close); hedge: combined with posSide"
-          },
-          posSide: {
-            type: "string",
-            enum: ["long", "short", "net"],
-            description: "net=one-way mode (default); long/short=hedge mode only"
-          },
-          ordType: {
-            type: "string",
-            enum: ["market", "limit", "post_only", "fok", "ioc"],
-            description: "market(no px)|limit(px req)|post_only(maker)|fok(all-or-cancel)|ioc(partial fill)"
-          },
-          sz: {
-            type: "string",
-            description: "Contracts"
-          },
-          px: {
-            type: "string",
-            description: "Required for limit/post_only/fok/ioc"
-          },
-          reduceOnly: {
-            type: "boolean",
-            description: "Close/reduce only, no new position (one-way mode)"
-          },
-          clOrdId: {
-            type: "string",
-            description: "Client order ID (max 32 chars)"
-          },
-          tpTriggerPx: {
-            type: "string",
-            description: "TP trigger price; places TP at tpOrdPx"
-          },
-          tpOrdPx: {
+          productId: {
             type: "string",
-            description: "TP order price; -1=market"
+            description: "Specific product ID to query. Omit for all offers."
           },
-          slTriggerPx: {
+          protocolType: {
             type: "string",
-            description: "SL trigger price; places SL at slOrdPx"
+            description: "Protocol type filter: staking, defi. Omit for all types."
           },
-          slOrdPx: {
+          ccy: {
             type: "string",
-            description: "SL order price; -1=market"
+            description: "Currency filter, e.g. ETH. Omit for all currencies."
           }
-        },
-        required: ["instId", "tdMode", "side", "ordType", "sz"]
+        }
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
-        const reduceOnly = args.reduceOnly;
-        const tpTriggerPx = readString(args, "tpTriggerPx");
-        const tpOrdPx = readString(args, "tpOrdPx");
-        const slTriggerPx = readString(args, "slTriggerPx");
-        const slOrdPx = readString(args, "slOrdPx");
-        const algoEntry = compactObject({ tpTriggerPx, tpOrdPx, slTriggerPx, slOrdPx });
-        const attachAlgoOrds = Object.keys(algoEntry).length > 0 ? [algoEntry] : void 0;
-        const response = await context.client.privatePost(
-          "/api/v5/trade/order",
+        const response = await context.client.privateGet(
+          "/api/v5/finance/staking-defi/offers",
           compactObject({
-            instId: requireString(args, "instId"),
-            tdMode: requireString(args, "tdMode"),
-            side: requireString(args, "side"),
-            posSide: readString(args, "posSide"),
-            ordType: requireString(args, "ordType"),
-            sz: requireString(args, "sz"),
-            px: readString(args, "px"),
-            reduceOnly: typeof reduceOnly === "boolean" ? String(reduceOnly) : void 0,
-            clOrdId: readString(args, "clOrdId"),
-            tag: context.config.sourceTag,
-            attachAlgoOrds
+            productId: readString(args, "productId"),
+            protocolType: readString(args, "protocolType"),
+            ccy: readString(args, "ccy")
           }),
-          privateRateLimit("futures_place_order", 60)
+          privateRateLimit("onchain_earn_get_offers", 3)
         );
-        return normalize5(response);
+        return normalizeResponse(response);
       }
     },
+    // -------------------------------------------------------------------------
+    // Purchase
+    // -------------------------------------------------------------------------
     {
-      name: "futures_cancel_order",
-      module: "futures",
-      description: "Cancel an unfilled FUTURES delivery order. Private endpoint. Rate limit: 60 req/s.",
+      name: "onchain_earn_purchase",
+      module: "earn.onchain",
+      description: "Purchase on-chain earn (staking/DeFi) product. [CAUTION] Moves real funds into staking/DeFi product. Not supported in demo/simulated trading mode. Private endpoint. Rate limit: 2 req/s.",
       isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          instId: {
+          productId: {
             type: "string",
-            description: "e.g. BTC-USDT-240329"
+            description: "Product ID to purchase"
           },
-          ordId: {
-            type: "string"
+          investData: {
+            type: "array",
+            description: "Investment data array: [{ccy, amt}]. Each item specifies currency and amount.",
+            items: {
+              type: "object",
+              properties: {
+                ccy: { type: "string", description: "Currency, e.g. ETH" },
+                amt: { type: "string", description: "Amount to invest" }
+              },
+              required: ["ccy", "amt"]
+            }
           },
-          clOrdId: {
+          term: {
             type: "string",
-            description: "Client order ID"
+            description: "Investment term in days. Required for fixed-term products."
+          },
+          tag: {
+            type: "string",
+            description: "Order tag for tracking (optional)."
           }
         },
-        required: ["instId"]
+        required: ["productId", "investData"]
       },
       handler: async (rawArgs, context) => {
+        assertNotDemo(context.config, "onchain_earn_purchase");
         const args = asRecord(rawArgs);
         const response = await context.client.privatePost(
-          "/api/v5/trade/cancel-order",
+          "/api/v5/finance/staking-defi/purchase",
           compactObject({
-            instId: requireString(args, "instId"),
-            ordId: readString(args, "ordId"),
-            clOrdId: readString(args, "clOrdId")
+            productId: requireString(args, "productId"),
+            investData: args.investData,
+            term: readString(args, "term"),
+            tag: readString(args, "tag")
           }),
-          privateRateLimit("futures_cancel_order", 60)
+          privateRateLimit("onchain_earn_purchase", 2)
         );
-        return normalize5(response);
+        return normalizeResponse(response);
       }
     },
+    // -------------------------------------------------------------------------
+    // Redeem
+    // -------------------------------------------------------------------------
     {
-      name: "futures_get_order",
-      module: "futures",
-      description: "Get details of a single FUTURES delivery order by ordId or clOrdId. Private endpoint. Rate limit: 60 req/s.",
-      isWrite: false,
+      name: "onchain_earn_redeem",
+      module: "earn.onchain",
+      description: "Redeem on-chain earn (staking/DeFi) investment. [CAUTION] Withdraws funds from staking/DeFi product. Some products may have lock periods. Not supported in demo mode. Private endpoint. Rate limit: 2 req/s.",
+      isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          instId: {
-            type: "string",
-            description: "e.g. BTC-USDT-240329"
-          },
           ordId: {
             type: "string",
-            description: "Provide ordId or clOrdId"
+            description: "Order ID to redeem"
           },
-          clOrdId: {
+          protocolType: {
             type: "string",
-            description: "Provide ordId or clOrdId"
+            description: "Protocol type: staking, defi"
+          },
+          allowEarlyRedeem: {
+            type: "boolean",
+            description: "Allow early redemption for fixed-term products (may incur penalties). Default false."
           }
         },
-        required: ["instId"]
+        required: ["ordId", "protocolType"]
       },
       handler: async (rawArgs, context) => {
+        assertNotDemo(context.config, "onchain_earn_redeem");
         const args = asRecord(rawArgs);
-        const response = await context.client.privateGet(
-          "/api/v5/trade/order",
+        const response = await context.client.privatePost(
+          "/api/v5/finance/staking-defi/redeem",
           compactObject({
-            instId: requireString(args, "instId"),
-            ordId: readString(args, "ordId"),
-            clOrdId: readString(args, "clOrdId")
+            ordId: requireString(args, "ordId"),
+            protocolType: requireString(args, "protocolType"),
+            allowEarlyRedeem: readBoolean(args, "allowEarlyRedeem")
           }),
-          privateRateLimit("futures_get_order", 60)
+          privateRateLimit("onchain_earn_redeem", 2)
         );
-        return normalize5(response);
+        return normalizeResponse(response);
       }
     },
+    // -------------------------------------------------------------------------
+    // Cancel
+    // -------------------------------------------------------------------------
     {
-      name: "futures_get_orders",
-      module: "futures",
-      description: "Query FUTURES open orders, history (last 7 days), or archive (up to 3 months). Private. Rate limit: 20 req/s.",
-      isWrite: false,
+      name: "onchain_earn_cancel",
+      module: "earn.onchain",
+      description: "Cancel pending on-chain earn purchase. [CAUTION] Cancels a pending investment order. Not supported in demo mode. Private endpoint. Rate limit: 2 req/s.",
+      isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          status: {
-            type: "string",
-            enum: ["open", "history", "archive"],
-            description: "open=active, history=7d, archive=3mo"
-          },
-          instType: {
-            type: "string",
-            enum: [...FUTURES_INST_TYPES],
-            description: "FUTURES (default) or SWAP"
-          },
-          instId: {
+          ordId: {
             type: "string",
-            description: "e.g. BTC-USDT-240329"
+            description: "Order ID to cancel"
           },
-          ordType: {
+          protocolType: {
             type: "string",
-            description: "Order type filter"
-          },
-          state: {
-            type: "string",
-            description: "canceled|filled"
-          },
-          after: {
-            type: "string",
-            description: "Pagination: before this order ID"
-          },
-          before: {
-            type: "string",
-            description: "Pagination: after this order ID"
-          },
-          begin: {
-            type: "string",
-            description: "Start time (ms)"
-          },
-          end: {
-            type: "string",
-            description: "End time (ms)"
-          },
-          limit: {
-            type: "number",
-            description: "Max results (default 100)"
+            description: "Protocol type: staking, defi"
           }
-        }
+        },
+        required: ["ordId", "protocolType"]
       },
       handler: async (rawArgs, context) => {
+        assertNotDemo(context.config, "onchain_earn_cancel");
         const args = asRecord(rawArgs);
-        const status = readString(args, "status") ?? "open";
-        const instType = readString(args, "instType") ?? "FUTURES";
-        assertEnum(instType, "instType", FUTURES_INST_TYPES);
-        const path4 = status === "archive" ? "/api/v5/trade/orders-history-archive" : status === "history" ? "/api/v5/trade/orders-history" : "/api/v5/trade/orders-pending";
-        const response = await context.client.privateGet(
-          path4,
-          compactObject({
-            instType,
-            instId: readString(args, "instId"),
-            ordType: readString(args, "ordType"),
-            state: readString(args, "state"),
-            after: readString(args, "after"),
-            before: readString(args, "before"),
-            begin: readString(args, "begin"),
-            end: readString(args, "end"),
-            limit: readNumber(args, "limit")
-          }),
-          privateRateLimit("futures_get_orders", 20)
+        const response = await context.client.privatePost(
+          "/api/v5/finance/staking-defi/cancel",
+          {
+            ordId: requireString(args, "ordId"),
+            protocolType: requireString(args, "protocolType")
+          },
+          privateRateLimit("onchain_earn_cancel", 2)
         );
-        return normalize5(response);
+        return normalizeResponse(response);
       }
     },
+    // -------------------------------------------------------------------------
+    // Get Active Orders
+    // -------------------------------------------------------------------------
     {
-      name: "futures_get_positions",
-      module: "futures",
-      description: "Get current FUTURES delivery contract positions. Private endpoint. Rate limit: 10 req/s.",
+      name: "onchain_earn_get_active_orders",
+      module: "earn.onchain",
+      description: "Get active on-chain earn orders. Returns current staking/DeFi investments. Private endpoint. Rate limit: 3 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          instType: {
+          productId: {
             type: "string",
-            enum: [...FUTURES_INST_TYPES],
-            description: "FUTURES (default) or SWAP"
+            description: "Filter by product ID. Omit for all."
           },
-          instId: {
+          protocolType: {
             type: "string",
-            description: "e.g. BTC-USDT-240329"
+            description: "Filter by protocol type: staking, defi. Omit for all."
           },
-          posId: {
-            type: "string"
+          ccy: {
+            type: "string",
+            description: "Filter by currency, e.g. ETH. Omit for all."
+          },
+          state: {
+            type: "string",
+            description: "Filter by state: 8 (pending), 13 (cancelling), 9 (onchain), 1 (earning), 2 (redeeming). Omit for all."
           }
         }
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
-        const instType = readString(args, "instType") ?? "FUTURES";
-        assertEnum(instType, "instType", FUTURES_INST_TYPES);
         const response = await context.client.privateGet(
-          "/api/v5/account/positions",
+          "/api/v5/finance/staking-defi/orders-active",
           compactObject({
-            instType,
-            instId: readString(args, "instId"),
-            posId: readString(args, "posId")
+            productId: readString(args, "productId"),
+            protocolType: readString(args, "protocolType"),
+            ccy: readString(args, "ccy"),
+            state: readString(args, "state")
           }),
-          privateRateLimit("futures_get_positions", 10)
+          privateRateLimit("onchain_earn_get_active_orders", 3)
         );
-        return normalize5(response);
+        return normalizeResponse(response);
       }
     },
+    // -------------------------------------------------------------------------
+    // Get Order History
+    // -------------------------------------------------------------------------
     {
-      name: "futures_get_fills",
-      module: "futures",
-      description: "Get FUTURES fill details. archive=false: last 3 days. archive=true: up to 3 months. Private. Rate limit: 20 req/s.",
+      name: "onchain_earn_get_order_history",
+      module: "earn.onchain",
+      description: "Get on-chain earn order history. Returns past staking/DeFi investments including redeemed orders. Private endpoint. Rate limit: 3 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          archive: {
-            type: "boolean",
-            description: "true=up to 3 months; false=last 3 days (default)"
-          },
-          instType: {
+          productId: {
             type: "string",
-            enum: [...FUTURES_INST_TYPES],
-            description: "FUTURES (default) or SWAP"
+            description: "Filter by product ID. Omit for all."
           },
-          instId: {
+          protocolType: {
             type: "string",
-            description: "Instrument ID filter"
+            description: "Filter by protocol type: staking, defi. Omit for all."
           },
-          ordId: {
+          ccy: {
             type: "string",
-            description: "Order ID filter"
+            description: "Filter by currency, e.g. ETH. Omit for all."
           },
           after: {
             type: "string",
-            description: "Pagination: before this bill ID"
+            description: "Pagination: return results before this order ID"
           },
           before: {
             type: "string",
-            description: "Pagination: after this bill ID"
-          },
-          begin: {
-            type: "string",
-            description: "Start time (ms)"
-          },
-          end: {
-            type: "string",
-            description: "End time (ms)"
+            description: "Pagination: return results after this order ID"
           },
           limit: {
-            type: "number",
-            description: "Max results (default 100 or 20 for archive)"
+            type: "string",
+            description: "Max results to return (default 100, max 100)"
           }
         }
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
-        const archive = readBoolean(args, "archive") ?? false;
-        const instType = readString(args, "instType") ?? "FUTURES";
-        assertEnum(instType, "instType", FUTURES_INST_TYPES);
-        const path4 = archive ? "/api/v5/trade/fills-history" : "/api/v5/trade/fills";
         const response = await context.client.privateGet(
-          path4,
+          "/api/v5/finance/staking-defi/orders-history",
           compactObject({
-            instType,
-            instId: readString(args, "instId"),
-            ordId: readString(args, "ordId"),
+            productId: readString(args, "productId"),
+            protocolType: readString(args, "protocolType"),
+            ccy: readString(args, "ccy"),
             after: readString(args, "after"),
             before: readString(args, "before"),
-            begin: readString(args, "begin"),
-            end: readString(args, "end"),
-            limit: readNumber(args, "limit") ?? (archive ? 20 : void 0)
+            limit: readString(args, "limit")
           }),
-          privateRateLimit("futures_get_fills", 20)
+          privateRateLimit("onchain_earn_get_order_history", 3)
         );
-        return normalize5(response);
+        return normalizeResponse(response);
       }
     }
   ];
 }
-function registerOnchainEarnTools() {
+function registerAllEarnTools() {
+  return [
+    ...registerEarnTools(),
+    ...registerOnchainEarnTools()
+  ];
+}
+var FUTURES_INST_TYPES = ["FUTURES", "SWAP"];
+function normalize5(response) {
+  return {
+    endpoint: response.endpoint,
+    requestTime: response.requestTime,
+    data: response.data
+  };
+}
+function registerFuturesTools() {
   return [
-    // -------------------------------------------------------------------------
-    // Get Offers
-    // -------------------------------------------------------------------------
     {
-      name: "onchain_earn_get_offers",
-      module: "earn.onchain",
-      description: "Get available on-chain earn (staking/DeFi) offers. Returns investment products with APY, terms, and limits. Private endpoint. Rate limit: 3 req/s.",
-      isWrite: false,
+      name: "futures_place_order",
+      module: "futures",
+      description: "Place a FUTURES delivery contract order (e.g. instId: BTC-USDT-240329). Optionally attach TP/SL via tpTriggerPx/slTriggerPx. [CAUTION] Executes real trades. Private endpoint. Rate limit: 60 req/s.",
+      isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          productId: {
+          instId: {
             type: "string",
-            description: "Specific product ID to query. Omit for all offers."
+            description: "e.g. BTC-USDT-240329"
           },
-          protocolType: {
+          tdMode: {
             type: "string",
-            description: "Protocol type filter: staking, defi. Omit for all types."
+            enum: ["cross", "isolated"],
+            description: "cross|isolated margin"
           },
-          ccy: {
+          side: {
             type: "string",
-            description: "Currency filter, e.g. ETH. Omit for all currencies."
+            enum: ["buy", "sell"],
+            description: "one-way: buy=open long, sell=open short (use reduceOnly=true to close); hedge: combined with posSide"
+          },
+          posSide: {
+            type: "string",
+            enum: ["long", "short", "net"],
+            description: "net=one-way mode (default); long/short=hedge mode only"
+          },
+          ordType: {
+            type: "string",
+            enum: ["market", "limit", "post_only", "fok", "ioc"],
+            description: "market(no px)|limit(px req)|post_only(maker)|fok(all-or-cancel)|ioc(partial fill)"
+          },
+          sz: {
+            type: "string",
+            description: "Number of contracts (NOT USDT amount). Use market_get_instruments to get ctVal for conversion."
+          },
+          px: {
+            type: "string",
+            description: "Required for limit/post_only/fok/ioc"
+          },
+          reduceOnly: {
+            type: "boolean",
+            description: "Close/reduce only, no new position (one-way mode)"
+          },
+          clOrdId: {
+            type: "string",
+            description: "Client order ID (max 32 chars)"
+          },
+          tpTriggerPx: {
+            type: "string",
+            description: "TP trigger price; places TP at tpOrdPx"
+          },
+          tpOrdPx: {
+            type: "string",
+            description: "TP order price; -1=market"
+          },
+          slTriggerPx: {
+            type: "string",
+            description: "SL trigger price; places SL at slOrdPx"
+          },
+          slOrdPx: {
+            type: "string",
+            description: "SL order price; -1=market"
           }
-        }
+        },
+        required: ["instId", "tdMode", "side", "ordType", "sz"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
-        const response = await context.client.privateGet(
-          "/api/v5/finance/staking-defi/offers",
+        const reduceOnly = args.reduceOnly;
+        const tpTriggerPx = readString(args, "tpTriggerPx");
+        const tpOrdPx = readString(args, "tpOrdPx");
+        const slTriggerPx = readString(args, "slTriggerPx");
+        const slOrdPx = readString(args, "slOrdPx");
+        const algoEntry = compactObject({ tpTriggerPx, tpOrdPx, slTriggerPx, slOrdPx });
+        const attachAlgoOrds = Object.keys(algoEntry).length > 0 ? [algoEntry] : void 0;
+        const response = await context.client.privatePost(
+          "/api/v5/trade/order",
           compactObject({
-            productId: readString(args, "productId"),
-            protocolType: readString(args, "protocolType"),
-            ccy: readString(args, "ccy")
+            instId: requireString(args, "instId"),
+            tdMode: requireString(args, "tdMode"),
+            side: requireString(args, "side"),
+            posSide: readString(args, "posSide"),
+            ordType: requireString(args, "ordType"),
+            sz: requireString(args, "sz"),
+            px: readString(args, "px"),
+            reduceOnly: typeof reduceOnly === "boolean" ? String(reduceOnly) : void 0,
+            clOrdId: readString(args, "clOrdId"),
+            tag: context.config.sourceTag,
+            attachAlgoOrds
           }),
-          privateRateLimit("onchain_earn_get_offers", 3)
+          privateRateLimit("futures_place_order", 60)
         );
-        return normalizeResponse(response);
+        return normalize5(response);
       }
     },
-    // -------------------------------------------------------------------------
-    // Purchase
-    // -------------------------------------------------------------------------
     {
-      name: "onchain_earn_purchase",
-      module: "earn.onchain",
-      description: "Purchase on-chain earn (staking/DeFi) product. [CAUTION] Moves real funds into staking/DeFi product. Not supported in demo/simulated trading mode. Private endpoint. Rate limit: 2 req/s.",
+      name: "futures_cancel_order",
+      module: "futures",
+      description: "Cancel an unfilled FUTURES delivery order. Private endpoint. Rate limit: 60 req/s.",
       isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          productId: {
+          instId: {
             type: "string",
-            description: "Product ID to purchase"
-          },
-          investData: {
-            type: "array",
-            description: "Investment data array: [{ccy, amt}]. Each item specifies currency and amount.",
-            items: {
-              type: "object",
-              properties: {
-                ccy: { type: "string", description: "Currency, e.g. ETH" },
-                amt: { type: "string", description: "Amount to invest" }
-              },
-              required: ["ccy", "amt"]
-            }
+            description: "e.g. BTC-USDT-240329"
           },
-          term: {
-            type: "string",
-            description: "Investment term in days. Required for fixed-term products."
+          ordId: {
+            type: "string"
           },
-          tag: {
+          clOrdId: {
             type: "string",
-            description: "Order tag for tracking (optional)."
+            description: "Client order ID"
           }
         },
-        required: ["productId", "investData"]
+        required: ["instId"]
       },
       handler: async (rawArgs, context) => {
-        assertNotDemo(context.config, "onchain_earn_purchase");
         const args = asRecord(rawArgs);
         const response = await context.client.privatePost(
-          "/api/v5/finance/staking-defi/purchase",
+          "/api/v5/trade/cancel-order",
           compactObject({
-            productId: requireString(args, "productId"),
-            investData: args.investData,
-            term: readString(args, "term"),
-            tag: readString(args, "tag")
+            instId: requireString(args, "instId"),
+            ordId: readString(args, "ordId"),
+            clOrdId: readString(args, "clOrdId")
           }),
-          privateRateLimit("onchain_earn_purchase", 2)
+          privateRateLimit("futures_cancel_order", 60)
         );
-        return normalizeResponse(response);
+        return normalize5(response);
       }
     },
-    // -------------------------------------------------------------------------
-    // Redeem
-    // -------------------------------------------------------------------------
     {
-      name: "onchain_earn_redeem",
-      module: "earn.onchain",
-      description: "Redeem on-chain earn (staking/DeFi) investment. [CAUTION] Withdraws funds from staking/DeFi product. Some products may have lock periods. Not supported in demo mode. Private endpoint. Rate limit: 2 req/s.",
-      isWrite: true,
+      name: "futures_get_order",
+      module: "futures",
+      description: "Get details of a single FUTURES delivery order by ordId or clOrdId. Private endpoint. Rate limit: 60 req/s.",
+      isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          ordId: {
+          instId: {
             type: "string",
-            description: "Order ID to redeem"
+            description: "e.g. BTC-USDT-240329"
           },
-          protocolType: {
+          ordId: {
             type: "string",
-            description: "Protocol type: staking, defi"
+            description: "Provide ordId or clOrdId"
           },
-          allowEarlyRedeem: {
-            type: "boolean",
-            description: "Allow early redemption for fixed-term products (may incur penalties). Default false."
+          clOrdId: {
+            type: "string",
+            description: "Provide ordId or clOrdId"
           }
         },
-        required: ["ordId", "protocolType"]
+        required: ["instId"]
       },
       handler: async (rawArgs, context) => {
-        assertNotDemo(context.config, "onchain_earn_redeem");
         const args = asRecord(rawArgs);
-        const response = await context.client.privatePost(
-          "/api/v5/finance/staking-defi/redeem",
+        const response = await context.client.privateGet(
+          "/api/v5/trade/order",
           compactObject({
-            ordId: requireString(args, "ordId"),
-            protocolType: requireString(args, "protocolType"),
-            allowEarlyRedeem: readBoolean(args, "allowEarlyRedeem")
+            instId: requireString(args, "instId"),
+            ordId: readString(args, "ordId"),
+            clOrdId: readString(args, "clOrdId")
           }),
-          privateRateLimit("onchain_earn_redeem", 2)
+          privateRateLimit("futures_get_order", 60)
         );
-        return normalizeResponse(response);
+        return normalize5(response);
       }
     },
-    // -------------------------------------------------------------------------
-    // Cancel
-    // -------------------------------------------------------------------------
     {
-      name: "onchain_earn_cancel",
-      module: "earn.onchain",
-      description: "Cancel pending on-chain earn purchase. [CAUTION] Cancels a pending investment order. Not supported in demo mode. Private endpoint. Rate limit: 2 req/s.",
-      isWrite: true,
+      name: "futures_get_orders",
+      module: "futures",
+      description: "Query FUTURES open orders, history (last 7 days), or archive (up to 3 months). Private. Rate limit: 20 req/s.",
+      isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          ordId: {
+          status: {
             type: "string",
-            description: "Order ID to cancel"
+            enum: ["open", "history", "archive"],
+            description: "open=active, history=7d, archive=3mo"
           },
-          protocolType: {
+          instType: {
             type: "string",
-            description: "Protocol type: staking, defi"
+            enum: [...FUTURES_INST_TYPES],
+            description: "FUTURES (default) or SWAP"
+          },
+          instId: {
+            type: "string",
+            description: "e.g. BTC-USDT-240329"
+          },
+          ordType: {
+            type: "string",
+            description: "Order type filter"
+          },
+          state: {
+            type: "string",
+            description: "canceled|filled"
+          },
+          after: {
+            type: "string",
+            description: "Pagination: before this order ID"
+          },
+          before: {
+            type: "string",
+            description: "Pagination: after this order ID"
+          },
+          begin: {
+            type: "string",
+            description: "Start time (ms)"
+          },
+          end: {
+            type: "string",
+            description: "End time (ms)"
+          },
+          limit: {
+            type: "number",
+            description: "Max results (default 100)"
           }
-        },
-        required: ["ordId", "protocolType"]
+        }
       },
       handler: async (rawArgs, context) => {
-        assertNotDemo(context.config, "onchain_earn_cancel");
         const args = asRecord(rawArgs);
-        const response = await context.client.privatePost(
-          "/api/v5/finance/staking-defi/cancel",
-          {
-            ordId: requireString(args, "ordId"),
-            protocolType: requireString(args, "protocolType")
-          },
-          privateRateLimit("onchain_earn_cancel", 2)
+        const status = readString(args, "status") ?? "open";
+        const instType = readString(args, "instType") ?? "FUTURES";
+        assertEnum(instType, "instType", FUTURES_INST_TYPES);
+        const path4 = status === "archive" ? "/api/v5/trade/orders-history-archive" : status === "history" ? "/api/v5/trade/orders-history" : "/api/v5/trade/orders-pending";
+        const response = await context.client.privateGet(
+          path4,
+          compactObject({
+            instType,
+            instId: readString(args, "instId"),
+            ordType: readString(args, "ordType"),
+            state: readString(args, "state"),
+            after: readString(args, "after"),
+            before: readString(args, "before"),
+            begin: readString(args, "begin"),
+            end: readString(args, "end"),
+            limit: readNumber(args, "limit")
+          }),
+          privateRateLimit("futures_get_orders", 20)
         );
-        return normalizeResponse(response);
+        return normalize5(response);
       }
     },
-    // -------------------------------------------------------------------------
-    // Get Active Orders
-    // -------------------------------------------------------------------------
     {
-      name: "onchain_earn_get_active_orders",
-      module: "earn.onchain",
-      description: "Get active on-chain earn orders. Returns current staking/DeFi investments. Private endpoint. Rate limit: 3 req/s.",
+      name: "futures_get_positions",
+      module: "futures",
+      description: "Get current FUTURES delivery contract positions. Private endpoint. Rate limit: 10 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          productId: {
-            type: "string",
-            description: "Filter by product ID. Omit for all."
-          },
-          protocolType: {
+          instType: {
             type: "string",
-            description: "Filter by protocol type: staking, defi. Omit for all."
+            enum: [...FUTURES_INST_TYPES],
+            description: "FUTURES (default) or SWAP"
           },
-          ccy: {
+          instId: {
             type: "string",
-            description: "Filter by currency, e.g. ETH. Omit for all."
+            description: "e.g. BTC-USDT-240329"
           },
-          state: {
-            type: "string",
-            description: "Filter by state: 8 (pending), 13 (cancelling), 9 (onchain), 1 (earning), 2 (redeeming). Omit for all."
+          posId: {
+            type: "string"
           }
         }
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
+        const instType = readString(args, "instType") ?? "FUTURES";
+        assertEnum(instType, "instType", FUTURES_INST_TYPES);
         const response = await context.client.privateGet(
-          "/api/v5/finance/staking-defi/orders-active",
+          "/api/v5/account/positions",
           compactObject({
-            productId: readString(args, "productId"),
-            protocolType: readString(args, "protocolType"),
-            ccy: readString(args, "ccy"),
-            state: readString(args, "state")
+            instType,
+            instId: readString(args, "instId"),
+            posId: readString(args, "posId")
           }),
-          privateRateLimit("onchain_earn_get_active_orders", 3)
+          privateRateLimit("futures_get_positions", 10)
         );
-        return normalizeResponse(response);
+        return normalize5(response);
       }
     },
-    // -------------------------------------------------------------------------
-    // Get Order History
-    // -------------------------------------------------------------------------
     {
-      name: "onchain_earn_get_order_history",
-      module: "earn.onchain",
-      description: "Get on-chain earn order history. Returns past staking/DeFi investments including redeemed orders. Private endpoint. Rate limit: 3 req/s.",
+      name: "futures_get_fills",
+      module: "futures",
+      description: "Get FUTURES fill details. archive=false: last 3 days. archive=true: up to 3 months. Private. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          productId: {
+          archive: {
+            type: "boolean",
+            description: "true=up to 3 months; false=last 3 days (default)"
+          },
+          instType: {
             type: "string",
-            description: "Filter by product ID. Omit for all."
+            enum: [...FUTURES_INST_TYPES],
+            description: "FUTURES (default) or SWAP"
           },
-          protocolType: {
+          instId: {
             type: "string",
-            description: "Filter by protocol type: staking, defi. Omit for all."
+            description: "Instrument ID filter"
           },
-          ccy: {
+          ordId: {
             type: "string",
-            description: "Filter by currency, e.g. ETH. Omit for all."
+            description: "Order ID filter"
           },
           after: {
             type: "string",
-            description: "Pagination: return results before this order ID"
+            description: "Pagination: before this bill ID"
           },
           before: {
             type: "string",
-            description: "Pagination: return results after this order ID"
+            description: "Pagination: after this bill ID"
           },
-          limit: {
+          begin: {
             type: "string",
-            description: "Max results to return (default 100, max 100)"
+            description: "Start time (ms)"
+          },
+          end: {
+            type: "string",
+            description: "End time (ms)"
+          },
+          limit: {
+            type: "number",
+            description: "Max results (default 100 or 20 for archive)"
           }
         }
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
+        const archive = readBoolean(args, "archive") ?? false;
+        const instType = readString(args, "instType") ?? "FUTURES";
+        assertEnum(instType, "instType", FUTURES_INST_TYPES);
+        const path4 = archive ? "/api/v5/trade/fills-history" : "/api/v5/trade/fills";
         const response = await context.client.privateGet(
-          "/api/v5/finance/staking-defi/orders-history",
+          path4,
           compactObject({
-            productId: readString(args, "productId"),
-            protocolType: readString(args, "protocolType"),
-            ccy: readString(args, "ccy"),
+            instType,
+            instId: readString(args, "instId"),
+            ordId: readString(args, "ordId"),
             after: readString(args, "after"),
             before: readString(args, "before"),
-            limit: readString(args, "limit")
+            begin: readString(args, "begin"),
+            end: readString(args, "end"),
+            limit: readNumber(args, "limit") ?? (archive ? 20 : void 0)
           }),
-          privateRateLimit("onchain_earn_get_order_history", 3)
+          privateRateLimit("futures_get_fills", 20)
         );
-        return normalizeResponse(response);
+        return normalize5(response);
       }
     }
   ];
@@ -4284,7 +4316,7 @@ function registerOptionTools() {
           },
           sz: {
             type: "string",
-            description: "Number of contracts"
+            description: "Number of contracts (NOT USDT amount). Use market_get_instruments to get ctVal for conversion."
           },
           px: {
             type: "string",
@@ -4391,7 +4423,7 @@ function registerOptionTools() {
           instId: { type: "string", description: "e.g. BTC-USD-241227-50000-C" },
           ordId: { type: "string" },
           clOrdId: { type: "string" },
-          newSz: { type: "string", description: "New quantity (contracts)" },
+          newSz: { type: "string", description: "New number of contracts (NOT USDT amount)" },
           newPx: { type: "string", description: "New price" }
         },
         required: ["instId"]
@@ -4763,17 +4795,20 @@ function registerSpotTradeTools() {
             description: "e.g. BTC-USDT"
           },
           ordId: {
-            type: "string"
+            type: "string",
+            description: "Order ID"
           },
           clOrdId: {
             type: "string",
             description: "Client order ID"
           },
           newSz: {
-            type: "string"
+            type: "string",
+            description: "New order size in base currency (e.g. BTC amount)"
           },
           newPx: {
-            type: "string"
+            type: "string",
+            description: "New order price"
           },
           newClOrdId: {
             type: "string",
@@ -4948,7 +4983,7 @@ function registerSpotTradeTools() {
         properties: {
           instId: { type: "string", description: "e.g. BTC-USDT" },
           algoId: { type: "string", description: "Algo order ID" },
-          newSz: { type: "string" },
+          newSz: { type: "string", description: "New order size in base currency (e.g. BTC amount)" },
           newTpTriggerPx: { type: "string", description: "New TP trigger price" },
           newTpOrdPx: { type: "string", description: "New TP order price; -1=market" },
           newSlTriggerPx: { type: "string", description: "New SL trigger price" },
@@ -5353,7 +5388,7 @@ function registerSwapTradeTools() {
           },
           sz: {
             type: "string",
-            description: "Contracts (e.g. '1'; BTC-USDT-SWAP: 1ct=0.01 BTC)"
+            description: "Number of contracts (NOT USDT amount). Use market_get_instruments to get ctVal for conversion."
           },
           px: {
             type: "string",
@@ -5618,7 +5653,7 @@ function registerSwapTradeTools() {
         properties: {
           instId: { type: "string", description: "e.g. BTC-USDT-SWAP" },
           algoId: { type: "string", description: "Algo order ID" },
-          newSz: { type: "string", description: "New quantity (contracts)" },
+          newSz: { type: "string", description: "New number of contracts (NOT USDT amount)" },
           newTpTriggerPx: { type: "string", description: "New TP trigger price" },
           newTpOrdPx: { type: "string", description: "New TP order price; -1=market" },
           newSlTriggerPx: { type: "string", description: "New SL trigger price" },
@@ -5971,8 +6006,7 @@ function allToolSpecs() {
     ...registerAlgoTradeTools(),
     ...registerAccountTools(),
     ...registerBotTools(),
-    ...registerEarnTools(),
-    ...registerOnchainEarnTools(),
+    ...registerAllEarnTools(),
     ...registerAuditTools()
   ];
 }
@@ -6095,6 +6129,13 @@ function loadConfig(cli) {
       "Set OKX_TIMEOUT_MS as a positive integer in milliseconds."
     );
   }
+  const rawProxyUrl = toml.proxy_url?.trim();
+  if (rawProxyUrl && !rawProxyUrl.startsWith("http://") && !rawProxyUrl.startsWith("https://")) {
+    throw new ConfigError(
+      `Invalid proxy URL "${rawProxyUrl}".`,
+      "proxy_url must start with http:// or https://. SOCKS proxies are not supported."
+    );
+  }
   return {
     ...creds,
     baseUrl,
@@ -6105,6 +6146,7 @@ function loadConfig(cli) {
     site,
     userAgent: cli.userAgent,
     sourceTag: cli.sourceTag ?? DEFAULT_SOURCE_TAG,
+    proxyUrl: rawProxyUrl || void 0,
     verbose: cli.verbose ?? false
   };
 }
@@ -6338,7 +6380,7 @@ function readCliVersion() {
   return "0.0.0";
 }
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "7777cc2" : "dev";
+var GIT_HASH = true ? "ecce5a7" : "dev";
 var Report = class {
   lines = [];
   add(key, value) {
@@ -7086,7 +7128,7 @@ var HELP_TREE = {
         description: "Contract DCA (Martingale) bot \u2014 leveraged recurring buys on futures/swaps",
         commands: {
           orders: {
-            usage: "okx bot dca orders [--history]",
+            usage: "okx bot dca orders [--algoId <id>] [--instId <id>] [--history]",
             description: "List active or historical Contract DCA bot orders"
           },
           details: {
@@ -9261,7 +9303,9 @@ async function cmdDcaStop(run, opts) {
 }
 async function cmdDcaOrders(run, opts) {
   const result = await run("dca_get_orders", {
-    status: opts.history ? "history" : "active"
+    status: opts.history ? "history" : "active",
+    algoId: opts.algoId,
+    instId: opts.instId
   });
   const orders = getData7(result) ?? [];
   if (opts.json) return printJson(orders);
@@ -9380,7 +9424,7 @@ function cmdOnchainEarnOrderHistory(run, v) {
 // src/index.ts
 var _require2 = createRequire2(import.meta.url);
 var CLI_VERSION2 = _require2("../package.json").version;
-var GIT_HASH2 = true ? "7777cc2" : "dev";
+var GIT_HASH2 = true ? "ecce5a7" : "dev";
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);
@@ -9811,7 +9855,7 @@ function handleBotGridCommand(run, v, rest, json) {
 }
 function handleBotDcaCommand(run, subAction, v, json) {
   if (subAction === "orders")
-    return cmdDcaOrders(run, { history: v.history ?? false, json });
+    return cmdDcaOrders(run, { algoId: v.algoId, instId: v.instId, history: v.history ?? false, json });
   if (subAction === "details")
     return cmdDcaDetails(run, { algoId: v.algoId, json });
   if (subAction === "sub-orders")