@okx_ai/okx-trade-cli 1.2.7-beta.1 → 1.2.7-beta.3

package/dist/index.js

@@ -3131,58 +3131,121 @@ 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, pxStepsMult, volMult.",
+      description: "Create a DCA (Martingale) bot. [CAUTION] Real trades. contract_dca requires lever; spot_dca must be long. If maxSafetyOrds>0: need safetyOrdAmt, pxSteps.",
       isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          instId: { type: "string", description: "e.g. BTC-USDT-SWAP" },
-          lever: { type: "string", description: "Leverage, e.g. '3'" },
+          instId: { type: "string", description: "BTC-USDT (spot) or BTC-USDT-SWAP (contract)" },
+          algoOrdType: { type: "string", enum: ["spot_dca", "contract_dca"] },
+          lever: { type: "string", description: "Required for contract_dca" },
           direction: { type: "string", enum: ["long", "short"] },
-          initOrdAmt: { type: "string", description: "Initial order amount (USDT)" },
-          maxSafetyOrds: { type: "string", description: "Max safety orders, e.g. '3'" },
-          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 > 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'" }
+          initOrdAmt: { type: "string", description: "Initial amount in quote ccy" },
+          maxSafetyOrds: { type: "string", description: "0=no DCA, max 100" },
+          tpPct: { type: "string", description: "Take-profit ratio, 0.03=3%" },
+          safetyOrdAmt: { type: "string", description: "Safety order amount. Need if maxSafetyOrds>0" },
+          pxSteps: { type: "string", description: "Price drop per safety order. Need if maxSafetyOrds>0" },
+          pxStepsMult: { type: "string", description: "Step multiplier. Required when maxSafetyOrds>0, e.g. '1'" },
+          volMult: { type: "string", description: "Size multiplier. Required when maxSafetyOrds>0, e.g. '1'" },
+          slPct: { type: "string", description: "Stop-loss ratio, 0.05=5%" },
+          slMode: { type: "string", enum: ["limit", "market"] },
+          allowReinvest: { type: "boolean", description: "Default true" },
+          triggerStrategy: { type: "string", enum: ["instant", "price", "rsi"], description: "contract_dca: instant|price|rsi; spot_dca: instant|rsi. Default: instant" },
+          triggerPx: { type: "string", description: "Need if triggerStrategy=price (contract_dca only)" },
+          triggerCond: { type: "string", enum: ["cross_up", "cross_down"], description: "Required when triggerStrategy=rsi. Optional when triggerStrategy=price" },
+          thold: { type: "string", description: "RSI threshold (e.g. '30'). Need if triggerStrategy=rsi" },
+          timeframe: { type: "string", description: "RSI timeframe (e.g. '15m'). Need if triggerStrategy=rsi" },
+          timePeriod: { type: "string", description: "RSI period. Default '14'. Optional when triggerStrategy=rsi" },
+          algoClOrdId: { type: "string", description: "Client order ID, 1-32 chars" },
+          // Backend expects boolean, but kept as string for backward compatibility with older clients.
+          reserveFunds: { type: "string", description: "'true' or 'false', default 'true'" },
+          tradeQuoteCcy: { type: "string" }
         },
