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

package/dist/index.js

@@ -1104,15 +1104,6 @@ var OkxRestClient = class {
       rateLimit
     });
   }
-  async publicPost(path42, body, rateLimit) {
-    return this.request({
-      method: "POST",
-      path: path42,
-      auth: "public",
-      body,
-      rateLimit
-    });
-  }
   async privatePost(path42, body, rateLimit) {
     return this.request({
       method: "POST",
@@ -2156,32 +2147,41 @@ function registerAlgoTradeTools() {
     {
       name: "swap_cancel_algo_orders",
       module: "swap",
-      description: "Cancel one or more pending SWAP/FUTURES algo orders (TP/SL). Accepts a list of {algoId, instId} objects. Private endpoint. Rate limit: 20 req/s per UID.",
+      description: "Cancel one or more pending SWAP/FUTURES algo orders (TP/SL). Accepts a list of {algoId, instId} objects.",
       isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          instId: {
-            type: "string",
-            description: "e.g. BTC-USDT-SWAP"
-          },
-          algoId: {
-            type: "string",
-            description: "Algo order ID"
+          orders: {
+            type: "array",
+            description: "List of algo orders to cancel. Each item: {algoId, instId}.",
+            items: {
+              type: "object",
+              properties: {
+                algoId: {
+                  type: "string",
+                  description: "Algo order ID"
+                },
+                instId: {
+                  type: "string",
+                  description: "e.g. BTC-USDT-SWAP"
+                }
+              },
+              required: ["algoId", "instId"]
+            }
           }
         },
-        required: ["instId", "algoId"]
+        required: ["orders"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
+        const orders = args.orders;
+        if (!Array.isArray(orders) || orders.length === 0) {
+          throw new Error("orders must be a non-empty array.");
+        }
         const response = await context.client.privatePost(
           "/api/v5/trade/cancel-algos",
-          [
-            {
-              instId: requireString(args, "instId"),
-              algoId: requireString(args, "algoId")
-            }
-          ],
+          orders,
           privateRateLimit("swap_cancel_algo_orders", 20)
         );
         return normalizeResponse(response);
@@ -2891,13 +2891,7 @@ function registerGridTools() {
           },
           lever: { type: "string", description: "Leverage. Contract only" },
           sz: { type: "string", description: "Margin amount. Contract only" },
-          basePos: { type: "boolean", description: "Open base position for contract. Default: true" },
-          tpTriggerPx: { type: "string", description: "Take-profit trigger price. Spot + contract" },
-          slTriggerPx: { type: "string", description: "Stop-loss trigger price. Spot + contract" },
-          algoClOrdId: { type: "string", description: "User-defined algo order ID, 1-32 chars" },
-          tradeQuoteCcy: { type: "string", description: "Spot grid only. Quote currency for trading" },
-          tpRatio: { type: "string", description: "Contract grid only. TP ratio, e.g. '0.1' = 10%" },
-          slRatio: { type: "string", description: "Contract grid only. SL ratio, e.g. '0.1' = 10%" }
+          basePos: { type: "boolean", description: "Open base position for contract. Default: true" }
         },
         required: ["instId", "algoOrdType", "maxPx", "minPx", "gridNum"]
       },
@@ -2911,9 +2905,6 @@ function registerGridTools() {
           minPx: requireString(args, "minPx"),
           gridNum: requireString(args, "gridNum"),
           runType: readString(args, "runType"),
-          tpTriggerPx: readString(args, "tpTriggerPx"),
-          slTriggerPx: readString(args, "slTriggerPx"),
-          algoClOrdId: readString(args, "algoClOrdId"),
           quoteSz: readString(args, "quoteSz"),
           baseSz: readString(args, "baseSz"),
           direction: readString(args, "direction"),
@@ -2921,19 +2912,9 @@ function registerGridTools() {
           sz: readString(args, "sz"),
           tag: context.config.sourceTag
         });
-        if (algoOrdType === "grid") {
-          const tradeQuoteCcy = readString(args, "tradeQuoteCcy");
-          if (tradeQuoteCcy) body.tradeQuoteCcy = tradeQuoteCcy;
-        }
         if (algoOrdType === "contract_grid") {
-          if (!body.triggerParams) {
-            body.triggerParams = [{ triggerAction: "start", triggerStrategy: "instant" }];
-          }
+          body.triggerParams = [{ triggerAction: "start", triggerStrategy: "instant" }];
           body.basePos = readBoolean(args, "basePos") ?? true;
-          const tpRatio = readString(args, "tpRatio");
-          const slRatio = readString(args, "slRatio");
-          if (tpRatio) body.tpRatio = tpRatio;
-          if (slRatio) body.slRatio = slRatio;
         }
         const response = await context.client.privatePost(
           "/api/v5/tradingBot/grid/order-algo",
@@ -3011,7 +2992,7 @@ function registerDcaTools() {
     {
       name: "dca_create_order",
       module: "bot.dca",
-      description: "Create Contract DCA (Martingale) bot. [CAUTION] Real trades. When maxSafetyOrds > 0: also need safetyOrdAmt, pxSteps. When maxSafetyOrds > 1: also need pxStepsMult, volMult.",
+      description: "Create Contract DCA (Martingale) bot. [CAUTION] Real trades. When maxSafetyOrds > 0: also need safetyOrdAmt, pxSteps, pxStepsMult, volMult.",
       isWrite: true,
       inputSchema: {
         type: "object",
@@ -3024,58 +3005,19 @@ function registerDcaTools() {
           tpPct: { type: "string", description: "Take-profit ratio, e.g. '0.03' = 3%" },
           safetyOrdAmt: { type: "string", description: "Safety order amount (USDT). Need when maxSafetyOrds > 0" },
           pxSteps: { type: "string", description: "Price drop % per safety order, e.g. '0.03'. Need when maxSafetyOrds > 0" },
-          pxStepsMult: { type: "string", description: "Price step multiplier, e.g. '1.2'. Need when maxSafetyOrds > 1" },
-          volMult: { type: "string", description: "Safety order size multiplier, e.g. '1.5'. Need when maxSafetyOrds > 1" },
+          pxStepsMult: { type: "string", description: "Price step multiplier, e.g. '1.2'. Need when maxSafetyOrds > 0" },
+          volMult: { type: "string", description: "Safety order size multiplier, e.g. '1.5'. Need when maxSafetyOrds > 0" },
           slPct: { type: "string", description: "Stop-loss ratio, e.g. '0.05' = 5%" },
           slMode: { type: "string", enum: ["limit", "market"], description: "Stop-loss type. Default: market" },
           allowReinvest: { type: "string", enum: ["true", "false"], description: "Reinvest profit. Default: 'true'" },
           triggerStrategy: { type: "string", enum: ["instant", "price", "rsi"], default: "instant", description: "How bot starts. Default: instant" },
-          triggerPx: { type: "string", description: "Required when triggerStrategy='price'" },
-          triggerCond: { type: "string", enum: ["cross_up", "cross_down"], description: "RSI trigger condition. Required when triggerStrategy='rsi'" },
-          thold: { type: "string", description: "RSI threshold, e.g. '30'. Required when triggerStrategy='rsi'" },
-          timePeriod: { type: "string", description: "RSI period. Default: '14'" },
-          timeframe: { type: "string", enum: ["3m", "5m", "15m", "30m", "1H", "4H", "1D"], description: "RSI K-line timeframe. Required when triggerStrategy='rsi'" },
-          trackingMode: { type: "string", enum: ["sync", "async"], description: "Copy-trading tracking mode" },
-          profitSharingRatio: { type: "string", enum: ["0", "0.1", "0.2", "0.3"], description: "Copy-trading profit sharing ratio" }
+          triggerPx: { type: "string", description: "Required when triggerStrategy='price'" }
         },
         required: ["instId", "lever", "direction", "initOrdAmt", "maxSafetyOrds", "tpPct"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const instId = requireString(args, "instId");
-        const maxSafetyOrds = Number(requireString(args, "maxSafetyOrds"));
-        if (maxSafetyOrds > 0) {
-          const missing = [];
-          if (!readString(args, "safetyOrdAmt")) missing.push("safetyOrdAmt");
-          if (!readString(args, "pxSteps")) missing.push("pxSteps");
-          if (missing.length > 0) {
-            throw new Error(
-              `When maxSafetyOrds > 0, the following parameters are required: ${missing.join(", ")}`
-            );
-          }
-        }
-        if (maxSafetyOrds > 1) {
-          const missing = [];
-          if (!readString(args, "pxStepsMult")) missing.push("pxStepsMult");
-          if (!readString(args, "volMult")) missing.push("volMult");
-          if (missing.length > 0) {
-            throw new Error(
-              `When maxSafetyOrds > 1, the following parameters are required: ${missing.join(", ")}`
-            );
-          }
-        }
-        const slPct = readString(args, "slPct");
-        const slMode = readString(args, "slMode");
-        if (slPct && !slMode) {
-          throw new Error(
-            "slMode is required when slPct is set. Use 'market' (market price stop-loss) or 'limit' (limit price stop-loss)."
-          );
-        }
-        if (slMode && !slPct) {
-          throw new Error(
-            "slPct is required when slMode is set. e.g. '0.05' = 5% stop-loss."
-          );
-        }
         const triggerStrategy = readString(args, "triggerStrategy") ?? "instant";
         const triggerParam = {
           triggerAction: "start",
@@ -3084,25 +3026,6 @@ function registerDcaTools() {
         if (triggerStrategy === "price") {
           triggerParam["triggerPx"] = requireString(args, "triggerPx");
         }
-        if (triggerStrategy === "rsi") {
-          const rsiMissing = [];
-          const triggerCond = readString(args, "triggerCond");
-          const thold = readString(args, "thold");
-          const timeframe = readString(args, "timeframe");
-          if (!triggerCond) rsiMissing.push("triggerCond");
-          if (!thold) rsiMissing.push("thold");
-          if (!timeframe) rsiMissing.push("timeframe");
-          if (rsiMissing.length > 0) {
-            throw new Error(
-              `When triggerStrategy='rsi', the following parameters are required: ${rsiMissing.join(", ")}`
-            );
-          }
-          triggerParam["triggerCond"] = triggerCond;
-          triggerParam["thold"] = thold;
-          triggerParam["timePeriod"] = readString(args, "timePeriod") ?? "14";
-          triggerParam["timeframe"] = timeframe;
-        }
-        const triggerParams = [triggerParam];
         const response = await context.client.privatePost(
           `${BASE}/create`,
           compactObject({
@@ -3120,10 +3043,7 @@ function registerDcaTools() {
             slPct: readString(args, "slPct"),
             slMode: readString(args, "slMode"),
             allowReinvest: readString(args, "allowReinvest"),
-            trackingMode: readString(args, "trackingMode"),
-            profitSharingRatio: readString(args, "profitSharingRatio"),
-            tag: context.config.sourceTag,
-            triggerParams
+            triggerParams: [triggerParam]
           }),
           privateRateLimit("dca_create_order", 20)
         );
@@ -3243,8 +3163,6 @@ function registerDcaTools() {
               algoId,
               algoOrdType: "contract_dca",
               cycleId,
-              after: readString(args, "after"),
-              before: readString(args, "before"),
               limit: readNumber(args, "limit")
             }),
             privateRateLimit("dca_get_sub_orders", 20)
@@ -7409,7 +7327,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "a8b36d0" : "dev";
+var GIT_HASH = true ? "3157372" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -8181,7 +8099,7 @@ var HELP_TREE = {
     }
   },
   bot: {
-    description: "Trading bot strategies (grid, dca, twap [CLI-only], recurring)",
+    description: "Trading bot strategies (grid, dca)",
     subgroups: {
       grid: {
         description: "Grid trading bot \u2014 create, monitor, and stop grid orders",
@@ -8199,68 +8117,12 @@ var HELP_TREE = {
             description: "List sub-orders of a grid bot (filled or live)"
           },
           create: {
-            usage: "okx bot grid create --instId <id> --algoOrdType <grid|contract_grid> --maxPx <px> --minPx <px> --gridNum <n>\n                   [--runType <1|2>] [--quoteSz <n>] [--baseSz <n>]\n                   [--direction <long|short|neutral>] [--lever <n>] [--sz <n>] [--basePos] [--no-basePos]\n                   [--tpTriggerPx <px>] [--slTriggerPx <px>] [--algoClOrdId <id>]\n                   [--tpRatio <ratio>] [--slRatio <ratio>] [--tradeQuoteCcy <ccy>]",
+            usage: "okx bot grid create --instId <id> --algoOrdType <grid|contract_grid> --maxPx <px> --minPx <px> --gridNum <n>\n                   [--runType <1|2>] [--quoteSz <n>] [--baseSz <n>]\n                   [--direction <long|short|neutral>] [--lever <n>] [--sz <n>] [--basePos] [--no-basePos]",
             description: "Create a new grid bot order (contract grid opens base position by default)"
           },
           stop: {
             usage: "okx bot grid stop --algoId <id> --algoOrdType <type> --instId <id> [--stopType <1|2|3|5|6>]",
             description: "Stop a running grid bot order"
-          },
-          "amend-basic": {
-            usage: "okx bot grid amend-basic --algoId <id> --minPx <px> --maxPx <px> --gridNum <n> [--topupAmount <n>]",
-            description: "Amend grid bot's price range and grid count"
-          },
-          "amend-order": {
-            usage: "okx bot grid amend-order --algoId <id> --instId <id>\n                   [--slTriggerPx <px>] [--tpTriggerPx <px>]\n                   [--tpRatio <ratio>] [--slRatio <ratio>] [--topUpAmt <n>]",
-            description: "Amend TP/SL settings of a running grid bot"
-          },
-          "close-position": {
-            usage: "okx bot grid close-position --algoId <id> [--mktClose] [--sz <n>] [--px <price>]",
-            description: "Close position of a stopped contract grid bot"
-          },
-          "cancel-close": {
-            usage: "okx bot grid cancel-close --algoId <id> --ordId <id>",
-            description: "Cancel a pending close order for contract grid"
-          },
-          "instant-trigger": {
-            usage: "okx bot grid instant-trigger --algoId <id> [--topUpAmt <n>]",
-            description: "Immediately trigger a pending-signal grid bot"
-          },
-          positions: {
-            usage: "okx bot grid positions --algoOrdType contract_grid --algoId <id>",
-            description: "Get contract grid bot position info"
-          },
-          "withdraw-income": {
-            usage: "okx bot grid withdraw-income --algoId <id>",
-            description: "Withdraw profit from a spot grid bot"
-          },
-          "compute-margin": {
-            usage: "okx bot grid compute-margin --algoId <id> --gridType <add|reduce> [--amt <n>]",
-            description: "Preview margin adjustment for contract grid"
-          },
-          "margin-balance": {
-            usage: "okx bot grid margin-balance --algoId <id> --gridType <add|reduce> [--amt <n>] [--percent <n>]",
-            description: "Adjust margin for contract grid bot"
-          },
-          "adjust-investment": {
-            usage: "okx bot grid adjust-investment --algoId <id> --amt <n> [--allowReinvestProfit <true|false>]",
-            description: "Add investment to a running grid bot"
-          },
-          "ai-param": {
-            usage: "okx bot grid ai-param --algoOrdType <grid|contract_grid> --instId <id> [--direction <dir>] [--duration <7D|30D|180D>]",
-            description: "Get AI-recommended grid parameters (public, no auth)"
-          },
-          "min-investment": {
-            usage: "okx bot grid min-investment --instId <id> --algoOrdType <type> --gridNum <n>\n                       --maxPx <px> --minPx <px> --runType <1|2>\n                       [--direction <dir>] [--lever <n>] [--basePos] [--investmentType <quote|base|dual>]",
-            description: "Calculate minimum investment for grid config (public, no auth)"
-          },
-          "rsi-back-testing": {
-            usage: "okx bot grid rsi-back-testing --instId <id> --timeframe <3m|5m|15m|30m|1H|4H|1D>\n                         --thold <n> --timePeriod <n> [--triggerCond <cond>] [--duration <1M>]",
-            description: "RSI signal back testing for grid trigger (public, no auth)"
-          },
-          "max-quantity": {
-            usage: "okx bot grid max-quantity --instId <id> --runType <1|2> --algoOrdType <type>\n                      --maxPx <px> --minPx <px> [--lever <n>]",
-            description: "Get maximum grid quantity for config (public, no auth)"
           }
         }
       },
@@ -8280,82 +8142,12 @@ var HELP_TREE = {
             description: "List cycles or orders within a cycle of a Contract DCA bot"
           },
           create: {
-            usage: "okx bot dca create --instId <id> --lever <n> --direction <long|short>\n                 --initOrdAmt <n> --maxSafetyOrds <n> --tpPct <n>\n                 [--safetyOrdAmt <n>] [--pxSteps <n>] [--pxStepsMult <n>] [--volMult <n>]\n                 [--slPct <n>] [--slMode <limit|market>]\n                 [--allowReinvest <true|false>] [--triggerStrategy <instant|price|rsi>] [--triggerPx <price>]\n                 [--triggerCond <cross_up|cross_down>] [--thold <n>] [--timePeriod <n>] [--timeframe <3m|5m|15m|30m|1H|4H|1D>]\n                 [--trackingMode <sync|async>] [--profitSharingRatio <0|0.1|0.2|0.3>]\n                 Ranges: maxSafetyOrds [0,100]; pxSteps [0.001,0.5] (varies by instrument);\n                 tpPct: long [0.001,10], short [0.001,0.9999]; slPct must > MPD\n                 Note: safetyOrdAmt, pxSteps required when maxSafetyOrds > 0; pxStepsMult, volMult required when maxSafetyOrds > 1\n                 Note: slMode required when slPct is set; triggerCond, thold, timeframe required when triggerStrategy=rsi",
+            usage: "okx bot dca create --instId <id> --lever <n> --direction <long|short>\n                 --initOrdAmt <n> --maxSafetyOrds <n> --tpPct <n>\n                 [--safetyOrdAmt <n>] [--pxSteps <n>] [--pxStepsMult <n>] [--volMult <n>]\n                 [--slPct <n>] [--slMode <limit|market>]\n                 [--allowReinvest <true|false>] [--triggerStrategy <instant|price|rsi>] [--triggerPx <price>]\n                 Note: safetyOrdAmt, pxSteps, pxStepsMult, volMult are required when maxSafetyOrds > 0",
             description: "Create a new Contract DCA bot order"
           },
           stop: {
             usage: "okx bot dca stop --algoId <id>",
             description: "Stop a running Contract DCA bot order"
-          },
-          "margin-add": {
-            usage: "okx bot dca margin-add --algoId <id> --amt <n>",
-            description: "Add margin to a running DCA bot (CLI-only)"
-          },
-          "margin-reduce": {
-            usage: "okx bot dca margin-reduce --algoId <id> --amt <n>",
-            description: "Reduce margin from a running DCA bot (CLI-only)"
-          },
-          "set-tp": {
-            usage: "okx bot dca set-tp --algoId <id> --tpPrice <price>",
-            description: "Update take-profit price for a running DCA bot (CLI-only). Long: tpPrice must not be below tpPriceRange; Short: tpPrice must not exceed tpPriceRange. Get tpPriceRange from 'dca orders' (ongoing-list)"
-          },
-          "set-reinvest": {
-            usage: "okx bot dca set-reinvest --algoId <id> --allowReinvest <true|false>",
-            description: "Enable or disable reinvestment for a DCA bot (CLI-only)"
-          },
-          "manual-buy": {
-            usage: "okx bot dca manual-buy --algoId <id> --amt <n> --px <price>",
-            description: "Manually trigger a buy order within a DCA bot cycle (CLI-only)"
-          }
-        }
-      },
-      twap: {
-        description: "TWAP (Time-Weighted Average Price) \u2014 split large orders over time intervals",
-        commands: {
-          orders: {
-            usage: "okx bot twap orders [--instId <id>] [--instType <SPOT|SWAP|FUTURES|MARGIN>] [--history] [--state <effective|canceled|order_failed>]",
-            description: "List active or historical TWAP algo orders"
-          },
-          details: {
-            usage: "okx bot twap details --algoId <id> | --algoClOrdId <id>",
-            description: "Get details of a specific TWAP algo order"
-          },
-          place: {
-            usage: "okx bot twap place --instId <id> --tdMode <cross|isolated|cash> --side <buy|sell>\n                   --sz <n> --szLimit <n> --pxLimit <px> --timeInterval <sec>\n                   --pxVar <bps> | --pxSpread <abs>\n                   [--posSide <long|short|net>] [--algoClOrdId <id>] [--ccy <ccy>] [--tradeQuoteCcy <ccy>]\n                   [--reduceOnly] [--isTradeBorrowMode]",
-            description: "Place a TWAP algo order to split a large order over time"
-          },
-          cancel: {
-            usage: "okx bot twap cancel --instId <id> --algoId <id> | --algoClOrdId <id>",
-            description: "Cancel a running TWAP algo order"
-          }
-        }
-      },
-      recurring: {
-        description: "Spot Recurring Buy (\u5B9A\u6295) \u2014 periodic automatic purchases (CLI-only)",
-        commands: {
-          orders: {
-            usage: "okx bot recurring orders [--algoId <id>] [--history]",
-            description: "List active or historical recurring buy orders"
-          },
-          details: {
-            usage: "okx bot recurring details --algoId <id>",
-            description: "Get details of a specific recurring buy order"
-          },
-          "sub-orders": {
-            usage: "okx bot recurring sub-orders --algoId <id>",
-            description: "List sub-orders (individual buy executions) of a recurring buy"
-          },
-          create: {
-            usage: "okx bot recurring create --stgyName <name> --recurringList '<json>'\n                      --period <hourly|daily|weekly|monthly> --recurringTime <0-23> --timeZone <n>\n                      --amt <n> --investmentCcy <ccy> --tdMode <cross|cash>\n                      [--recurringDay <n>] [--recurringHour <1|4|8|12>] [--tradeQuoteCcy <ccy>] [--algoClOrdId <id>]",
-            description: "Create a new recurring buy order"
-          },
-          amend: {
-            usage: "okx bot recurring amend --algoId <id> --stgyName <name>",
-            description: "Amend strategy name of a running recurring buy order"
-          },
-          stop: {
-            usage: "okx bot recurring stop --algoId <id>",
-            description: "Stop a running recurring buy order"
           }
         }
       }
@@ -8573,25 +8365,6 @@ var CLI_OPTIONS = {
   basePos: { type: "boolean", default: true },
   stopType: { type: "string" },
   live: { type: "boolean", default: false },
-  // grid create extended
-  algoClOrdId: { type: "string" },
-  tpRatio: { type: "string" },
-  slRatio: { type: "string" },
-  tradeQuoteCcy: { type: "string" },
-  // grid extended commands
-  mktClose: { type: "boolean", default: false },
-  topupAmount: { type: "string" },
-  topUpAmt: { type: "string" },
-  allowReinvestProfit: { type: "string" },
-  percent: { type: "string" },
-  gridType: { type: "string" },
-  investmentType: { type: "string" },
-  // rsi back testing / ai param
-  timeframe: { type: "string" },
-  thold: { type: "string" },
-  timePeriod: { type: "string" },
-  triggerCond: { type: "string" },
-  duration: { type: "string" },
   // market extras
   instType: { type: "string" },
   quoteCcy: { type: "string" },
@@ -8621,19 +8394,7 @@ var CLI_OPTIONS = {
   allowReinvest: { type: "string" },
   triggerStrategy: { type: "string" },
   triggerPx: { type: "string" },
-  trackingMode: { type: "string" },
-  profitSharingRatio: { type: "string" },
-  tpPrice: { type: "string" },
   cycleId: { type: "string" },
-  // recurring buy
-  stgyName: { type: "string" },
-  recurringList: { type: "string" },
-  recurringDay: { type: "string" },
-  recurringTime: { type: "string" },
-  recurringHour: { type: "string" },
-  investmentCcy: { type: "string" },
-  period: { type: "string" },
-  timeZone: { type: "string" },
   // i18n
   lang: { type: "string" },
   // option
@@ -8649,14 +8410,6 @@ var CLI_OPTIONS = {
   tool: { type: "string" },
   // config profile
   force: { type: "boolean", default: false },
-  // twap bot
-  pxVar: { type: "string" },
-  pxSpread: { type: "string" },
-  szLimit: { type: "string" },
-  pxLimit: { type: "string" },
-  timeInterval: { type: "string" },
-  tgtCcy: { type: "string" },
-  isTradeBorrowMode: { type: "boolean", default: false },
   // onchain-earn
   productId: { type: "string" },
   protocolType: { type: "string" },
@@ -9239,8 +8992,10 @@ async function cmdSpotPlace(run, opts) {
   process.stdout.write(`Order placed: ${order?.["ordId"]} (${order?.["sCode"] === "0" ? "OK" : order?.["sMsg"]})
 `);
 }
-async function cmdSpotCancel(run, instId, ordId, json) {
-  const result = await run("spot_cancel_order", { instId, ordId });
+async function cmdSpotCancel(run, opts) {
+  const { instId, ordId, clOrdId, json } = opts;
+  if (!ordId && !clOrdId) throw new Error("Either --ordId or --clOrdId is required");
+  const result = await run("spot_cancel_order", { instId, ...ordId ? { ordId } : { clOrdId } });
   const data = getData3(result);
   if (json) return printJson(data);
   const r = data?.[0];
@@ -9490,8 +9245,10 @@ async function cmdSwapPlace(run, opts) {
   process.stdout.write(`Order placed: ${order?.["ordId"]} (${order?.["sCode"] === "0" ? "OK" : order?.["sMsg"]})
 `);
 }
-async function cmdSwapCancel(run, instId, ordId, json) {
-  const result = await run("swap_cancel_order", { instId, ordId });
+async function cmdSwapCancel(run, opts) {
+  const { instId, ordId, clOrdId, json } = opts;
+  if (!ordId && !clOrdId) throw new Error("Either --ordId or --clOrdId is required");
+  const result = await run("swap_cancel_order", { instId, ...ordId ? { ordId } : { clOrdId } });
   const data = getData4(result);
   if (json) return printJson(data);
   const r = data?.[0];
@@ -9799,8 +9556,10 @@ async function cmdFuturesPlace(run, opts) {
   process.stdout.write(`Order placed: ${order?.["ordId"]} (${order?.["sCode"] === "0" ? "OK" : order?.["sMsg"]})
 `);
 }
-async function cmdFuturesCancel(run, instId, ordId, json) {
-  const result = await run("futures_cancel_order", { instId, ordId });
+async function cmdFuturesCancel(run, opts) {
+  const { instId, ordId, clOrdId, json } = opts;
+  if (!ordId && !clOrdId) throw new Error("Either --ordId or --clOrdId is required");
+  const result = await run("futures_cancel_order", { instId, ...ordId ? { ordId } : { clOrdId } });
   const data = getData5(result);
   if (json) return printJson(data);
   const r = data?.[0];
@@ -10771,10 +10530,10 @@ async function cmdGridDetails(run, opts) {
     minPx: detail["minPx"],
     gridNum: detail["gridNum"],
     runType: detail["runType"] === "1" ? "arithmetic" : "geometric",
-    pnl: detail["totalPnl"],
+    pnl: detail["pnl"],
     pnlRatio: detail["pnlRatio"],
-    investAmt: detail["investment"],
-    totalAnnRate: detail["totalAnnualizedRate"],
+    investAmt: detail["investAmt"],
+    totalAnnRate: detail["totalAnnRate"],
     createdAt: new Date(Number(detail["cTime"])).toLocaleString()
   });
 }
@@ -10816,13 +10575,7 @@ async function cmdGridCreate(run, opts) {
     direction: opts.direction,
     lever: opts.lever,
     sz: opts.sz,
-    basePos: opts.basePos,
-    tpTriggerPx: opts.tpTriggerPx,
-    slTriggerPx: opts.slTriggerPx,
-    algoClOrdId: opts.algoClOrdId,
-    tpRatio: opts.tpRatio,
-    slRatio: opts.slRatio,
-    tradeQuoteCcy: opts.tradeQuoteCcy
+    basePos: opts.basePos
   });
   const data = getData7(result);
   if (opts.json) return printJson(data);
@@ -10863,13 +10616,7 @@ async function cmdDcaCreate(run, opts) {
     slMode: opts.slMode,
     allowReinvest: opts.allowReinvest,
     triggerStrategy: opts.triggerStrategy,
-    triggerPx: opts.triggerPx,
-    triggerCond: opts.triggerCond,
-    thold: opts.thold,
-    timePeriod: opts.timePeriod,
-    timeframe: opts.timeframe,
-    trackingMode: opts.trackingMode,
-    profitSharingRatio: opts.profitSharingRatio
+    triggerPx: opts.triggerPx
   });
   const data = getData7(result);
   if (opts.json) return printJson(data);
@@ -10965,655 +10712,6 @@ async function cmdDcaSubOrders(run, opts) {
   );
 }
 
-// src/commands/bot-grid-ext.ts
-function getDataArray(result) {
-  return result.data ?? [];
-}
-function printWriteResult(data, successMsg) {
-  const r = data[0];
-  if (!r) {
-    process.stdout.write("No response data\n");
-    return;
-  }
-  const sCode = r["sCode"];
-  if (sCode !== void 0 && sCode !== "0") {
-    process.stdout.write(`Error: [${sCode}] ${r["sMsg"] ?? "Operation failed"}
-`);
-    return;
-  }
-  process.stdout.write(`${successMsg}
-`);
-}
-async function cmdGridAmendBasicParam(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/amend-algo-basic-param",
-    compactObject({
-      algoId: opts.algoId,
-      minPx: opts.minPx,
-      maxPx: opts.maxPx,
-      gridNum: opts.gridNum,
-      topupAmount: opts.topupAmount
-    }),
-    privateRateLimit("grid_amend_basic_param", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  printWriteResult(data, `Grid bot amended: ${data[0]?.["algoId"]}`);
-}
-async function cmdGridAmendOrder(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/amend-order-algo",
-    compactObject({
-      algoId: opts.algoId,
-      instId: opts.instId,
-      slTriggerPx: opts.slTriggerPx,
-      tpTriggerPx: opts.tpTriggerPx,
-      tpRatio: opts.tpRatio,
-      slRatio: opts.slRatio,
-      topUpAmt: opts.topUpAmt
-    }),
-    privateRateLimit("grid_amend_order", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  printWriteResult(data, `Grid bot order amended: ${data[0]?.["algoId"]}`);
-}
-async function cmdGridClosePosition(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/close-position",
-    compactObject({
-      algoId: opts.algoId,
-      mktClose: opts.mktClose,
-      sz: opts.sz,
-      px: opts.px
-    }),
-    privateRateLimit("grid_close_position", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const r = data[0];
-  if (opts.mktClose) {
-    printWriteResult(data, `Grid position market closed: ${r?.["algoId"]}`);
-  } else {
-    printWriteResult(data, `Grid close order placed: ${r?.["algoId"]} ordId=${r?.["ordId"]}`);
-  }
-}
-async function cmdGridCancelCloseOrder(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/cancel-close-order",
-    { algoId: opts.algoId, ordId: opts.ordId },
-    privateRateLimit("grid_cancel_close_order", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  printWriteResult(data, `Grid close order cancelled: ${data[0]?.["algoId"]} ordId=${data[0]?.["ordId"]}`);
-}
-async function cmdGridInstantTrigger(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/order-instant-trigger",
-    compactObject({
-      algoId: opts.algoId,
-      topUpAmt: opts.topUpAmt
-    }),
-    privateRateLimit("grid_instant_trigger", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  printWriteResult(data, `Grid bot triggered: ${data[0]?.["algoId"]}`);
-}
-async function cmdGridPositions(client, opts) {
-  const response = await client.privateGet(
-    "/api/v5/tradingBot/grid/positions",
-    { algoOrdType: opts.algoOrdType, algoId: opts.algoId },
-    privateRateLimit("grid_positions", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const detail = data[0];
-  if (!detail) {
-    process.stdout.write("No position data\n");
-    return;
-  }
-  printKv({
-    algoId: detail["algoId"],
-    instId: detail["instId"],
-    pos: detail["pos"],
-    avgPx: detail["avgPx"],
-    liqPx: detail["liqPx"],
-    lever: detail["lever"],
-    mgnMode: detail["mgnMode"],
-    upl: detail["upl"],
-    uplRatio: detail["uplRatio"],
-    markPx: detail["markPx"]
-  });
-}
-async function cmdGridWithdrawIncome(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/withdraw-income",
-    { algoId: opts.algoId },
-    privateRateLimit("grid_withdraw_income", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const r = data[0];
-  process.stdout.write(`Grid income withdrawn: ${r?.["algoId"]} profit=${r?.["profit"]}
-`);
-}
-async function cmdGridComputeMarginBalance(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/compute-margin-balance",
-    compactObject({
-      algoId: opts.algoId,
-      type: opts.type,
-      amt: opts.amt
-    }),
-    privateRateLimit("grid_compute_margin_balance", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const detail = data[0];
-  if (!detail) {
-    process.stdout.write("No data\n");
-    return;
-  }
-  printKv({
-    maxAmt: detail["maxAmt"],
-    lever: detail["lever"]
-  });
-}
-async function cmdGridMarginBalance(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/margin-balance",
-    compactObject({
-      algoId: opts.algoId,
-      type: opts.type,
-      amt: opts.amt,
-      percent: opts.percent
-    }),
-    privateRateLimit("grid_margin_balance", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  printWriteResult(data, `Grid margin adjusted: ${data[0]?.["algoId"]}`);
-}
-async function cmdGridAdjustInvestment(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/tradingBot/grid/adjust-investment",
-    compactObject({
-      algoId: opts.algoId,
-      amt: opts.amt,
-      allowReinvestProfit: opts.allowReinvestProfit
-    }),
-    privateRateLimit("grid_adjust_investment", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  printWriteResult(data, `Grid investment adjusted: ${data[0]?.["algoId"]}`);
-}
-async function cmdGridAiParam(client, opts) {
-  const response = await client.publicGet(
-    "/api/v5/tradingBot/grid/ai-param",
-    compactObject({
-      algoOrdType: opts.algoOrdType,
-      instId: opts.instId,
-      direction: opts.direction,
-      duration: opts.duration
-    }),
-    publicRateLimit("grid_ai_param", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const detail = data[0];
-  if (!detail) {
-    process.stdout.write("No AI param data\n");
-    return;
-  }
-  printKv({
-    instId: detail["instId"],
-    algoOrdType: detail["algoOrdType"],
-    duration: detail["duration"],
-    gridNum: detail["gridNum"],
-    maxPx: detail["maxPx"],
-    minPx: detail["minPx"],
-    minInvestment: `${detail["minInvestment"]} ${detail["ccy"]}`,
-    annualizedRate: detail["annualizedRate"],
-    runType: detail["runType"] === "1" ? "arithmetic" : "geometric"
-  });
-}
-async function cmdGridMinInvestment(client, opts) {
-  const response = await client.publicPost(
-    "/api/v5/tradingBot/grid/min-investment",
-    compactObject({
-      instId: opts.instId,
-      algoOrdType: opts.algoOrdType,
-      gridNum: opts.gridNum,
-      maxPx: opts.maxPx,
-      minPx: opts.minPx,
-      runType: opts.runType,
-      direction: opts.direction,
-      lever: opts.lever,
-      basePos: opts.basePos,
-      investmentType: opts.investmentType
-    }),
-    publicRateLimit("grid_min_investment", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const detail = data[0];
-  if (!detail) {
-    process.stdout.write("No data\n");
-    return;
-  }
-  const minData = detail["minInvestmentData"];
-  if (minData && minData.length > 0) {
-    process.stdout.write("Min Investment:\n");
-    for (const item of minData) {
-      process.stdout.write(`  ${item["amt"]} ${item["ccy"]}
-`);
-    }
-  }
-  process.stdout.write(`Single Amount: ${detail["singleAmt"]}
-`);
-}
-async function cmdGridRsiBackTesting(client, opts) {
-  const response = await client.publicGet(
-    "/api/v5/tradingBot/public/rsi-back-testing",
-    compactObject({
-      instId: opts.instId,
-      timeframe: opts.timeframe,
-      thold: opts.thold,
-      timePeriod: opts.timePeriod,
-      triggerCond: opts.triggerCond,
-      duration: opts.duration
-    }),
-    publicRateLimit("grid_rsi_back_testing", 20)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const detail = data[0];
-  process.stdout.write(`RSI trigger count: ${detail?.["triggerNum"] ?? "N/A"}
-`);
-}
-async function cmdGridMaxQuantity(client, opts) {
-  const response = await client.publicGet(
-    "/api/v5/tradingBot/grid/grid-quantity",
-    compactObject({
-      instId: opts.instId,
-      runType: opts.runType,
-      algoOrdType: opts.algoOrdType,
-      maxPx: opts.maxPx,
-      minPx: opts.minPx,
-      lever: opts.lever
-    }),
-    publicRateLimit("grid_max_quantity", 5)
-  );
-  const data = getDataArray(response);
-  if (opts.json) return printJson(data);
-  const detail = data[0];
-  process.stdout.write(`Max grid quantity: ${detail?.["maxGridQty"] ?? "N/A"} (min: 2)
-`);
-}
-
-// src/commands/bot-dca-ext.ts
-var BASE2 = "/api/v5/tradingBot/dca";
-function getDataArray2(result) {
-  return result.data ?? [];
-}
-function printWriteResult2(data, successMsg) {
-  const r = data[0];
-  if (!r) {
-    process.stdout.write("No response data\n");
-    return;
-  }
-  const sCode = r["sCode"];
-  if (sCode !== void 0 && sCode !== "0") {
-    process.stdout.write(`Error: [${sCode}] ${r["sMsg"] ?? "Operation failed"}
-`);
-    return;
-  }
-  process.stdout.write(`${successMsg}
-`);
-}
-async function cmdDcaMarginAdd(client, opts) {
-  const response = await client.privatePost(
-    `${BASE2}/margin/add`,
-    { algoId: opts.algoId, amt: opts.amt },
-    privateRateLimit("dca_margin_add", 20)
-  );
-  const data = getDataArray2(response);
-  if (opts.json) return printJson(data);
-  printWriteResult2(data, `DCA margin added: ${opts.amt} (algoId: ${opts.algoId})`);
-}
-async function cmdDcaMarginReduce(client, opts) {
-  const response = await client.privatePost(
-    `${BASE2}/margin/reduce`,
-    { algoId: opts.algoId, amt: opts.amt },
-    privateRateLimit("dca_margin_reduce", 20)
-  );
-  const data = getDataArray2(response);
-  if (opts.json) return printJson(data);
-  printWriteResult2(data, `DCA margin reduced: ${opts.amt} (algoId: ${opts.algoId})`);
-}
-async function cmdDcaSetTakeProfit(client, opts) {
-  const response = await client.privatePost(
-    `${BASE2}/settings/take-profit`,
-    { algoId: opts.algoId, algoOrdType: "contract_dca", tpPrice: opts.tpPrice },
-    privateRateLimit("dca_set_take_profit", 20)
-  );
-  const data = getDataArray2(response);
-  if (opts.json) return printJson(data);
-  printWriteResult2(data, `DCA take-profit updated: ${opts.tpPrice} (algoId: ${opts.algoId})`);
-}
-async function cmdDcaSetReinvestment(client, opts) {
-  const response = await client.privatePost(
-    `${BASE2}/settings/reinvestment`,
-    { algoId: opts.algoId, algoOrdType: "contract_dca", allowReinvest: opts.allowReinvest },
-    privateRateLimit("dca_set_reinvestment", 20)
-  );
-  const data = getDataArray2(response);
-  if (opts.json) return printJson(data);
-  const label = opts.allowReinvest === "true" ? "enabled" : "disabled";
-  printWriteResult2(data, `DCA reinvestment ${label} (algoId: ${opts.algoId})`);
-}
-async function cmdDcaManualBuy(client, opts) {
-  const response = await client.privatePost(
-    `${BASE2}/orders/manual-buy`,
-    {
-      algoId: opts.algoId,
-      algoOrdType: "contract_dca",
-      amt: opts.amt,
-      price: opts.px
-    },
-    privateRateLimit("dca_manual_buy", 20)
-  );
-  const data = getDataArray2(response);
-  if (opts.json) return printJson(data);
-  printWriteResult2(data, `DCA manual buy: ${opts.amt} (algoId: ${opts.algoId})`);
-}
-
-// src/commands/bot-recurring-ext.ts
-var BASE3 = "/api/v5/tradingBot/recurring";
-function getDataArray3(result) {
-  return result.data ?? [];
-}
-async function cmdRecurringCreate(client, opts) {
-  let parsed;
-  try {
-    parsed = JSON.parse(opts.recurringList);
-  } catch {
-    throw new Error(`recurringList must be a valid JSON array, e.g. '[{"ccy":"BTC","ratio":"1"}]'`);
-  }
-  if (!Array.isArray(parsed) || parsed.length === 0) {
-    throw new Error("recurringList must be a non-empty array of {ccy, ratio} objects");
-  }
-  if (opts.period === "hourly" && !opts.recurringHour) {
-    throw new Error("recurringHour is required when period=hourly (valid: 1, 4, 8, 12)");
-  }
-  const body = compactObject({
-    stgyName: opts.stgyName,
-    recurringList: parsed,
-    period: opts.period,
-    recurringDay: opts.recurringDay,
-    recurringTime: opts.recurringTime,
-    recurringHour: opts.recurringHour,
-    timeZone: opts.timeZone,
-    amt: opts.amt,
-    investmentCcy: opts.investmentCcy,
-    tdMode: opts.tdMode,
-    tradeQuoteCcy: opts.tradeQuoteCcy,
-    algoClOrdId: opts.algoClOrdId,
-    tag: DEFAULT_SOURCE_TAG
-  });
-  const response = await client.privatePost(
-    `${BASE3}/order-algo`,
-    body,
-    privateRateLimit("recurring_create", 20)
-  );
-  const data = getDataArray3(response);
-  if (opts.json) return printJson(data);
-  const r = data[0];
-  process.stdout.write(
-    `Recurring buy created: ${r?.["algoId"]} (${r?.["sCode"] === "0" ? "OK" : r?.["sMsg"]})
-`
-  );
-}
-async function cmdRecurringAmend(client, opts) {
-  const response = await client.privatePost(
-    `${BASE3}/amend-order-algo`,
-    { algoId: opts.algoId, stgyName: opts.stgyName },
-    privateRateLimit("recurring_amend", 20)
-  );
-  const data = getDataArray3(response);
-  if (opts.json) return printJson(data);
-  const r = data[0];
-  process.stdout.write(
-    `Recurring buy amended: ${r?.["algoId"]} (${r?.["sCode"] === "0" ? "OK" : r?.["sMsg"]})
-`
-  );
-}
-async function cmdRecurringStop(client, opts) {
-  const response = await client.privatePost(
-    `${BASE3}/stop-order-algo`,
-    [{ algoId: opts.algoId }],
-    privateRateLimit("recurring_stop", 20)
-  );
-  const data = getDataArray3(response);
-  if (opts.json) return printJson(data);
-  const r = data[0];
-  process.stdout.write(
-    `Recurring buy stopped: ${r?.["algoId"]} (${r?.["sCode"] === "0" ? "OK" : r?.["sMsg"]})
-`
-  );
-}
-async function cmdRecurringOrders(client, opts) {
-  const endpoint = opts.history ? `${BASE3}/orders-algo-history` : `${BASE3}/orders-algo-pending`;
-  const params = compactObject({ algoId: opts.algoId });
-  const response = await client.privateGet(
-    endpoint,
-    params,
-    privateRateLimit("recurring_orders", 20)
-  );
-  const orders = getDataArray3(response);
-  if (opts.json) return printJson(orders);
-  if (!orders.length) {
-    process.stdout.write("No recurring buy orders\n");
-    return;
-  }
-  printTable(
-    orders.map((o) => ({
-      algoId: o["algoId"],
-      stgyName: o["stgyName"],
-      state: o["state"],
-      amt: o["amt"],
-      period: o["period"],
-      ccy: o["investmentCcy"],
-      createdAt: new Date(Number(o["cTime"])).toLocaleString()
-    }))
-  );
-}
-async function cmdRecurringDetails(client, opts) {
-  const response = await client.privateGet(
-    `${BASE3}/orders-algo-details`,
-    { algoId: opts.algoId },
-    privateRateLimit("recurring_details", 20)
-  );
-  const detail = getDataArray3(response)[0];
-  if (!detail) {
-    process.stdout.write("Recurring buy not found\n");
-    return;
-  }
-  if (opts.json) return printJson(detail);
-  printKv({
-    algoId: detail["algoId"],
-    stgyName: detail["stgyName"],
-    state: detail["state"],
-    amt: detail["amt"],
-    investmentCcy: detail["investmentCcy"],
-    period: detail["period"],
-    recurringDay: detail["recurringDay"],
-    recurringTime: detail["recurringTime"],
-    tdMode: detail["tdMode"],
-    totalAmt: detail["totalAmt"],
-    totalPnl: detail["totalPnl"],
-    createdAt: new Date(Number(detail["cTime"])).toLocaleString()
-  });
-}
-async function cmdRecurringSubOrders(client, opts) {
-  const response = await client.privateGet(
-    `${BASE3}/sub-orders`,
-    { algoId: opts.algoId },
-    privateRateLimit("recurring_sub_orders", 20)
-  );
-  const orders = getDataArray3(response);
-  if (opts.json) return printJson(orders);
-  if (!orders.length) {
-    process.stdout.write("No sub-orders\n");
-    return;
-  }
-  printTable(
-    orders.map((o) => ({
-      ordId: o["ordId"],
-      ccy: o["ccy"],
-      amt: o["amt"],
-      px: o["px"],
-      sz: o["sz"],
-      state: o["state"],
-      ts: o["ts"] ? new Date(Number(o["ts"])).toLocaleString() : ""
-    }))
-  );
-}
-
-// src/commands/bot-twap-ext.ts
-function getDataArray4(result) {
-  return result.data ?? [];
-}
-function printWriteResult3(data, successMsg) {
-  const r = data[0];
-  if (!r) {
-    process.stdout.write("No response data\n");
-    return;
-  }
-  const sCode = r["sCode"];
-  if (sCode !== void 0 && sCode !== "0") {
-    process.stdout.write(`Error: [${sCode}] ${r["sMsg"] ?? "Operation failed"}
-`);
-    return;
-  }
-  process.stdout.write(`${successMsg}
-`);
-}
-async function cmdTwapPlace(client, opts) {
-  const response = await client.privatePost(
-    "/api/v5/trade/order-algo",
-    compactObject({
-      instId: opts.instId,
-      tdMode: opts.tdMode,
-      side: opts.side,
-      ordType: "twap",
-      sz: opts.sz,
-      szLimit: opts.szLimit,
-      pxLimit: opts.pxLimit,
-      timeInterval: opts.timeInterval,
-      posSide: opts.posSide,
-      pxVar: opts.pxVar,
-      pxSpread: opts.pxSpread,
-      tag: "CLI",
-      algoClOrdId: opts.algoClOrdId,
-      ccy: opts.ccy,
-      tradeQuoteCcy: opts.tradeQuoteCcy,
-      reduceOnly: opts.reduceOnly !== void 0 ? String(opts.reduceOnly) : void 0,
-      isTradeBorrowMode: opts.isTradeBorrowMode !== void 0 ? String(opts.isTradeBorrowMode) : void 0
-    }),
-    privateRateLimit("twap_place_order", 20)
-  );
-  const data = getDataArray4(response);
-  if (opts.json) return printJson(data);
-  printWriteResult3(data, `TWAP order placed: ${data[0]?.["algoId"]}`);
-}
-async function cmdTwapCancel(client, opts) {
-  if (!opts.algoId && !opts.algoClOrdId) {
-    throw new Error("Must provide --algoId or --algoClOrdId");
-  }
-  const response = await client.privatePost(
-    "/api/v5/trade/cancel-algos",
-    [compactObject({
-      algoId: opts.algoId,
-      algoClOrdId: opts.algoClOrdId,
-      instId: opts.instId
-    })],
-    privateRateLimit("twap_cancel_order", 20)
-  );
-  const data = getDataArray4(response);
-  if (opts.json) return printJson(data);
-  printWriteResult3(data, `TWAP order cancelled: ${data[0]?.["algoId"]}`);
-}
-async function cmdTwapOrders(client, opts) {
-  const path5 = opts.history ? "/api/v5/trade/orders-algo-history" : "/api/v5/trade/orders-algo-pending";
-  const response = await client.privateGet(
-    path5,
-    compactObject({
-      ordType: "twap",
-      instType: opts.instType,
-      instId: opts.instId,
-      ...opts.history && !opts.state ? { state: "effective" } : {},
-      ...opts.history && opts.state ? { state: opts.state } : {}
-    }),
-    privateRateLimit("twap_get_orders", 20)
-  );
-  const orders = getDataArray4(response);
-  if (opts.json) return printJson(orders);
-  if (!orders.length) {
-    process.stdout.write("No TWAP orders\n");
-    return;
-  }
-  printTable(
-    orders.map((o) => ({
-      algoId: o["algoId"],
-      instId: o["instId"],
-      side: o["side"],
-      state: o["state"],
-      sz: o["sz"],
-      szLimit: o["szLimit"],
-      pxLimit: o["pxLimit"],
-      timeInterval: o["timeInterval"],
-      createdAt: new Date(Number(o["cTime"])).toLocaleString()
-    }))
-  );
-}
-async function cmdTwapDetails(client, opts) {
-  if (!opts.algoId && !opts.algoClOrdId) {
-    throw new Error("Must provide --algoId or --algoClOrdId");
-  }
-  const response = await client.privateGet(
-    "/api/v5/trade/order-algo",
-    compactObject({
-      algoId: opts.algoId,
-      algoClOrdId: opts.algoClOrdId
-    }),
-    privateRateLimit("twap_get_order_details", 20)
-  );
-  const data = getDataArray4(response);
-  const detail = data[0];
-  if (!detail) {
-    process.stdout.write("TWAP order not found\n");
-    return;
-  }
-  if (opts.json) return printJson(detail);
-  printKv({
-    algoId: detail["algoId"],
-    instId: detail["instId"],
-    side: detail["side"],
-    state: detail["state"],
-    sz: detail["sz"],
-    szLimit: detail["szLimit"],
-    pxLimit: detail["pxLimit"],
-    pxVar: detail["pxVar"],
-    pxSpread: detail["pxSpread"],
-    timeInterval: detail["timeInterval"],
-    createdAt: new Date(Number(detail["cTime"])).toLocaleString()
-  });
-}
-
 // src/commands/onchain-earn.ts
 function cmdOnchainEarnOffers(run, v) {
   return run("onchain_earn_get_offers", {
@@ -11910,7 +11008,7 @@ async function cmdDcdQuoteAndBuy(run, opts) {
 // src/index.ts
 var _require3 = createRequire3(import.meta.url);
 var CLI_VERSION2 = _require3("../package.json").version;
-var GIT_HASH2 = true ? "a8b36d0" : "dev";
+var GIT_HASH2 = true ? "3157372" : "dev";
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);
@@ -12105,7 +11203,7 @@ function handleSpotCommand(run, action, rest, v, json) {
       json
     });
   if (action === "cancel")
-    return cmdSpotCancel(run, v.instId, v.ordId, json);
+    return cmdSpotCancel(run, { instId: v.instId ?? rest[0], ordId: v.ordId, clOrdId: v.clOrdId, json });
   if (action === "algo")
     return handleSpotAlgoCommand(run, rest[0], v, json);
   if (action === "batch")
@@ -12164,9 +11262,9 @@ function handleSwapAlgoCommand(run, subAction, v, json) {
       json
     });
 }
-function handleSwapCommand(run, action, rest, v, json) {
+function handleSwapQuery(run, action, rest, v, json) {
   if (action === "positions")
-    return cmdSwapPositions(run, rest[0] ?? v.instId, json);
+    return cmdSwapPositions(run, v.instId ?? rest[0], json);
   if (action === "orders")
     return cmdSwapOrders(run, {
       instId: v.instId,
@@ -12182,6 +11280,13 @@ function handleSwapCommand(run, action, rest, v, json) {
       archive: v.archive ?? false,
       json
     });
+  if (action === "get-leverage")
+    return cmdSwapGetLeverage(run, { instId: v.instId, mgnMode: v.mgnMode, json });
+  return void 0;
+}
+function handleSwapCommand(run, action, rest, v, json) {
+  const queryResult = handleSwapQuery(run, action, rest, v, json);
+  if (queryResult !== void 0) return queryResult;
   if (action === "close")
     return cmdSwapClose(run, {
       instId: v.instId,
@@ -12190,8 +11295,6 @@ function handleSwapCommand(run, action, rest, v, json) {
       autoCxl: v.autoCxl,
       json
     });
-  if (action === "get-leverage")
-    return cmdSwapGetLeverage(run, { instId: v.instId, mgnMode: v.mgnMode, json });
   if (action === "place")
     return cmdSwapPlace(run, {
       instId: v.instId,
@@ -12208,7 +11311,7 @@ function handleSwapCommand(run, action, rest, v, json) {
       json
     });
   if (action === "cancel")
-    return cmdSwapCancel(run, v.instId, v.ordId, json);
+    return cmdSwapCancel(run, { instId: v.instId ?? rest[0], ordId: v.ordId, clOrdId: v.clOrdId, json });
   if (action === "amend")
     return cmdSwapAmend(run, {
       instId: v.instId,
@@ -12375,7 +11478,7 @@ function resolveFuturesOrdersStatus(v) {
   if (v.history) return "history";
   return "open";
 }
-function handleFuturesCommand(run, action, rest, v, json) {
+function handleFuturesQuery(run, action, v, json) {
   if (action === "orders")
     return cmdFuturesOrders(run, { instId: v.instId, status: resolveFuturesOrdersStatus(v), json });
   if (action === "positions") return cmdFuturesPositions(run, v.instId, json);
@@ -12386,6 +11489,15 @@ function handleFuturesCommand(run, action, rest, v, json) {
       archive: v.archive ?? false,
       json
     });
+  if (action === "get")
+    return cmdFuturesGet(run, { instId: v.instId, ordId: v.ordId, json });
+  if (action === "get-leverage")
+    return cmdFuturesGetLeverage(run, { instId: v.instId, mgnMode: v.mgnMode, json });
+  return void 0;
+}
+function handleFuturesCommand(run, action, rest, v, json) {
+  const queryResult = handleFuturesQuery(run, action, v, json);
+  if (queryResult !== void 0) return queryResult;
   if (action === "place")
     return cmdFuturesPlace(run, {
       instId: v.instId,
@@ -12403,9 +11515,7 @@ function handleFuturesCommand(run, action, rest, v, json) {
       json
     });
   if (action === "cancel")
-    return cmdFuturesCancel(run, v.instId, v.ordId, json);
-  if (action === "get")
-    return cmdFuturesGet(run, { instId: rest[0] ?? v.instId, ordId: v.ordId, json });
+    return cmdFuturesCancel(run, { instId: v.instId ?? rest[0], ordId: v.ordId, clOrdId: v.clOrdId, json });
   if (action === "amend")
     return cmdFuturesAmend(run, {
       instId: v.instId,
@@ -12423,8 +11533,6 @@ function handleFuturesCommand(run, action, rest, v, json) {
       autoCxl: v.autoCxl,
       json
     });
-  if (action === "get-leverage")
-    return cmdFuturesGetLeverage(run, { instId: v.instId, mgnMode: v.mgnMode, json });
   if (action === "leverage")
     return cmdFuturesSetLeverage(run, {
       instId: v.instId,
@@ -12438,7 +11546,7 @@ function handleFuturesCommand(run, action, rest, v, json) {
   if (action === "algo")
     return handleFuturesAlgoCommand(run, rest[0], v, json);
 }
-function handleBotGridCommand(run, client, v, rest, json) {
+function handleBotGridCommand(run, v, rest, json) {
   const subAction = rest[0];
   if (subAction === "orders")
     return cmdGridOrders(run, {
@@ -12475,12 +11583,6 @@ function handleBotGridCommand(run, client, v, rest, json) {
       lever: v.lever,
       sz: v.sz,
       basePos: v.basePos,
-      tpTriggerPx: v.tpTriggerPx,
-      slTriggerPx: v.slTriggerPx,
-      algoClOrdId: v.algoClOrdId,
-      tpRatio: v.tpRatio,
-      slRatio: v.slRatio,
-      tradeQuoteCcy: v.tradeQuoteCcy,
       json
     });
   if (subAction === "stop")
@@ -12491,123 +11593,8 @@ function handleBotGridCommand(run, client, v, rest, json) {
       stopType: v.stopType,
       json
     });
-  if (subAction === "amend-basic")
-    return cmdGridAmendBasicParam(client, {
-      algoId: v.algoId,
-      minPx: v.minPx,
-      maxPx: v.maxPx,
-      gridNum: v.gridNum,
-      topupAmount: v.topupAmount,
-      json
-    });
-  if (subAction === "amend-order")
-    return cmdGridAmendOrder(client, {
-      algoId: v.algoId,
-      instId: v.instId,
-      slTriggerPx: v.slTriggerPx,
-      tpTriggerPx: v.tpTriggerPx,
-      tpRatio: v.tpRatio,
-      slRatio: v.slRatio,
-      topUpAmt: v.topUpAmt,
-      json
-    });
-  if (subAction === "close-position")
-    return cmdGridClosePosition(client, {
-      algoId: v.algoId,
-      mktClose: v.mktClose ?? false,
-      sz: v.sz,
-      px: v.px,
-      json
-    });
-  if (subAction === "cancel-close")
-    return cmdGridCancelCloseOrder(client, {
-      algoId: v.algoId,
-      ordId: v.ordId,
-      json
-    });
-  if (subAction === "instant-trigger")
-    return cmdGridInstantTrigger(client, {
-      algoId: v.algoId,
-      topUpAmt: v.topUpAmt,
-      json
-    });
-  if (subAction === "positions")
-    return cmdGridPositions(client, {
-      algoOrdType: v.algoOrdType,
-      algoId: v.algoId,
-      json
-    });
-  if (subAction === "withdraw-income")
-    return cmdGridWithdrawIncome(client, {
-      algoId: v.algoId,
-      json
-    });
-  if (subAction === "compute-margin")
-    return cmdGridComputeMarginBalance(client, {
-      algoId: v.algoId,
-      type: v.gridType,
-      amt: v.amt,
-      json
-    });
-  if (subAction === "margin-balance")
-    return cmdGridMarginBalance(client, {
-      algoId: v.algoId,
-      type: v.gridType,
-      amt: v.amt,
-      percent: v.percent,
-      json
-    });
-  if (subAction === "adjust-investment")
-    return cmdGridAdjustInvestment(client, {
-      algoId: v.algoId,
-      amt: v.amt,
-      allowReinvestProfit: v.allowReinvestProfit,
-      json
-    });
-  if (subAction === "ai-param")
-    return cmdGridAiParam(client, {
-      algoOrdType: v.algoOrdType,
-      instId: v.instId,
-      direction: v.direction,
-      duration: v.duration,
-      json
-    });
-  if (subAction === "min-investment")
-    return cmdGridMinInvestment(client, {
-      instId: v.instId,
-      algoOrdType: v.algoOrdType,
-      gridNum: v.gridNum,
-      maxPx: v.maxPx,
-      minPx: v.minPx,
-      runType: v.runType,
-      direction: v.direction,
-      lever: v.lever,
-      basePos: v.basePos,
-      investmentType: v.investmentType,
-      json
-    });
-  if (subAction === "rsi-back-testing")
-    return cmdGridRsiBackTesting(client, {
-      instId: v.instId,
-      timeframe: v.timeframe,
-      thold: v.thold,
-      timePeriod: v.timePeriod,
-      triggerCond: v.triggerCond,
-      duration: v.duration,
-      json
-    });
-  if (subAction === "max-quantity")
-    return cmdGridMaxQuantity(client, {
-      instId: v.instId,
-      runType: v.runType,
-      algoOrdType: v.algoOrdType,
-      maxPx: v.maxPx,
-      minPx: v.minPx,
-      lever: v.lever,
-      json
-    });
 }
-function handleBotDcaCommand(run, client, subAction, v, json) {
+function handleBotDcaCommand(run, subAction, v, json) {
   if (subAction === "orders")
     return cmdDcaOrders(run, { algoId: v.algoId, instId: v.instId, history: v.history ?? false, json });
   if (subAction === "details")
@@ -12631,93 +11618,14 @@ function handleBotDcaCommand(run, client, subAction, v, json) {
       allowReinvest: v.allowReinvest,
       triggerStrategy: v.triggerStrategy,
       triggerPx: v.triggerPx,
-      triggerCond: v.triggerCond,
-      thold: v.thold,
-      timePeriod: v.timePeriod,
-      timeframe: v.timeframe,
-      trackingMode: v.trackingMode,
-      profitSharingRatio: v.profitSharingRatio,
       json
     });
   if (subAction === "stop")
     return cmdDcaStop(run, { algoId: v.algoId, json });
-  if (subAction === "margin-add")
-    return cmdDcaMarginAdd(client, { algoId: v.algoId, amt: v.amt, json });
-  if (subAction === "margin-reduce")
-    return cmdDcaMarginReduce(client, { algoId: v.algoId, amt: v.amt, json });
-  if (subAction === "set-tp")
-    return cmdDcaSetTakeProfit(client, { algoId: v.algoId, tpPrice: v.tpPrice, json });
-  if (subAction === "set-reinvest")
-    return cmdDcaSetReinvestment(client, { algoId: v.algoId, allowReinvest: v.allowReinvest, json });
-  if (subAction === "manual-buy") {
-    if (!v.px) throw new Error("--px <price> is required for manual-buy");
-    return cmdDcaManualBuy(client, { algoId: v.algoId, amt: v.amt, px: v.px, json });
-  }
-}
-function handleBotTwapCommand(client, subAction, v, json) {
-  if (subAction === "orders")
-    return cmdTwapOrders(client, { history: v.history ?? false, instId: v.instId, instType: v.instType, state: v.state, json });
-  if (subAction === "details")
-    return cmdTwapDetails(client, { algoId: v.algoId, algoClOrdId: v.algoClOrdId, json });
-  if (subAction === "place")
-    return cmdTwapPlace(client, {
-      instId: v.instId,
-      tdMode: v.tdMode,
-      side: v.side,
-      sz: v.sz,
-      szLimit: v.szLimit,
-      pxLimit: v.pxLimit,
-      timeInterval: v.timeInterval,
-      posSide: v.posSide,
-      pxVar: v.pxVar,
-      pxSpread: v.pxSpread,
-      algoClOrdId: v.algoClOrdId,
-      ccy: v.ccy,
-      tradeQuoteCcy: v.tradeQuoteCcy,
-      reduceOnly: v.reduceOnly || void 0,
-      isTradeBorrowMode: v.isTradeBorrowMode || void 0,
-      json
-    });
-  if (subAction === "cancel")
-    return cmdTwapCancel(client, { instId: v.instId, algoId: v.algoId, algoClOrdId: v.algoClOrdId, json });
-}
-function handleBotRecurringCommand(client, subAction, v, json) {
-  if (subAction === "orders")
-    return cmdRecurringOrders(client, { algoId: v.algoId, history: v.history ?? false, json });
-  if (subAction === "details")
-    return cmdRecurringDetails(client, { algoId: v.algoId, json });
-  if (subAction === "sub-orders")
-    return cmdRecurringSubOrders(client, { algoId: v.algoId, json });
-  if (subAction === "create")
-    return cmdRecurringCreate(client, {
-      stgyName: v.stgyName,
-      recurringList: v.recurringList,
-      period: v.period,
-      recurringDay: v.recurringDay,
-      recurringTime: v.recurringTime,
-      recurringHour: v.recurringHour,
-      timeZone: v.timeZone,
-      amt: v.amt,
-      investmentCcy: v.investmentCcy,
-      tdMode: v.tdMode,
-      tradeQuoteCcy: v.tradeQuoteCcy,
-      algoClOrdId: v.algoClOrdId,
-      json
-    });
-  if (subAction === "amend")
-    return cmdRecurringAmend(client, {
-      algoId: v.algoId,
-      stgyName: v.stgyName,
-      json
-    });
-  if (subAction === "stop")
-    return cmdRecurringStop(client, { algoId: v.algoId, json });
 }
-function handleBotCommand(run, client, action, rest, v, json) {
-  if (action === "grid") return handleBotGridCommand(run, client, v, rest, json);
-  if (action === "dca") return handleBotDcaCommand(run, client, rest[0], v, json);
-  if (action === "twap") return handleBotTwapCommand(client, rest[0], v, json);
-  if (action === "recurring") return handleBotRecurringCommand(client, rest[0], v, json);
+function handleBotCommand(run, action, rest, v, json) {
+  if (action === "grid") return handleBotGridCommand(run, v, rest, json);
+  if (action === "dca") return handleBotDcaCommand(run, rest[0], v, json);
 }
 function handleEarnCommand(run, submodule, rest, v, json) {
   const action = rest[0];
@@ -12865,7 +11773,7 @@ async function main() {
     swap: () => handleSwapCommand(run, action, rest, v, json),
     futures: () => handleFuturesCommand(run, action, rest, v, json),
     option: () => handleOptionCommand(run, action, rest, v, json),
-    bot: () => handleBotCommand(run, client, action, rest, v, json),
+    bot: () => handleBotCommand(run, action, rest, v, json),
     earn: () => handleEarnCommand(run, action, rest, v, json)
   };
   const handler = moduleHandlers[module];
@@ -12891,8 +11799,6 @@ export {
   handleBotCommand,
   handleBotDcaCommand,
   handleBotGridCommand,
-  handleBotRecurringCommand,
-  handleBotTwapCommand,
   handleConfigCommand,
   handleEarnCommand,
   handleFuturesAlgoCommand,