toobit-trade-cli 1.0.1 → 1.0.3

package/dist/index.js

@@ -167,7 +167,9 @@ var TOOBIT_CODE_BEHAVIORS = {
   "-2013": { retry: false, suggestion: "Order does not exist." },
   "-2014": { retry: false, suggestion: "Bad API key format." },
   "-2015": { retry: false, suggestion: "Invalid API key, IP, or permission." },
-  "-2017": { retry: false, suggestion: "API key expired. Generate a new one." }
+  "-2017": { retry: false, suggestion: "API key expired. Generate a new one." },
+  "-1130": { retry: false, suggestion: "Invalid symbol format. Futures endpoints require BTC-SWAP-USDT format; spot endpoints use BTCUSDT." },
+  "-1107": { retry: false, suggestion: "API key is missing or malformed. Check X-BB-APIKEY header." }
 };
 function isDefined(value) {
   return value !== void 0 && value !== null;
@@ -285,34 +287,42 @@ var ToobitRestClient = class {
         `${config.method} ${config.path}`
       );
     }
-    if (!response.ok) {
-      throw new ToobitApiError(
-        `HTTP ${response.status} from Toobit: ${parsed.msg ?? "Unknown error"}`,
-        { code: String(response.status), endpoint: `${config.method} ${config.path}` }
-      );
-    }
     const responseCode = parsed.code;