-        required: ["instId", "lever", "direction", "initOrdAmt", "maxSafetyOrds", "tpPct"]
+        required: ["instId", "algoOrdType", "direction", "initOrdAmt", "maxSafetyOrds", "tpPct"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const instId = requireString(args, "instId");
+        const algoOrdType = requireString(args, "algoOrdType");
+        if (algoOrdType === "contract_dca" && !readString(args, "lever")) {
+          throw new OkxApiError("lever is required for contract_dca", {
+            code: "VALIDATION",
+            endpoint: `${BASE}/create`
+          });
+        }
         const triggerStrategy = readString(args, "triggerStrategy") ?? "instant";
+        if (triggerStrategy === "price" && algoOrdType === "spot_dca") {
+          throw new OkxApiError("triggerStrategy 'price' is only supported for contract_dca. spot_dca supports: instant, rsi", {
+            code: "VALIDATION",
+            endpoint: `${BASE}/create`
+          });
+        }
         const triggerParam = {
           triggerAction: "start",
           triggerStrategy
         };
         if (triggerStrategy === "price") {
           triggerParam["triggerPx"] = requireString(args, "triggerPx");
+          const triggerCond = readString(args, "triggerCond");
+          if (triggerCond) {
+            triggerParam["triggerCond"] = triggerCond;
+          }
+        } else if (triggerStrategy === "rsi") {
+          triggerParam["triggerCond"] = requireString(args, "triggerCond");
+          triggerParam["thold"] = requireString(args, "thold");
+          triggerParam["timeframe"] = requireString(args, "timeframe");
+          const timePeriod = readString(args, "timePeriod");
+          triggerParam["timePeriod"] = timePeriod ?? "14";
+        }
+        const maxSafetyOrds = requireString(args, "maxSafetyOrds");
+        if (Number(maxSafetyOrds) > 0) {
+          if (!readString(args, "safetyOrdAmt")) {
+            throw new OkxApiError("safetyOrdAmt is required when maxSafetyOrds > 0", {
+              code: "VALIDATION",
+              endpoint: `${BASE}/create`
+            });
+          }
+          if (!readString(args, "pxSteps")) {
+            throw new OkxApiError("pxSteps is required when maxSafetyOrds > 0", {
+              code: "VALIDATION",
+              endpoint: `${BASE}/create`
+            });
+          }
+          if (!readString(args, "pxStepsMult")) {
+            throw new OkxApiError("pxStepsMult is required when maxSafetyOrds > 0", {
+              code: "VALIDATION",
+              endpoint: `${BASE}/create`
+            });
+          }
+          if (!readString(args, "volMult")) {
+            throw new OkxApiError("volMult is required when maxSafetyOrds > 0", {
+              code: "VALIDATION",
+              endpoint: `${BASE}/create`
+            });
+          }
         }
         const response = await context.client.privatePost(
           `${BASE}/create`,
           compactObject({
             instId,
-            algoOrdType: "contract_dca",
-            lever: requireString(args, "lever"),
+            algoOrdType,
+            lever: readString(args, "lever"),
             direction: requireString(args, "direction"),
             initOrdAmt: requireString(args, "initOrdAmt"),
             safetyOrdAmt: readString(args, "safetyOrdAmt"),
-            maxSafetyOrds: requireString(args, "maxSafetyOrds"),
+            maxSafetyOrds,
             pxSteps: readString(args, "pxSteps"),
             pxStepsMult: readString(args, "pxStepsMult"),
             volMult: readString(args, "volMult"),
             tpPct: requireString(args, "tpPct"),
             slPct: readString(args, "slPct"),
             slMode: readString(args, "slMode"),
-            allowReinvest: readString(args, "allowReinvest"),
-            triggerParams: [triggerParam]
+            allowReinvest: args["allowReinvest"] !== void 0 ? args["allowReinvest"] === true || args["allowReinvest"] === "true" : void 0,
+            triggerParams: [triggerParam],
+            tag: context.config.sourceTag,
+            algoClOrdId: readString(args, "algoClOrdId"),
+            reserveFunds: readString(args, "reserveFunds"),
+            tradeQuoteCcy: readString(args, "tradeQuoteCcy")
           }),
           privateRateLimit("dca_create_order", 20)
         );
@@ -3192,21 +3255,31 @@ function registerDcaTools() {
     {
       name: "dca_stop_order",
       module: "bot.dca",
-      description: "Stop a running Contract DCA bot. [CAUTION] This will stop the bot.",
+      description: "Stop a running DCA bot. [CAUTION] spot_dca needs stopType: 1=sell, 2=keep.",
       isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          algoId: { type: "string", description: "DCA bot algo order ID (not a trade ordId)" }
+          algoId: { type: "string", description: "Algo order ID" },
+          algoOrdType: { type: "string", enum: ["spot_dca", "contract_dca"] },
+          stopType: { type: "string", enum: ["1", "2"], description: "Required for spot_dca: 1=sell all, 2=keep tokens" }
         },
-        required: ["algoId"]
+        required: ["algoId", "algoOrdType"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const algoId = requireString(args, "algoId");
+        const algoOrdType = requireString(args, "algoOrdType");
+        const stopType = readString(args, "stopType");
+        if (algoOrdType === "spot_dca" && !stopType) {
+          throw new OkxApiError(
+            "stopType is required for spot_dca. Use '1' (sell all tokens) or '2' (keep tokens)",
+            { code: "VALIDATION", endpoint: `${BASE}/stop` }
+          );
+        }
         const response = await context.client.privatePost(
           `${BASE}/stop`,
-          { algoId, algoOrdType: "contract_dca" },
+          compactObject({ algoId, algoOrdType, stopType }),
           privateRateLimit("dca_stop_order", 20)
         );
         return normalizeWrite2(response);
@@ -3215,21 +3288,18 @@ function registerDcaTools() {
     {
       name: "dca_get_orders",
       module: "bot.dca",
-      description: "List DCA bots. status='active' for running; 'history' for stopped.",
+      description: "List DCA bots. Default: active (running). Use status=history for stopped.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          status: {
-            type: "string",
-            enum: ["active", "history"],
-            description: "active=running (default); history=stopped"
-          },
-          algoId: { type: "string", description: "DCA bot algo order ID (not a trade ordId)" },
-          instId: { type: "string", description: "e.g. BTC-USDT-SWAP" },
-          after: { type: "string", description: "Cursor for older records" },
-          before: { type: "string", description: "Cursor for newer records" },
-          limit: { type: "number", description: "Default 100" }
+          status: { type: "string", enum: ["active", "history"] },
+          algoOrdType: { type: "string", enum: ["spot_dca", "contract_dca"], description: "Default: contract_dca" },
+          algoId: { type: "string", description: "Algo order ID" },
+          instId: { type: "string" },
+          after: { type: "string", description: "Pagination cursor" },
+          before: { type: "string", description: "Pagination cursor" },
+          limit: { type: "number" }
         },
         required: []
       },
@@ -3237,10 +3307,11 @@ function registerDcaTools() {
         const args = asRecord(rawArgs);
         const status = readString(args, "status") ?? "active";
         const path42 = status === "history" ? `${BASE}/history-list` : `${BASE}/ongoing-list`;
+        const algoOrdType = readString(args, "algoOrdType") ?? "contract_dca";
         const response = await context.client.privateGet(
           path42,
           compactObject({
-            algoOrdType: "contract_dca",
+            algoOrdType,
             algoId: readString(args, "algoId"),
             instId: readString(args, "instId"),
             after: readString(args, "after"),
@@ -3255,21 +3326,23 @@ function registerDcaTools() {
     {
       name: "dca_get_order_details",
       module: "bot.dca",
-      description: "Get DCA bot detail by algo ID. Returns current position details.",
+      description: "Get DCA bot position details (avgPx, upl, liqPx, etc).",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          algoId: { type: "string", description: "DCA bot algo order ID (not a trade ordId)" }
+          algoId: { type: "string", description: "Algo order ID" },
+          algoOrdType: { type: "string", enum: ["spot_dca", "contract_dca"] }
         },
-        required: ["algoId"]
+        required: ["algoId", "algoOrdType"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const algoId = requireString(args, "algoId");
+        const algoOrdType = requireString(args, "algoOrdType");
         const response = await context.client.privateGet(
           `${BASE}/position-details`,
-          { algoId, algoOrdType: "contract_dca" },
+          { algoId, algoOrdType },
           privateRateLimit("dca_get_order_details", 20)
         );
         return normalizeResponse(response);
@@ -3278,29 +3351,31 @@ function registerDcaTools() {
     {
       name: "dca_get_sub_orders",
       module: "bot.dca",
-      description: "Query DCA bot cycles or orders within a cycle. Omit cycleId for cycle list; provide cycleId for orders.",
+      description: "Get DCA cycles or orders in a cycle. Omit cycleId=cycle list; with cycleId=orders.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          algoId: { type: "string", description: "DCA bot algo order ID (not a trade ordId)" },
-          cycleId: { type: "string", description: "Omit for cycle list; provide for orders within a cycle" },
-          after: { type: "string", description: "Cursor for older records (cycle-list mode only)" },
-          before: { type: "string", description: "Cursor for newer records (cycle-list mode only)" },
-          limit: { type: "number", description: "Default 100" }
+          algoId: { type: "string", description: "Algo order ID" },
+          algoOrdType: { type: "string", enum: ["spot_dca", "contract_dca"] },
+          cycleId: { type: "string", description: "Omit for cycles; provide for orders" },
+          after: { type: "string", description: "Pagination cursor" },
+          before: { type: "string", description: "Pagination cursor" },
+          limit: { type: "number" }
         },
-        required: ["algoId"]
+        required: ["algoId", "algoOrdType"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const algoId = requireString(args, "algoId");
+        const algoOrdType = requireString(args, "algoOrdType");
         const cycleId = readString(args, "cycleId");
         if (cycleId) {
           const response2 = await context.client.privateGet(
             `${BASE}/orders`,
             compactObject({
               algoId,
-              algoOrdType: "contract_dca",
+              algoOrdType,
               cycleId,
               limit: readNumber(args, "limit")
             }),
@@ -3312,7 +3387,7 @@ function registerDcaTools() {
           `${BASE}/cycle-list`,
           compactObject({
             algoId,
-            algoOrdType: "contract_dca",
+            algoOrdType,
             after: readString(args, "after"),
             before: readString(args, "before"),
             limit: readNumber(args, "limit")
@@ -7196,6 +7271,12 @@ function fail(label, detail, hints) {
     outputLine(`    \u2192 ${hint}`);
   }
 }
+function warn(label, detail, hints = []) {
+  outputLine(`  \u26A0 ${label.padEnd(14)} ${detail}`);
+  for (const hint of hints) {
+    outputLine(`    \u2192 ${hint}`);
+  }
+}
 function section(title) {
   outputLine("");
   outputLine(`  ${title}`);
@@ -7306,59 +7387,154 @@ function checkMcpEntryPoint(report) {
     return { entryPath: null, passed: false };
   }
 }
-function checkClaudeDesktopConfig(report) {
-  section("Claude Desktop Config");
-  const configPath = getConfigPath("claude-desktop");
-  if (!configPath) {
-    ok("config path", "(not applicable on this platform)");
-    report.add("claude_cfg", "n/a");
-    return true;
-  }
-  if (!fs4.existsSync(configPath)) {
-    fail("config file", `not found: ${configPath}`, [
-      "Claude Desktop may not be installed",
-      "Run: okx setup --client claude-desktop to configure"
-    ]);
-    report.add("claude_cfg", `MISSING ${sanitize(configPath)}`);
-    return false;
-  }
-  ok("config file", configPath);
-  report.add("claude_cfg", sanitize(configPath));
+var MCP_SERVER_NAME = "okx-trade-mcp";
+var CLIENT_LIMITS = {
+  cursor: { perServer: 40, total: 80 }
+};
+function checkJsonMcpConfig(configPath) {
+  if (!fs4.existsSync(configPath)) return "missing";
   try {
     const raw = fs4.readFileSync(configPath, "utf8");
     const parsed = JSON.parse(raw);
     const mcpServers = parsed["mcpServers"];
-    if (!mcpServers) {
-      fail("mcp entry", "no mcpServers section found", [
-        "Run: okx setup --client claude-desktop"
-      ]);
-      report.add("claude_mcp", "NO_SECTION");
-      return false;
-    }
+    if (!mcpServers) return "not-configured";
     const entries = Object.entries(mcpServers);
-    const mcpEntry = entries.find(([, v]) => {
+    const found = entries.find(([name, v]) => {
+      if (name.includes(MCP_SERVER_NAME)) return true;
       const val = v;
       const cmd = String(val["command"] ?? "");
       const args = val["args"] ?? [];
-      return cmd.includes("okx-trade-mcp") || args.some((a) => a.includes("okx-trade-mcp"));
+      return cmd.includes(MCP_SERVER_NAME) || args.some((a) => a.includes(MCP_SERVER_NAME));
     });
-    if (mcpEntry) {
-      ok("mcp entry", `found: "${mcpEntry[0]}"`);
-      report.add("claude_mcp", `found:${mcpEntry[0]}`);
-      return true;
+    return found ? "found" : "not-configured";
+  } catch (_e) {
+    return "parse-error";
+  }
+}
+function checkClaudeCodeConfig() {
+  const home = os2.homedir();
+  const candidates = [
+    path2.join(home, ".claude", "settings.json"),
+    path2.join(home, ".claude.json")
+  ];
+  let anyFound = false;
+  let anyParseError = false;
+  for (const cfgPath of candidates) {
+    if (!fs4.existsSync(cfgPath)) continue;
+    anyFound = true;
+    const result = checkJsonMcpConfig(cfgPath);
+    if (result === "found") return "found";
+    if (result === "parse-error") anyParseError = true;
+  }
+  if (!anyFound) return "missing";
+  if (anyParseError) return "parse-error";
+  return "not-configured";
+}
+function checkMcpClients(report) {
+  section("MCP Client Config");
+  const jsonClients = ["claude-desktop", "cursor", "windsurf"];
+  const configuredClients = [];
+  let anyFailed = false;
+  for (const clientId of jsonClients) {
+    const configPath = getConfigPath(clientId);
+    if (!configPath) continue;
+    const name = CLIENT_NAMES[clientId];
+    const status = checkJsonMcpConfig(configPath);
+    if (status === "missing") {
+      continue;
+    }
+    if (status === "found") {
+      ok(name, `configured (${sanitize(configPath)})`);
+      report.add(`client_${clientId}`, `OK ${sanitize(configPath)}`);
+      configuredClients.push(clientId);
+    } else if (status === "not-configured") {
+      fail(name, "okx-trade-mcp not found in mcpServers", [
+        `Run: okx setup --client ${clientId}`
+      ]);
+      report.add(`client_${clientId}`, "NOT_CONFIGURED");
+      anyFailed = true;
     } else {
-      fail("mcp entry", "okx-trade-mcp not found in mcpServers", [
-        "Run: okx setup --client claude-desktop"
+      fail(name, `JSON parse error in ${sanitize(configPath)}`, [
+        `Check ${sanitize(configPath)} for JSON syntax errors`,
+        `Then run: okx setup --client ${clientId}`
       ]);
-      report.add("claude_mcp", "NOT_CONFIGURED");
-      return false;
+      report.add(`client_${clientId}`, "PARSE_ERROR");
+      anyFailed = true;
+    }
+  }
+  const claudeCodeStatus = checkClaudeCodeConfig();
+  if (claudeCodeStatus !== "missing") {
+    const name = CLIENT_NAMES["claude-code"];
+    if (claudeCodeStatus === "found") {
+      ok(name, "configured");
+      report.add("client_claude-code", "OK");
+      configuredClients.push("claude-code");
+    } else if (claudeCodeStatus === "not-configured") {
+      warn(name, "installed but okx-trade-mcp not configured", [
+        "Run: okx setup --client claude-code"
+      ]);
+      report.add("client_claude-code", "NOT_CONFIGURED");
+    } else {
+      fail(name, "settings file has JSON parse error", [
+        "Run: okx setup --client claude-code"
+      ]);
+      report.add("client_claude-code", "PARSE_ERROR");
+      anyFailed = true;
     }
-  } catch (e) {
-    fail("config parse", `JSON parse error: ${e instanceof Error ? e.message : String(e)}`, [
-      `Check ${configPath} for JSON syntax errors`
+  }
+  if (configuredClients.length === 0 && !anyFailed) {
+    fail("no client", "no MCP client configuration found", [
+      "Run: okx setup --client <client>",
+      "Supported clients: claude-desktop, cursor, windsurf, claude-code"
     ]);
-    report.add("claude_cfg_parse", "FAIL");
-    return false;
+    report.add("client_cfg", "NONE_FOUND");
+    return { passed: false, configuredClients };
+  }
+  const passed = configuredClients.length > 0 && !anyFailed;
+  report.add("client_cfg", passed ? `OK (${configuredClients.join(",")})` : "FAIL");
+  return { passed, configuredClients };
+}
+function checkToolCount(report, configuredClients, getSpecs = allToolSpecs) {
+  section("Tool Count");
+  const specs = getSpecs();
+  const totalCount = specs.length;
+  const defaultModuleSet = new Set(DEFAULT_MODULES);
+  const defaultCount = specs.filter((s) => defaultModuleSet.has(s.module)).length;
+  const defaultModulesArg = DEFAULT_MODULES.join(",");
+  const applicableLimits = configuredClients.map((id) => ({ id, limits: CLIENT_LIMITS[id] })).filter((x) => x.limits !== void 0);
+  if (applicableLimits.length === 0) {
+    ok("total tools", `${totalCount} tools loaded`);
+    report.add("tool_count", `${totalCount}`);
+    return;
+  }
+  let anyExceeded = false;
+  for (const { id, limits } of applicableLimits) {
+    const name = CLIENT_NAMES[id];
+    if (totalCount > limits.total) {
+      warn(
+        "tool count",
+        `${totalCount} tools loaded \u2014 exceeds ${name} limit (${limits.total} total / ${limits.perServer} per server)`,
+        [
+          `Use --modules to reduce: okx-trade-mcp --modules ${defaultModulesArg} (${defaultCount} tools)`
+        ]
+      );
+      report.add("tool_count", `${totalCount} EXCEEDS_${id.toUpperCase()}_LIMIT`);
+      anyExceeded = true;
+    } else if (totalCount > limits.perServer) {
+      warn(
+        "tool count",
+        `${totalCount} tools loaded \u2014 exceeds ${name} per-server limit (${limits.perServer})`,
+        [
+          `Use --modules to reduce: okx-trade-mcp --modules ${defaultModulesArg} (${defaultCount} tools)`
+        ]
+      );
+      report.add("tool_count", `${totalCount} EXCEEDS_${id.toUpperCase()}_PER_SERVER_LIMIT`);
+      anyExceeded = true;
+    }
+  }
+  if (!anyExceeded) {
+    ok("total tools", `${totalCount} tools loaded (within limits for all configured clients)`);
+    report.add("tool_count", `${totalCount} OK`);
   }
 }
 function readLogTail(logPath) {
@@ -7551,9 +7727,10 @@ async function cmdDiagnoseMcp(options = {}) {
   checkMcpPackageVersion(report);
   const nodePassed = checkNodeCompat(report);
   const { entryPath, passed: entryPassed } = checkMcpEntryPoint(report);
-  const cfgPassed = checkClaudeDesktopConfig(report);
+  const { passed: cfgPassed, configuredClients } = checkMcpClients(report);
   checkMcpLogs(report);
   const moduleLoadPassed = checkModuleLoading(entryPath, report);
+  checkToolCount(report, configuredClients);
   let handshakePassed = false;
   if (entryPath && entryPassed && moduleLoadPassed) {
     handshakePassed = await checkStdioHandshake(entryPath, report);
@@ -7578,7 +7755,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "7ff8d64" : "dev";
+var GIT_HASH = true ? "35c609e" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -8421,27 +8598,27 @@ var HELP_TREE = {
         }
       },
       dca: {
-        description: "Contract DCA (Martingale) bot \u2014 leveraged recurring buys on futures/swaps",
+        description: "DCA (Martingale) bot \u2014 spot or contract recurring buys",
         commands: {
           orders: {
-            usage: "okx bot dca orders [--algoId <id>] [--instId <id>] [--history]",
-            description: "List active or historical Contract DCA bot orders"
+            usage: "okx bot dca orders [--algoOrdType <spot_dca|contract_dca>] [--algoId <id>] [--instId <id>] [--history]",
+            description: "List DCA bots (spot and/or contract)"
           },
           details: {
-            usage: "okx bot dca details --algoId <id>",
-            description: "Get details of a specific Contract DCA bot order"
+            usage: "okx bot dca details --algoOrdType <spot_dca|contract_dca> --algoId <id>",
+            description: "Get DCA bot details (spot or contract)"
           },
           "sub-orders": {
-            usage: "okx bot dca sub-orders --algoId <id> [--cycleId <id>]",
-            description: "List cycles or orders within a cycle of a Contract DCA bot"
+            usage: "okx bot dca sub-orders --algoOrdType <spot_dca|contract_dca> --algoId <id> [--cycleId <id>]",
+            description: "Get DCA cycles/orders (spot or contract)"
           },
           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                 Note: safetyOrdAmt, pxSteps, pxStepsMult, volMult are required when maxSafetyOrds > 0",
-            description: "Create a new Contract DCA bot order"
+            usage: "okx bot dca create --algoOrdType <spot_dca|contract_dca> --instId <id> --direction <long|short>\n                 --initOrdAmt <n> --maxSafetyOrds <n> --tpPct <n>\n                 [--lever <n>] [--safetyOrdAmt <n>] [--pxSteps <n>] [--pxStepsMult <n>] [--volMult <n>]\n                 [--slPct <n>] [--slMode <limit|market>] [--allowReinvest <true|false>]\n                 [--triggerStrategy <instant|price|rsi>] [--triggerPx <price>]\n                 [--triggerCond <cross_up|cross_down>] [--thold <n>] [--timeframe <tf>] [--timePeriod <n>]\n                 [--algoClOrdId <id>] [--reserveFunds <true|false>] [--tradeQuoteCcy <ccy>]\n                 Note: --lever required for contract_dca; safetyOrdAmt, pxSteps, pxStepsMult, volMult required when maxSafetyOrds > 0\n                 triggerStrategy: contract_dca supports instant|price|rsi; spot_dca supports instant|rsi",
+            description: "Create a DCA (Martingale) bot (spot or contract)"
           },
           stop: {
-            usage: "okx bot dca stop --algoId <id>",
-            description: "Stop a running Contract DCA bot order"
+            usage: "okx bot dca stop --algoOrdType <spot_dca|contract_dca> --algoId <id> [--stopType <1|2>]\n                 Note: --stopType required for spot_dca (1=sell all, 2=keep tokens)",
+            description: "Stop a DCA bot (spot or contract)"
           }
         }
       }
@@ -8676,7 +8853,7 @@ var CLI_OPTIONS = {
   autoCxl: { type: "boolean", default: false },
   clOrdId: { type: "string" },
   newPx: { type: "string" },
-  // dca bot (contract only)
+  // dca bot (spot & contract)
   initOrdAmt: { type: "string" },
   safetyOrdAmt: { type: "string" },
   maxSafetyOrds: { type: "string" },
@@ -8689,7 +8866,13 @@ var CLI_OPTIONS = {
   allowReinvest: { type: "string" },
   triggerStrategy: { type: "string" },
   triggerPx: { type: "string" },
+  triggerCond: { type: "string" },
+  thold: { type: "string" },
+  timeframe: { type: "string" },
+  timePeriod: { type: "string" },
   cycleId: { type: "string" },
+  reserveFunds: { type: "string" },
+  tradeQuoteCcy: { type: "string" },
   // i18n
   lang: { type: "string" },
   // option
@@ -8909,10 +9092,15 @@ async function cmdMarketTicker(run, instId, json) {
   printKv({
     instId: t["instId"],
     last: t["last"],
-    "24h change %": t["sodUtc8"],
+    "24h open": t["open24h"],
     "24h high": t["high24h"],
     "24h low": t["low24h"],
     "24h vol": t["vol24h"],
+    "24h change %": (() => {
+      const last = Number(t["last"]);
+      const open24h = Number(t["open24h"]);
+      return open24h !== 0 ? ((last - open24h) / open24h * 100).toFixed(2) + "%" : "N/A";
+    })(),
     time: new Date(Number(t["ts"])).toLocaleString()
   });
 }
@@ -10949,6 +11137,7 @@ async function cmdGridStop(run, opts) {
 async function cmdDcaCreate(run, opts) {
   const result = await run("dca_create_order", {
     instId: opts.instId,
+    algoOrdType: opts.algoOrdType,
     lever: opts.lever,
     direction: opts.direction,
     initOrdAmt: opts.initOrdAmt,
@@ -10962,25 +11151,33 @@ async function cmdDcaCreate(run, opts) {
     slMode: opts.slMode,
     allowReinvest: opts.allowReinvest,
     triggerStrategy: opts.triggerStrategy,
-    triggerPx: opts.triggerPx
+    triggerPx: opts.triggerPx,
+    triggerCond: opts.triggerCond,
+    thold: opts.thold,
+    timeframe: opts.timeframe,
+    timePeriod: opts.timePeriod,
+    algoClOrdId: opts.algoClOrdId,
+    reserveFunds: opts.reserveFunds,
+    tradeQuoteCcy: opts.tradeQuoteCcy
   });
   const data = getData7(result);
   if (opts.json) return printJson(data);
-  const r = data?.[0];
   emitWriteResult5(data?.[0], "DCA bot created", "algoId");
 }
 async function cmdDcaStop(run, opts) {
   const result = await run("dca_stop_order", {
-    algoId: opts.algoId
+    algoId: opts.algoId,
+    algoOrdType: opts.algoOrdType,
+    stopType: opts.stopType
   });
   const data = getData7(result);
   if (opts.json) return printJson(data);
-  const r = data?.[0];
   emitWriteResult5(data?.[0], "DCA bot stopped", "algoId");
 }
 async function cmdDcaOrders(run, opts) {
   const result = await run("dca_get_orders", {
     status: opts.history ? "history" : "active",
+    algoOrdType: opts.algoOrdType,
     algoId: opts.algoId,
     instId: opts.instId
   });
@@ -10994,6 +11191,7 @@ async function cmdDcaOrders(run, opts) {
     orders.map((o) => ({
       algoId: o["algoId"],
       instId: o["instId"],
+      type: o["algoOrdType"],
       state: o["state"],
       pnl: o["pnl"],
       pnlRatio: o["pnlRatio"],
@@ -11003,7 +11201,8 @@ async function cmdDcaOrders(run, opts) {
 }
 async function cmdDcaDetails(run, opts) {
   const result = await run("dca_get_order_details", {
-    algoId: opts.algoId
+    algoId: opts.algoId,
+    algoOrdType: opts.algoOrdType
   });
   const detail = (getData7(result) ?? [])[0];
   if (!detail) {
@@ -11013,6 +11212,7 @@ async function cmdDcaDetails(run, opts) {
   if (opts.json) return printJson(detail);
   printKv({
     algoId: detail["algoId"],
+    algoOrdType: detail["algoOrdType"],
     instId: detail["instId"],
     sz: detail["sz"],
     avgPx: detail["avgPx"],
@@ -11030,26 +11230,42 @@ async function cmdDcaDetails(run, opts) {
 async function cmdDcaSubOrders(run, opts) {
   const result = await run("dca_get_sub_orders", {
     algoId: opts.algoId,
+    algoOrdType: opts.algoOrdType,
     cycleId: opts.cycleId
   });
-  const orders = getData7(result) ?? [];
-  if (opts.json) return printJson(orders);
-  if (!orders.length) {
+  const rows = getData7(result) ?? [];
+  if (opts.json) return printJson(rows);
+  if (!rows.length) {
     outputLine("No sub-orders");
     return;
   }
-  printTable(
-    orders.map((o) => ({
-      cycleId: o["cycleId"],
-      status: o["cycleStatus"],
-      current: o["currentCycle"] ? "yes" : "",
-      avgPx: o["avgPx"],
-      tpPx: o["tpPx"],
-      realizedPnl: o["realizedPnl"],
-      fee: o["fee"],
-      startTime: o["startTime"] ? new Date(Number(o["startTime"])).toLocaleString() : ""
-    }))
-  );
+  if (opts.cycleId) {
+    printTable(
+      rows.map((o) => ({
+        ordId: o["ordId"],
+        side: o["side"],
+        ordType: o["ordType"],
+        px: o["px"],
+        filledSz: o["filledSz"],
+        avgFillPx: o["avgFillPx"],
+        state: o["state"],
+        fee: o["fee"]
+      }))
+    );
+  } else {
+    printTable(
+      rows.map((o) => ({
+        cycleId: o["cycleId"],
+        status: o["cycleStatus"],
+        current: o["currentCycle"] ? "yes" : "",
+        avgPx: o["avgPx"],
+        tpPx: o["tpPx"],
+        realizedPnl: o["realizedPnl"],
+        fee: o["fee"],
+        startTime: o["startTime"] ? new Date(Number(o["startTime"])).toLocaleString() : ""
+      }))
+    );
+  }
 }
 
 // src/commands/onchain-earn.ts
@@ -11349,7 +11565,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 ? "7ff8d64" : "dev";
+var GIT_HASH2 = true ? "35c609e" : "dev";
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);
@@ -11956,15 +12172,17 @@ function handleBotGridCommand(run, v, rest, json) {
     });
 }
 function handleBotDcaCommand(run, subAction, v, json) {
+  const algoOrdType = v.algoOrdType ?? "contract_dca";
   if (subAction === "orders")
-    return cmdDcaOrders(run, { algoId: v.algoId, instId: v.instId, history: v.history ?? false, json });
+    return cmdDcaOrders(run, { algoOrdType, algoId: v.algoId, instId: v.instId, history: v.history ?? false, json });
   if (subAction === "details")
-    return cmdDcaDetails(run, { algoId: v.algoId, json });
+    return cmdDcaDetails(run, { algoId: v.algoId, algoOrdType, json });
   if (subAction === "sub-orders")
-    return cmdDcaSubOrders(run, { algoId: v.algoId, cycleId: v.cycleId, json });
+    return cmdDcaSubOrders(run, { algoId: v.algoId, algoOrdType, cycleId: v.cycleId, json });
   if (subAction === "create")
     return cmdDcaCreate(run, {
       instId: v.instId,
+      algoOrdType,
       lever: v.lever,
       direction: v.direction,
       initOrdAmt: v.initOrdAmt,
@@ -11979,10 +12197,17 @@ function handleBotDcaCommand(run, subAction, v, json) {
       allowReinvest: v.allowReinvest,
       triggerStrategy: v.triggerStrategy,
       triggerPx: v.triggerPx,
+      triggerCond: v.triggerCond,
+      thold: v.thold,
+      timeframe: v.timeframe,
+      timePeriod: v.timePeriod,
+      algoClOrdId: v.algoClOrdId,
+      reserveFunds: v.reserveFunds,
+      tradeQuoteCcy: v.tradeQuoteCcy,
       json
     });
   if (subAction === "stop")
-    return cmdDcaStop(run, { algoId: v.algoId, json });
+    return cmdDcaStop(run, { algoId: v.algoId, algoOrdType, stopType: v.stopType, json });
 }
 function handleBotCommand(run, action, rest, v, json) {
   if (action === "grid") return handleBotGridCommand(run, v, rest, json);