-    if (responseCode !== void 0 && responseCode !== 0) {
-      const message = parsed.msg || "Toobit API request failed.";
-      const endpoint = `${config.method} ${config.path}`;
+    const responseMsg = parsed.msg || void 0;
+    const endpoint = `${config.method} ${config.path}`;
+    const hasBusinessCode = responseCode !== void 0 && responseCode !== 0 && responseCode !== 200;
+    if (hasBusinessCode) {
       const codeStr = String(responseCode);
-      if (codeStr === "-1002" || codeStr === "-1022" || codeStr === "-2014" || codeStr === "-2015") {
+      const message = responseMsg || "Toobit API request failed.";
+      const behavior = TOOBIT_CODE_BEHAVIORS[codeStr];
+      if (codeStr === "-1002" || codeStr === "-1022" || codeStr === "-1107" || codeStr === "-2014" || codeStr === "-2015" || codeStr === "-2017") {
         throw new AuthenticationError(
           message,
-          "Check API key, secret key and permissions.",
+          behavior?.suggestion ?? "Check API key, secret key and permissions.",
           endpoint
         );
       }
       if (codeStr === "-1003") {
         throw new RateLimitError(message, "Too many requests. Back off.", endpoint);
       }
-      const behavior = TOOBIT_CODE_BEHAVIORS[codeStr];
       throw new ToobitApiError(message, {
         code: codeStr,
         endpoint,
         suggestion: behavior?.suggestion
       });
     }
+    if (!response.ok) {
+      const rawMsg = responseMsg ?? "Unknown error";
+      let suggestion;
+      if (/symbol|paramter|parameter/i.test(rawMsg)) {
+        const isFuturesPath = /futures|fundingRate|openInterest|markPrice|contract|longShort|insurance|riskLimit/i.test(config.path);
+        suggestion = isFuturesPath ? "Futures endpoints require contract symbol format, e.g. BTC-SWAP-USDT instead of BTCUSDT." : "Spot endpoints require symbol format like BTCUSDT.";
+      }
+      throw new ToobitApiError(
+        `HTTP ${response.status} from Toobit: ${rawMsg}`,
+        { code: String(response.status), endpoint, suggestion }
+      );
+    }
     return {
       endpoint: `${config.method} ${config.path}`,
       requestTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -459,24 +469,26 @@ function registerAccountTools() {
       inputSchema: {
         type: "object",
         properties: {
-          fromAccountType: { type: "number", description: "1=coin, 2=contract" },
-          toAccountType: { type: "number", description: "1=coin, 2=contract" },
-          tokenId: { type: "string", description: "e.g. USDT" },
-          amount: { type: "string" },
-          subAccountId: { type: "string" }
+          fromUid: { type: "number", description: "From user ID" },
+          toUid: { type: "number", description: "To user ID" },
+          fromAccountType: { type: "string", enum: ["MAIN", "FUTURES", "COPY_TRADING"], description: "MAIN=spot, FUTURES=contract, COPY_TRADING=copy trading" },
+          toAccountType: { type: "string", enum: ["MAIN", "FUTURES", "COPY_TRADING"], description: "MAIN=spot, FUTURES=contract, COPY_TRADING=copy trading" },
+          asset: { type: "string", description: "Asset name, e.g. USDT" },
+          quantity: { type: "string", description: "Transfer quantity" }
         },
-        required: ["tokenId", "amount"]
+        required: ["fromUid", "toUid", "fromAccountType", "toAccountType", "asset", "quantity"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const response = await context.client.privatePost(
           "/api/v1/subAccount/transfer",
           compactObject({
-            fromAccountType: readNumber(args, "fromAccountType"),
-            toAccountType: readNumber(args, "toAccountType"),
-            tokenId: requireString(args, "tokenId"),
-            amount: requireString(args, "amount"),
-            subAccountId: readString(args, "subAccountId")
+            fromUid: readNumber(args, "fromUid"),
+            toUid: readNumber(args, "toUid"),
+            fromAccountType: requireString(args, "fromAccountType"),
+            toAccountType: requireString(args, "toAccountType"),
+            asset: requireString(args, "asset"),
+            quantity: requireString(args, "quantity")
           }),
           privateRateLimit("account_sub_transfer", 5)
         );
@@ -571,18 +583,18 @@ function registerAccountTools() {
       inputSchema: {
         type: "object",
         properties: {
-          tokenId: { type: "string", description: "e.g. USDT" },
-          chainType: { type: "string" }
+          coin: { type: "string", description: "Asset name, e.g. USDT" },
+          chainType: { type: "string", description: "Chain type, e.g. ERC20, TRC20, OMNI" }
         },
-        required: ["tokenId"]
+        required: ["coin", "chainType"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
         const response = await context.client.privateGet(
           "/api/v1/account/deposit/address",
           compactObject({
-            tokenId: requireString(args, "tokenId"),
-            chainType: readString(args, "chainType")
+            coin: requireString(args, "coin"),
+            chainType: requireString(args, "chainType")
           }),
           privateRateLimit("account_get_deposit_address", 20)
         );
@@ -665,38 +677,45 @@ function registerFuturesTools() {
     {
       name: "futures_place_order",
       module: "futures",
-      description: "Place a USDT-M futures order. [CAUTION] Executes real trades. Private endpoint. Rate limit: 20 req/s.",
+      description: "Place a USDT-M futures order. For market orders, set orderType to MARKET \u2014 the handler automatically converts to type=LIMIT + priceType=MARKET as required by Toobit API. [CAUTION] Executes real trades. Private endpoint. Rate limit: 20 req/s.",
       isWrite: true,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT" },
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT" },
           side: { type: "string", enum: ["BUY_OPEN", "SELL_OPEN", "BUY_CLOSE", "SELL_CLOSE"] },
-          orderType: { type: "string", enum: ["LIMIT", "MARKET"], description: "Order type" },
+          orderType: { type: "string", enum: ["LIMIT", "MARKET", "STOP"], description: "LIMIT=limit order, MARKET=market order (auto-converted), STOP=conditional order" },
           quantity: { type: "string", description: "Order quantity (contracts)" },
-          price: { type: "string", description: "Required for LIMIT" },
+          price: { type: "string", description: "Required for LIMIT orders with priceType=INPUT" },
           leverage: { type: "string", description: "Leverage, e.g. 10" },
-          clientOrderId: { type: "string" },
-          priceType: { type: "string", enum: ["INPUT", "OPPONENT", "QUEUE", "OVER", "MARKET"], description: "Price type for trigger orders" },
-          triggerPrice: { type: "string", description: "Trigger price for conditional orders" },
-          timeInForce: { type: "string", enum: ["GTC", "IOC", "FOK", "LIMIT_MAKER"] }
+          newClientOrderId: { type: "string", description: "Unique client order ID. Auto-generated if omitted." },
+          priceType: { type: "string", enum: ["INPUT", "OPPONENT", "QUEUE", "OVER", "MARKET"], description: "Price type. INPUT=specified price, MARKET=market price" },
+          stopPrice: { type: "string", description: "Trigger price for STOP orders" },
+          timeInForce: { type: "string", enum: ["GTC", "IOC", "FOK"] }
         },
         required: ["symbol", "side", "orderType", "quantity"]
       },
       handler: async (rawArgs, context) => {
         const args = asRecord(rawArgs);
+        let orderType = requireString(args, "orderType");
+        let priceType = readString(args, "priceType");
+        if (orderType === "MARKET") {
+          orderType = "LIMIT";
+          priceType = "MARKET";
+        }
+        const clientId = readString(args, "newClientOrderId") ?? `mcp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
         const response = await context.client.privatePost(
           "/api/v1/futures/order",
           compactObject({
             symbol: requireString(args, "symbol"),
             side: requireString(args, "side"),
-            orderType: requireString(args, "orderType"),
+            type: orderType,
             quantity: requireString(args, "quantity"),
             price: readString(args, "price"),
             leverage: readString(args, "leverage"),
-            clientOrderId: readString(args, "clientOrderId"),
-            priceType: readString(args, "priceType"),
-            triggerPrice: readString(args, "triggerPrice"),
+            newClientOrderId: clientId,
+            priceType,
+            stopPrice: readString(args, "stopPrice"),
             timeInForce: readString(args, "timeInForce")
           }),
           privateRateLimit("futures_place_order", 20)
@@ -1027,7 +1046,7 @@ function registerFuturesTools() {
         type: "object",
         properties: {
           symbol: { type: "string", description: "e.g. BTCUSDT" },
-          marginType: { type: "string", enum: ["1", "2"], description: "1=cross, 2=isolated" }
+          marginType: { type: "string", enum: ["CROSS", "ISOLATED"], description: "CROSS=cross margin, ISOLATED=isolated margin" }
         },
         required: ["symbol", "marginType"]
       },
@@ -1298,6 +1317,13 @@ function registerFuturesTools() {
     }
   ];
 }
+function readPositiveInt(args, key) {
+  const value = readNumber(args, key);
+  if (value !== void 0 && value < 1) {
+    throw new ValidationError(`Parameter "${key}" must be a positive integer.`);
+  }
+  return value;
+}
 function normalize3(response) {
   return { endpoint: response.endpoint, requestTime: response.requestTime, data: response.data };
 }
@@ -1342,7 +1368,7 @@ function registerMarketTools() {
         const args = asRecord(rawArgs);
         const response = await context.client.publicGet(
           "/quote/v1/depth",
-          compactObject({ symbol: requireString(args, "symbol"), limit: readNumber(args, "limit") }),
+          compactObject({ symbol: requireString(args, "symbol"), limit: readPositiveInt(args, "limit") }),
           publicRateLimit("market_get_depth", 20)
         );
         return normalize3(response);
@@ -1366,7 +1392,7 @@ function registerMarketTools() {
         const args = asRecord(rawArgs);
         const response = await context.client.publicGet(
           "/quote/v1/depth/merged",
-          compactObject({ symbol: requireString(args, "symbol"), scale: readNumber(args, "scale"), limit: readNumber(args, "limit") }),
+          compactObject({ symbol: requireString(args, "symbol"), scale: readNumber(args, "scale"), limit: readPositiveInt(args, "limit") }),
           publicRateLimit("market_get_merged_depth", 20)
         );
         return normalize3(response);
@@ -1389,7 +1415,7 @@ function registerMarketTools() {
         const args = asRecord(rawArgs);
         const response = await context.client.publicGet(
           "/quote/v1/trades",
-          compactObject({ symbol: requireString(args, "symbol"), limit: readNumber(args, "limit") }),
+          compactObject({ symbol: requireString(args, "symbol"), limit: readPositiveInt(args, "limit") }),
           publicRateLimit("market_get_trades", 20)
         );
         return normalize3(response);
@@ -1420,7 +1446,7 @@ function registerMarketTools() {
             interval: requireString(args, "interval"),
             startTime: readNumber(args, "startTime"),
             endTime: readNumber(args, "endTime"),
-            limit: readNumber(args, "limit")
+            limit: readPositiveInt(args, "limit")
           }),
           publicRateLimit("market_get_klines", 20)
         );
@@ -1430,12 +1456,12 @@ function registerMarketTools() {
     {
       name: "market_get_ticker_24hr",
       module: "market",
-      description: "Get 24h price change statistics for a spot symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get 24h price change statistics for a spot symbol. Omitting symbol returns ALL symbols (900+). Always specify a symbol unless you need the full list. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all symbols." }
+          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all symbols (warning: 900+ results)." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1451,12 +1477,12 @@ function registerMarketTools() {
     {
       name: "market_get_ticker_price",
       module: "market",
-      description: "Get latest price for a spot symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get latest price for a spot symbol. Omitting symbol returns ALL symbols (900+), which may consume many tokens. Always specify a symbol unless you need the full list. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all symbols." }
+          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all symbols (warning: 900+ results)." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1472,12 +1498,12 @@ function registerMarketTools() {
     {
       name: "market_get_book_ticker",
       module: "market",
-      description: "Get best bid/ask price for a spot symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get best bid/ask price for a spot symbol. Omitting symbol returns ALL symbols. Always specify a symbol unless you need the full list. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all symbols." }
+          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all symbols (warning: 900+ results)." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1515,7 +1541,7 @@ function registerMarketTools() {
             interval: requireString(args, "interval"),
             startTime: readNumber(args, "startTime"),
             endTime: readNumber(args, "endTime"),
-            limit: readNumber(args, "limit")
+            limit: readPositiveInt(args, "limit")
           }),
           publicRateLimit("market_get_index_klines", 20)
         );
@@ -1525,12 +1551,12 @@ function registerMarketTools() {
     {
       name: "market_get_mark_price",
       module: "market",
-      description: "Get latest mark price for a futures symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get latest mark price for a futures symbol. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all." }
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT. Omit for all." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1546,12 +1572,12 @@ function registerMarketTools() {
     {
       name: "market_get_mark_price_klines",
       module: "market",
-      description: "Get mark price K-line data. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get mark price K-line data. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT" },
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT" },
           interval: { type: "string", enum: [...TOOBIT_CANDLE_BARS] },
           startTime: { type: "number" },
           endTime: { type: "number" },
@@ -1568,7 +1594,7 @@ function registerMarketTools() {
             interval: requireString(args, "interval"),
             startTime: readNumber(args, "startTime"),
             endTime: readNumber(args, "endTime"),
-            limit: readNumber(args, "limit")
+            limit: readPositiveInt(args, "limit")
           }),
           publicRateLimit("market_get_mark_price_klines", 20)
         );
@@ -1578,12 +1604,12 @@ function registerMarketTools() {
     {
       name: "market_get_funding_rate",
       module: "market",
-      description: "Get current funding rate for a futures symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get current funding rate for a futures symbol. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all." }
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT. Omit for all." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1599,12 +1625,12 @@ function registerMarketTools() {
     {
       name: "market_get_funding_rate_history",
       module: "market",
-      description: "Get historical funding rates for a futures symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get historical funding rates for a futures symbol. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT" },
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT" },
           startTime: { type: "number" },
           endTime: { type: "number" },
           limit: { type: "number", description: "Default 100, max 1000" }
@@ -1619,7 +1645,7 @@ function registerMarketTools() {
             symbol: requireString(args, "symbol"),
             startTime: readNumber(args, "startTime"),
             endTime: readNumber(args, "endTime"),
-            limit: readNumber(args, "limit")
+            limit: readPositiveInt(args, "limit")
           }),
           publicRateLimit("market_get_funding_rate_history", 20)
         );
@@ -1629,12 +1655,12 @@ function registerMarketTools() {
     {
       name: "market_get_open_interest",
       module: "market",
-      description: "Get total open interest for a futures symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get total open interest for a futures symbol. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all." }
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT. Omit for all." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1655,7 +1681,7 @@ function registerMarketTools() {
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT" },
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT" },
           period: { type: "string", description: "e.g. 5m, 15m, 30m, 1h, 2h, 4h, 6h, 12h, 1d" },
           startTime: { type: "number" },
           endTime: { type: "number" },
@@ -1672,7 +1698,7 @@ function registerMarketTools() {
             period: requireString(args, "period"),
             startTime: readNumber(args, "startTime"),
             endTime: readNumber(args, "endTime"),
-            limit: readNumber(args, "limit")
+            limit: readPositiveInt(args, "limit")
           }),
           publicRateLimit("market_get_long_short_ratio", 20)
         );
@@ -1682,12 +1708,12 @@ function registerMarketTools() {
     {
       name: "market_get_contract_ticker_24hr",
       module: "market",
-      description: "Get 24h price change statistics for a futures contract. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get 24h price change statistics for a futures contract. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all." }
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT. Omit for all." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1703,12 +1729,12 @@ function registerMarketTools() {
     {
       name: "market_get_contract_ticker_price",
       module: "market",
-      description: "Get latest price for a futures contract. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get latest price for a futures contract. Supports both spot (BTCUSDT) and contract (BTC-SWAP-USDT) symbol formats. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT. Omit for all." }
+          symbol: { type: "string", description: "e.g. BTC-SWAP-USDT or BTCUSDT. Omit for all." }
         }
       },
       handler: async (rawArgs, context) => {
@@ -1745,12 +1771,12 @@ function registerMarketTools() {
     {
       name: "market_get_insurance_fund",
       module: "market",
-      description: "Get insurance fund balance for a symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get insurance fund balance for a futures symbol. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT" }
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT" }
         },
         required: ["symbol"]
       },
@@ -1767,12 +1793,12 @@ function registerMarketTools() {
     {
       name: "market_get_risk_limits",
       module: "market",
-      description: "Get risk limits configuration for a futures symbol. Public endpoint. Rate limit: 20 req/s.",
+      description: "Get risk limits configuration for a futures symbol. Requires contract symbol format. Public endpoint. Rate limit: 20 req/s.",
       isWrite: false,
       inputSchema: {
         type: "object",
         properties: {
-          symbol: { type: "string", description: "e.g. BTCUSDT" }
+          symbol: { type: "string", description: "Futures contract symbol, e.g. BTC-SWAP-USDT" }
         },
         required: ["symbol"]
       },
@@ -2078,12 +2104,15 @@ function allToolSpecs() {
   ];
 }
 function createToolRunner(client, config) {
-  const fullConfig = { ...config, modules: [...MODULES], readOnly: false };
+  const fullConfig = { ...config, modules: [...MODULES] };
   const tools = allToolSpecs();
   const toolMap = new Map(tools.map((t) => [t.name, t]));
   return async (toolName, args) => {
     const tool = toolMap.get(toolName);
     if (!tool) throw new Error(`Unknown tool: ${toolName}`);
+    if (config.readOnly && tool.isWrite) {
+      throw new Error(`Tool "${toolName}" is a write operation and is blocked in read-only mode.`);
+    }
     const result = await tool.handler(args, { config: fullConfig, client });
     return result;
   };
@@ -2264,11 +2293,58 @@ function parseCli(argv = process.argv.slice(2)) {
 }
 
 // src/formatter.ts
+function extractRows(value) {
+  if (Array.isArray(value)) return value;
+  if (typeof value === "object" && value !== null) {
+    const entries = Object.values(value);
+    for (const v of entries) {
+      if (Array.isArray(v)) return v;
+    }
+  }
+  return null;
+}
 function formatJson(data, json) {
   if (json) return JSON.stringify(data, null, 2);
   if (data === null || data === void 0) return "No data.";
   if (typeof data !== "object") return String(data);
-  return JSON.stringify(data, null, 2);
+  const record = data;
+  const inner = record.data ?? record;
+  const rows = extractRows(inner);
+  if (rows) {
+    if (rows.length === 0) return "No data.";
+    if (typeof rows[0] === "object" && rows[0] !== null) {
+      return formatTable(rows);
+    }
+    return rows.map(String).join("\n");
+  }
+  if (typeof inner === "object" && inner !== null) {
+    return formatKv(inner);
+  }
+  return String(inner);
+}
+function formatKv(data) {
+  const entries = Object.entries(data).filter(([, v]) => v !== void 0 && v !== null);
+  if (entries.length === 0) return "No data.";
+  const maxKey = Math.max(...entries.map(([k]) => k.length));
+  return entries.map(([k, v]) => {
+    if (typeof v === "object") return `${k.padEnd(maxKey)}  ${JSON.stringify(v)}`;
+    return `${k.padEnd(maxKey)}  ${String(v)}`;
+  }).join("\n");
+}
+function formatTable(rows, columns) {
+  if (rows.length === 0) return "No data.";
+  const keys = columns ?? Object.keys(rows[0]);
+  const widths = keys.map(
+    (k) => Math.max(k.length, ...rows.map((r) => String(r[k] ?? "").length))
+  );
+  const header = keys.map((k, i) => k.padEnd(widths[i])).join("  ");
+  const separator = widths.map((w) => "-".repeat(w)).join("  ");
+  const body = rows.map(
+    (row) => keys.map((k, i) => String(row[k] ?? "").padEnd(widths[i])).join("  ")
+  ).join("\n");
+  return `${header}
+${separator}
+${body}`;
 }
 
 // src/commands/market.ts
@@ -2331,9 +2407,18 @@ async function handleMarketCommand(cli, run) {
     case "long-short-ratio":
       result = await run("market_get_long_short_ratio", { symbol: f.symbol, period: f.period ?? "1h" });
       break;
+    case "contract-ticker-price":
+      result = await run("market_get_contract_ticker_price", { symbol: f.symbol });
+      break;
+    case "insurance-fund":
+      result = await run("market_get_insurance_fund", { symbol: f.symbol });
+      break;
+    case "risk-limits":
+      result = await run("market_get_risk_limits", { symbol: f.symbol });
+      break;
     default:
       process.stdout.write(`Unknown market subcommand: ${cli.subcommand}
-Available: time, info, ticker, ticker-24hr, depth, trades, klines, candles, book-ticker, mark-price, funding-rate, funding-rate-history, open-interest, index, contract-ticker, long-short-ratio
+Available: time, info, ticker, ticker-24hr, depth, trades, klines, candles, book-ticker, mark-price, funding-rate, funding-rate-history, open-interest, index, contract-ticker, contract-ticker-price, long-short-ratio, insurance-fund, risk-limits
 `);
       return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toobit-trade-cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "bin": {
     "toobit": "dist/index.js"

package/src/commands/market.ts

@@ -62,8 +62,17 @@ export async function handleMarketCommand(cli: CliParsed, run: ToolRunner): Prom
     case "long-short-ratio":
       result = await run("market_get_long_short_ratio", { symbol: f.symbol, period: f.period ?? "1h" });
       break;
+    case "contract-ticker-price":
+      result = await run("market_get_contract_ticker_price", { symbol: f.symbol });
+      break;
+    case "insurance-fund":
+      result = await run("market_get_insurance_fund", { symbol: f.symbol });
+      break;
+    case "risk-limits":
+      result = await run("market_get_risk_limits", { symbol: f.symbol });
+      break;
     default:
-      process.stdout.write(`Unknown market subcommand: ${cli.subcommand}\nAvailable: time, info, ticker, ticker-24hr, depth, trades, klines, candles, book-ticker, mark-price, funding-rate, funding-rate-history, open-interest, index, contract-ticker, long-short-ratio\n`);
+      process.stdout.write(`Unknown market subcommand: ${cli.subcommand}\nAvailable: time, info, ticker, ticker-24hr, depth, trades, klines, candles, book-ticker, mark-price, funding-rate, funding-rate-history, open-interest, index, contract-ticker, contract-ticker-price, long-short-ratio, insurance-fund, risk-limits\n`);
       return;
   }
 

package/src/formatter.ts

@@ -1,8 +1,46 @@
+function extractRows(value: unknown): unknown[] | null {
+  if (Array.isArray(value)) return value;
+  if (typeof value === "object" && value !== null) {
+    const entries = Object.values(value as Record<string, unknown>);
+    for (const v of entries) {
+      if (Array.isArray(v)) return v;
+    }
+  }
+  return null;
+}
+
 export function formatJson(data: unknown, json: boolean): string {
   if (json) return JSON.stringify(data, null, 2);
   if (data === null || data === undefined) return "No data.";
   if (typeof data !== "object") return String(data);
-  return JSON.stringify(data, null, 2);
+
+  const record = data as Record<string, unknown>;
+  const inner = record.data ?? record;
+
+  const rows = extractRows(inner);
+  if (rows) {
+    if (rows.length === 0) return "No data.";
+    if (typeof rows[0] === "object" && rows[0] !== null) {
+      return formatTable(rows as Record<string, unknown>[]);
+    }
+    return rows.map(String).join("\n");
+  }
+
+  if (typeof inner === "object" && inner !== null) {
+    return formatKv(inner as Record<string, unknown>);
+  }
+
+  return String(inner);
+}
+
+export function formatKv(data: Record<string, unknown>): string {
+  const entries = Object.entries(data).filter(([, v]) => v !== undefined && v !== null);
+  if (entries.length === 0) return "No data.";
+  const maxKey = Math.max(...entries.map(([k]) => k.length));
+  return entries.map(([k, v]) => {
+    if (typeof v === "object") return `${k.padEnd(maxKey)}  ${JSON.stringify(v)}`;
+    return `${k.padEnd(maxKey)}  ${String(v)}`;
+  }).join("\n");
 }
 
 export function formatTable(rows: Record<string, unknown>[], columns?: string[]): string {