@michaleffffff/mcp-trading-server 3.0.4 → 3.0.5

package/dist/tools/closeAllPositions.js

@@ -1,26 +1,28 @@
 import { z } from "zod";
 import { resolveClient, getChainId, getQuoteToken } from "../auth/resolveClient.js";
-import { getOraclePrice } from "../services/marketService.js";
+import { getOraclePrice, resolvePool } from "../services/marketService.js";
 import { ensureUnits } from "../utils/units.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 import { normalizeSlippagePct4dpFlexible, SLIPPAGE_PCT_4DP_DESC } from "../utils/slippage.js";
 export const closeAllPositionsTool = {
     name: "close_all_positions",
-    description: "Emergency: close ALL open positions in a pool at once. Use for risk management.",
+    description: "[TRADE] Emergency: close ALL open positions in a pool at once. Use for risk management.",
     schema: {
-        poolId: z.string().describe("Pool ID to close all positions in"),
+        poolId: z.string().optional().describe("Pool ID or keyword."),
+        keyword: z.string().optional().describe("Market keyword, e.g. 'BTC'."),
         slippagePct: z.union([z.string(), z.number()]).optional().describe(`${SLIPPAGE_PCT_4DP_DESC}. Also supports human percent format like "1.0" or "1%".`),
     },
     handler: async (args) => {
         try {
             const { client, address, signer } = await resolveClient();
             const chainId = getChainId();
+            const poolId = await resolvePool(client, args.poolId, args.keyword);
             // 1) 先获取该池的所有持仓
             const posResult = await client.position.listPositions(address);
             const positions = posResult?.data || posResult || [];
             // 过滤出指定 pool 的仓位
             const poolPositions = Array.isArray(positions)
-                ? positions.filter((p) => p.poolId === args.poolId || p.pool_id === args.poolId)
+                ? positions.filter((p) => p.poolId === poolId || p.pool_id === poolId)
                 : [];
             if (poolPositions.length === 0) {
                 return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: { message: "No open positions in this pool.", closed: 0 } }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
@@ -28,14 +30,14 @@ export const closeAllPositionsTool = {
             // 2) 为每个仓位构建平仓参数
             const slippagePct = normalizeSlippagePct4dpFlexible(args.slippagePct ?? "200");
             // 3) We need actual oracle prices to avoid Revert 0x613970e0 (InvalidParameter)
-            const oraclePriceReq = await getOraclePrice(client, args.poolId).catch(() => null);
+            const oraclePriceReq = await getOraclePrice(client, poolId).catch(() => null);
             let fallbackPrice = "0";
             if (oraclePriceReq && oraclePriceReq.price) {
                 fallbackPrice = oraclePriceReq.price.toString();
             }
             else {
                 const { getMarketPrice } = await import("../services/marketService.js");
-                const marketData = await getMarketPrice(client, args.poolId).catch(() => null);
+                const marketData = await getMarketPrice(client, poolId).catch(() => null);
                 if (marketData && marketData.price) {
                     fallbackPrice = marketData.price.toString();
                 }
@@ -50,7 +52,7 @@ export const closeAllPositionsTool = {
                 return {
                     chainId,
                     address,
-                    poolId: args.poolId,
+                    poolId: poolId,
                     positionId: pos.positionId || pos.position_id || pos.id,
                     orderType: 0, // MARKET
                     triggerType: 0, // NONE

package/dist/tools/closePosition.js

@@ -24,7 +24,7 @@ function readRawPositionField(position, primary, fallback) {
 }
 export const closePositionTool = {
     name: "close_position",
-    description: "Create a decrease order using SDK-native parameters.",
+    description: "[TRADE] Create a decrease order (close or reduce position) using SDK-native parameters.",
     schema: {
         poolId: z.string().describe("Pool ID"),
         positionId: z.string().describe("Position ID to close"),

package/dist/tools/createPerpMarket.js

@@ -4,7 +4,7 @@ import { resolveClient } from "../auth/resolveClient.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const createPerpMarketTool = {
     name: "create_perp_market",
-    description: "Create a new perpetual contract pool on MYX. IMPORTANT: marketId cannot be randomly generated. It must be a valid 66-character config hash (0x...) tied to a supported quote token (like USDC). Use get_market_detail (after search_market/get_pool_list) to fetch an existing marketId if you don't have a specific newly allocated one.",
+    description: "[LIQUIDITY] Create a new perpetual contract pool on MYX. IMPORTANT: marketId cannot be randomly generated. It must be a valid 66-character config hash (0x...) tied to a supported quote token (like USDC). Use get_pool_metadata (after find_pool/list_pools) to fetch an existing marketId if you don't have a specific newly allocated one.",
     schema: {
         baseToken: z.string().describe("Base token contract address (e.g., 0xb40aaadc43...)"),
         marketId: z.string().describe("MUST be a valid 66-char config hash (e.g., existing USDC marketId: 0x7f6727d8026fd2c87ccc745846c83cd0b68e886c73e1e05a54a675bcadd8adb6). Do NOT generate randomly."),

package/dist/tools/executeTrade.js

@@ -11,12 +11,12 @@ const POSITION_ID_RE = /^$|^0x[0-9a-fA-F]{64}$/;
 const ZERO_POSITION_ID_RE = /^0x0{64}$/i;
 export const executeTradeTool = {
     name: "execute_trade",
-    description: "Create an increase order using SDK-native parameters.",
+    description: "[TRADE] Create an increase order (open or add to position) using SDK-native parameters.",
     schema: {
-        poolId: z.string().describe("Hex Pool ID, e.g. '0x14a19...'. Get via get_pool_list."),
-        positionId: z.string().refine((value) => POSITION_ID_RE.test(value), {
+        poolId: z.string().describe("Hex Pool ID, e.g. '0x14a19...'. Get via list_pools."),
+        positionId: z.string().optional().refine((value) => !value || POSITION_ID_RE.test(value), {
             message: "positionId must be empty string for new position, or a bytes32 hex string.",
-        }).describe("Position ID: Use empty string '' for NEW positions, or valid hex for INCREASING existing ones. 0x000..00 is auto-treated as NEW."),
+        }).describe("Position ID: Use empty string '' for NEW positions, or valid hex for INCREASING existing ones. 0x000..00 is auto-treated as NEW. Default is empty string."),
         orderType: z.union([z.number(), z.string()]).describe("Market/Limit/Stop. e.g. 0 or 'MARKET'."),
         triggerType: z.union([z.number(), z.string()]).optional().describe("0=None (Market), 1=GTE, 2=LTE. e.g. 'GTE'."),
         direction: z.union([z.number(), z.string()]).describe("0/LONG/BUY or 1/SHORT/SELL."),
@@ -26,7 +26,7 @@ export const executeTradeTool = {
         timeInForce: z.coerce.number().int().describe("0=GTC, 1=IOC, 2=FOK"),
         postOnly: z.coerce.boolean().describe("If true, order only executes as Maker."),
         slippagePct: z.coerce.string().default("50").describe(`${SLIPPAGE_PCT_4DP_DESC}. Default is 50 (0.5%).`),
-        executionFeeToken: z.string().describe("Address of token to pay gas/execution fees (typically USDC)."),
+        executionFeeToken: z.string().optional().describe("Address of token to pay gas/execution fees (typically USDC). Default is pool quoteToken."),
         leverage: z.coerce.number().positive().describe("Leverage multiplier, e.g., 10 for 10x."),
         tpSize: z.union([z.string(), z.number()]).optional().describe("Take Profit size. Use '0' to disable."),
         tpPrice: z.union([z.string(), z.number()]).optional().describe("Take Profit trigger price."),
@@ -35,7 +35,7 @@ export const executeTradeTool = {
         tradingFee: z.union([z.string(), z.number()]).optional().describe("Trading fee in quote token units. Supports human/raw prefix. Optional: auto-computed via get_user_trading_fee_rate."),
         assetClass: z.coerce.number().int().nonnegative().optional().describe("Optional fee lookup assetClass (default from pool config or 1)."),
         riskTier: z.coerce.number().int().nonnegative().optional().describe("Optional fee lookup riskTier (default from pool config or 1)."),
-        marketId: z.string().describe("Specific Market Config Hash. Fetch via get_market_detail (resolve poolId first with search_market/get_pool_list)."),
+        marketId: z.string().describe("Specific Market Config Hash. Fetch via get_pool_metadata (resolve poolId first with find_pool/list_pools)."),
     },
     handler: async (args) => {
         try {

package/dist/tools/findPool.js

@@ -0,0 +1,26 @@
+import { z } from "zod";
+import { resolveClient } from "../auth/resolveClient.js";
+import { searchMarket } from "../services/marketService.js";
+export const findPoolTool = {
+    name: "find_pool",
+    description: "[MARKET] Search for pools by keyword or symbol. Returns matched market metadata.",
+    schema: {
+        keyword: z.string().describe("Search keyword or symbol, e.g. 'BTC', 'ETH/USDC'"),
+        limit: z.number().int().positive().optional().describe("Max search results (default 10)"),
+    },
+    handler: async (args) => {
+        try {
+            const { client } = await resolveClient();
+            const results = await searchMarket(client, args.keyword, args.limit ?? 10);
+            return {
+                content: [{
+                        type: "text",
+                        text: JSON.stringify({ status: "success", data: results }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2)
+                    }]
+            };
+        }
+        catch (error) {
+            return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+        }
+    },
+};

package/dist/tools/getAccountSnapshot.js

@@ -0,0 +1,41 @@
+import { z } from "zod";
+import { resolveClient, getChainId } from "../auth/resolveClient.js";
+export const getAccountSnapshotTool = {
+    name: "get_account_snapshot",
+    description: "[ACCOUNT] Get unified account snapshot (balances, trading metrics, and VIP tier).",
+    schema: {
+        poolId: z.string().optional().describe("Pool ID for detailed trading-account metrics."),
+        chainId: z.number().int().positive().optional().describe("Optional chainId override"),
+    },
+    handler: async (args) => {
+        try {
+            const { client, address } = await resolveClient();
+            const chainId = args.chainId ?? getChainId();
+            const { getBalances, getMarginBalance } = await import("../services/balanceService.js");
+            const [vipRes, walletRes] = await Promise.all([
+                client.account.getAccountVipInfo(chainId, address).catch(() => null),
+                getBalances(client, address, chainId).catch(() => null)
+            ]);
+            let tradingAccount = null;
+            if (args.poolId) {
+                const [info, margin] = await Promise.all([
+                    client.account.getAccountInfo(chainId, address, args.poolId).catch(() => null),
+                    getMarginBalance(client, address, args.poolId, chainId).catch(() => null)
+                ]);
+                tradingAccount = {
+                    info: info?.data || info,
+                    margin: margin?.data || margin
+                };
+            }
+            const results = {
+                wallet: walletRes?.data || walletRes,
+                tradingAccount,
+                vip: vipRes?.data || vipRes,
+            };
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: results }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+        }
+        catch (error) {
+            return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+        }
+    },
+};

package/dist/tools/getAllTickers.js

@@ -1,7 +1,8 @@
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { getPoolList } from "../services/marketService.js";
 export const getAllTickersTool = {
     name: "get_all_tickers",
-    description: "Get ticker snapshots for all markets.",
+    description: "[MARKET] Get ticker snapshots for all markets.",
     schema: {},
     handler: async () => {
         try {
@@ -13,9 +14,9 @@ export const getAllTickersTool = {
             catch {
                 // Fallback for networks/environments where getAllTickers endpoint is unavailable.
                 const chainId = getChainId();
-                const poolList = await client.api.getPoolList();
-                const pools = Array.isArray(poolList?.data) ? poolList.data : [];
-                const poolIds = pools.map((p) => p.poolId).filter((id) => !!id);
+                const poolList = await getPoolList(client, chainId);
+                const pools = Array.isArray(poolList?.data) ? poolList.data : (Array.isArray(poolList) ? poolList : []);
+                const poolIds = pools.map((p) => p?.poolId ?? p?.pool_id).filter((id) => !!id);
                 if (poolIds.length === 0) {
                     throw new Error("Failed to fetch all tickers and no pools were available for fallback query.");
                 }

package/dist/tools/getBaseDetail.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
 export const getBaseDetailTool = {
     name: "get_base_detail",
-    description: "Get base token details.",
+    description: "[MARKET] Get base token details.",
     schema: {
         baseAddress: z.string().describe("Base token address"),
         chainId: z.number().int().positive().optional().describe("Optional chainId override"),

package/dist/tools/getKline.js

@@ -3,18 +3,21 @@ import { resolveClient, getChainId } from "../auth/resolveClient.js";
 const klineIntervalSchema = z.enum(["1m", "5m", "15m", "30m", "1h", "4h", "1d", "1w", "1M"]);
 export const getKlineTool = {
     name: "get_kline",
-    description: "Get K-line / candlestick data for a pool. Essential for price analysis.",
+    description: "[MARKET] Get K-line / candlestick data for a pool. Supports PoolId or Keyword. Set limit=1 for the latest bar.",
     schema: {
-        poolId: z.string().describe("Pool ID"),
+        poolId: z.string().optional().describe("Pool ID"),
+        keyword: z.string().optional().describe("Market keyword (e.g. 'BTC')"),
         interval: klineIntervalSchema.describe("K-line interval"),
-        limit: z.number().int().positive().optional().describe("Number of bars (default 100)"),
+        limit: z.number().int().positive().optional().describe("Number of bars (default 100). Set to 1 for the latest price bar."),
     },
     handler: async (args) => {
         try {
             const { client } = await resolveClient();
             const chainId = getChainId();
+            const { resolvePool } = await import("../services/marketService.js");
+            const poolId = await resolvePool(client, args.poolId, args.keyword);
             const result = await client.markets.getKlineList({
-                poolId: args.poolId,
+                poolId,
                 chainId,
                 interval: args.interval,
                 limit: args.limit ?? 100,

package/dist/tools/getMyLpHoldings.js

@@ -3,6 +3,7 @@ import { resolveClient, getChainId } from "../auth/resolveClient.js";
 import { COMMON_LP_AMOUNT_DECIMALS } from "@myx-trade/sdk";
 import { Contract, formatUnits } from "ethers";
 import { extractErrorMessage } from "../utils/errorMessage.js";
+import { getPoolList } from "../services/marketService.js";
 const ADDRESS_RE = /^0x[a-fA-F0-9]{40}$/;
 const ERC20_BALANCE_ABI = ["function balanceOf(address owner) view returns (uint256)"];
 function collectRows(input) {
@@ -130,7 +131,7 @@ async function readErc20Balance(provider, tokenAddress, holder) {
 }
 export const getMyLpHoldingsTool = {
     name: "get_my_lp_holdings",
-    description: "List your LP holdings across pools on the current chain by reading base/quote LP token balances. Includes standardized LP asset names: base LP `mBASE.QUOTE`, quote LP `mQUOTE.BASE`.",
+    description: "[ACCOUNT] List your LP holdings across pools on the current chain by reading base/quote LP token balances. Includes standardized LP asset names: base LP `mBASE.QUOTE`, quote LP `mQUOTE.BASE`.",
     schema: {
         includeZero: z.coerce.boolean().optional().describe("If true, include pools with zero LP balances (default false)."),
         poolIds: z.union([z.array(z.string()).min(1), z.string().min(1)]).optional().describe("Optional poolId filter. Supports array, JSON-array string, comma string, or single poolId."),
@@ -148,7 +149,7 @@ export const getMyLpHoldingsTool = {
             const poolIdsFilter = normalizePoolIdsInput(args.poolIds);
             const filterSet = new Set(poolIdsFilter.map((item) => item.toLowerCase()));
             const maxPools = Number.isFinite(Number(args.maxPools)) ? Math.floor(Number(args.maxPools)) : null;
-            const poolListRes = await client.api.getPoolList();
+            const poolListRes = await getPoolList(client, chainId);
             const rows = collectRows(poolListRes?.data ?? poolListRes);
             const deduped = new Map();
             for (const row of rows) {

package/dist/tools/getNetworkFee.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
 export const getNetworkFeeTool = {
     name: "get_network_fee",
-    description: "Estimate network fee requirements for a market.",
+    description: "[TRADE] Estimate network fee requirements for a market.",
     schema: {
         marketId: z.string().describe("Market ID"),
         chainId: z.number().int().positive().optional().describe("Optional chainId override"),

package/dist/tools/getOrders.js

@@ -0,0 +1,46 @@
+import { z } from "zod";
+import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { getOrderTypeDesc, getOrderStatusDesc, getDirectionDesc, getHistoryOrderStatusDesc, getExecTypeDesc } from "../utils/mappings.js";
+export const getOrdersTool = {
+    name: "get_orders",
+    description: "[ACCOUNT] Get orders (open or history) with optional filters.",
+    schema: {
+        status: z.enum(["OPEN", "HISTORY", "ALL"]).default("OPEN").describe("Filter by status: 'OPEN' (default), 'HISTORY', or 'ALL'"),
+        poolId: z.string().optional().describe("Filter by pool ID"),
+        limit: z.number().int().positive().optional().describe("Results per page (default 20)"),
+    },
+    handler: async (args) => {
+        try {
+            const { client, address } = await resolveClient();
+            const chainId = getChainId();
+            const results = {};
+            if (args.status === "OPEN" || args.status === "ALL") {
+                const openRes = await client.order.getOrders(address);
+                results.open = (openRes?.data || []).map((order) => ({
+                    ...order,
+                    orderTypeDesc: getOrderTypeDesc(order.orderType),
+                    statusDesc: getOrderStatusDesc(order.status),
+                    directionDesc: getDirectionDesc(order.direction)
+                }));
+                if (args.poolId) {
+                    results.open = results.open.filter((o) => String(o.poolId).toLowerCase() === args.poolId.toLowerCase());
+                }
+            }
+            if (args.status === "HISTORY" || args.status === "ALL") {
+                const query = { chainId, poolId: args.poolId, limit: args.limit ?? 20 };
+                const historyRes = await client.order.getOrderHistory(query, address);
+                results.history = (historyRes?.data || []).map((order) => ({
+                    ...order,
+                    orderTypeDesc: getOrderTypeDesc(order.orderType),
+                    orderStatusDesc: getHistoryOrderStatusDesc(order.orderStatus),
+                    directionDesc: getDirectionDesc(order.direction),
+                    execTypeDesc: getExecTypeDesc(order.execType)
+                }));
+            }
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: results }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+        }
+        catch (error) {
+            return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+        }
+    },
+};

package/dist/tools/getPoolMetadata.js

@@ -0,0 +1,83 @@
+import { z } from "zod";
+import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { getMarketDetail, resolvePool } from "../services/marketService.js";
+import { getPoolInfo, getLiquidityInfo } from "../services/poolService.js";
+import { extractErrorMessage } from "../utils/errorMessage.js";
+import { parseUserPrice30 } from "../utils/units.js";
+const INTEGER_RE = /^\d+$/;
+const DECIMAL_RE = /^\d+(\.\d+)?$/;
+function normalizeMarketPrice30Input(value) {
+    const text = String(value ?? "").trim();
+    if (!text)
+        return "";
+    if (INTEGER_RE.test(text))
+        return text;
+    if (!DECIMAL_RE.test(text) && !/^raw:/i.test(text) && !/^human:/i.test(text)) {
+        throw new Error("marketPrice must be numeric, or prefixed with raw:/human:.");
+    }
+    return parseUserPrice30(text, "marketPrice");
+}
+export const getPoolMetadataTool = {
+    name: "get_pool_metadata",
+    description: "[MARKET] Get comprehensive metadata for a pool (market detail, on-chain info, liquidity, and limits).",
+    schema: {
+        poolId: z.string().optional().describe("Pool ID, Token Address, or Keyword"),
+        keyword: z.string().optional().describe("Market keyword (e.g. 'BTC')"),
+        includeLiquidity: z.boolean().default(false).describe("Whether to include liquidity depth (requires marketPrice)"),
+        marketPrice: z.union([z.string(), z.number()]).optional().describe("Current price (required if includeLiquidity is true)"),
+        includeConfig: z.boolean().default(false).describe("Whether to include pool level configuration/limits"),
+        chainId: z.number().int().positive().optional().describe("Optional chainId override"),
+    },
+    handler: async (args) => {
+        try {
+            const { client } = await resolveClient();
+            const chainId = args.chainId ?? getChainId();
+            const poolId = await resolvePool(client, args.poolId, args.keyword, chainId);
+            const results = { poolId, chainId };
+            const errors = [];
+            // 1. Market Detail (Fee rates, OI, etc.)
+            try {
+                results.marketDetail = await getMarketDetail(client, poolId, chainId);
+            }
+            catch (err) {
+                errors.push(`marketDetail: ${extractErrorMessage(err)}`);
+            }
+            // 2. Pool Info (Reserves, Utilization)
+            try {
+                results.poolInfo = await getPoolInfo(poolId, chainId, client);
+            }
+            catch (err) {
+                errors.push(`poolInfo: ${extractErrorMessage(err)}`);
+            }
+            // 3. Optional: Liquidity Info
+            if (args.includeLiquidity) {
+                try {
+                    const price = normalizeMarketPrice30Input(args.marketPrice);
+                    if (!price)
+                        throw new Error("marketPrice is required for liquidity info.");
+                    results.liquidityInfo = await getLiquidityInfo(client, poolId, price, chainId);
+                }
+                catch (err) {
+                    errors.push(`liquidityInfo: ${extractErrorMessage(err)}`);
+                }
+            }
+            // 4. Optional: Config / Limits
+            if (args.includeConfig) {
+                try {
+                    const { getPoolLevelConfig } = await import("../services/marketService.js");
+                    results.levelConfig = await getPoolLevelConfig(client, poolId, chainId);
+                }
+                catch (err) {
+                    errors.push(`levelConfig: ${extractErrorMessage(err)}`);
+                }
+            }
+            if (errors.length > 0) {
+                results.warnings = errors;
+            }
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: results }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+        }
+        catch (error) {
+            return { content: [{ type: "text", text: `Error: ${extractErrorMessage(error)}` }], isError: true };
+        }
+    },
+};

package/dist/tools/getPositionsAll.js

@@ -0,0 +1,80 @@
+import { z } from "zod";
+import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { getPositions } from "../services/positionService.js";
+import { getDirectionDesc } from "../utils/mappings.js";
+export const getPositionsAllTool = {
+    name: "get_positions_all",
+    description: "[ACCOUNT] Get positions (open or history) with optional filters and ROI/PnL metrics.",
+    schema: {
+        status: z.enum(["OPEN", "HISTORY", "ALL"]).default("OPEN").describe("Filter by status: 'OPEN' (default), 'HISTORY', or 'ALL'"),
+        poolId: z.string().optional().describe("Filter by pool ID"),
+        limit: z.number().int().positive().optional().describe("Results per page (default 20, for history)"),
+    },
+    handler: async (args) => {
+        try {
+            const { client, address } = await resolveClient();
+            const chainId = getChainId();
+            const results = {};
+            if (args.status === "OPEN" || args.status === "ALL") {
+                const data = await getPositions(client, address);
+                const positions = Array.isArray(data) ? data : (Array.isArray(data?.data) ? data.data : []);
+                // Enhance open positions with metrics
+                const filtered = args.poolId ? positions.filter((p) => String(p.poolId).toLowerCase() === args.poolId.toLowerCase()) : positions;
+                if (filtered.length > 0) {
+                    const poolIds = [...new Set(filtered.map((p) => p.poolId))];
+                    const [tickersRes, configs] = await Promise.all([
+                        client.markets.getTickerList({ chainId, poolIds }),
+                        Promise.all(poolIds.map(async (pid) => {
+                            try {
+                                const { getPoolLevelConfig } = await import("../services/marketService.js");
+                                const res = await getPoolLevelConfig(client, pid, chainId);
+                                return { poolId: pid, config: res?.levelConfig || res?.data?.levelConfig || res };
+                            }
+                            catch {
+                                return { poolId: pid, config: null };
+                            }
+                        }))
+                    ]);
+                    const tickers = Array.isArray(tickersRes) ? tickersRes : (tickersRes?.data ?? []);
+                    results.open = filtered.map((pos) => {
+                        const ticker = tickers.find((t) => t.poolId === pos.poolId);
+                        const currentPrice = Number(ticker?.price || 0);
+                        const entryPrice = Number(pos.entryPrice || 0);
+                        const size = Number(pos.size || 0);
+                        const collateral = Number(pos.collateralAmount || 0);
+                        const direction = pos.direction;
+                        const mm = configs.find(c => c.poolId === pos.poolId)?.config?.maintainCollateralRate || 0.02;
+                        let estimatedPnl = direction === 0 ? (currentPrice - entryPrice) * size : (entryPrice - currentPrice) * size;
+                        const roi = collateral > 0 ? (estimatedPnl / collateral) * 100 : 0;
+                        let liqPrice = size > 0 ? (direction === 0 ? (entryPrice * size - collateral) / (size * (1 - mm)) : (entryPrice * size + collateral) / (size * (1 + mm))) : 0;
+                        if (liqPrice < 0)
+                            liqPrice = 0;
+                        return {
+                            ...pos,
+                            directionDesc: getDirectionDesc(pos.direction),
+                            currentPrice: currentPrice.toString(),
+                            estimatedPnl: estimatedPnl.toFixed(4),
+                            roi: roi.toFixed(2) + "%",
+                            liquidationPrice: liqPrice.toFixed(4)
+                        };
+                    });
+                }
+                else {
+                    results.open = [];
+                }
+            }
+            if (args.status === "HISTORY" || args.status === "ALL") {
+                const query = { chainId, poolId: args.poolId, limit: args.limit ?? 20 };
+                const historyRes = await client.position.getPositionHistory(query, address);
+                results.history = (historyRes?.data || []).map((pos) => ({
+                    ...pos,
+                    directionDesc: getDirectionDesc(pos.direction)
+                }));
+            }
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: results }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+        }
+        catch (error) {
+            return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+        }
+    },
+};

package/dist/tools/{getMarketPrice.js → getPrice.js}

@@ -1,18 +1,21 @@
 import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
-import { getMarketPrice } from "../services/marketService.js";
-export const getMarketPriceTool = {
-    name: "get_market_price",
-    description: "Get the current market price for a specific pool.",
+import { getMarketPrice, getOraclePrice } from "../services/marketService.js";
+export const getPriceTool = {
+    name: "get_price",
+    description: "[MARKET] Get the current price for a specific pool. Support both market (impact) and oracle prices.",
     schema: {
         poolId: z.string().describe("Pool ID to get price for"),
+        priceType: z.enum(["market", "oracle"]).default("market").describe("Type of price to fetch: 'market' (default) or 'oracle'"),
         chainId: z.number().int().positive().optional().describe("Optional chainId override"),
     },
     handler: async (args) => {
         try {
             const { client } = await resolveClient();
             const chainId = args.chainId ?? getChainId();
-            const data = await getMarketPrice(client, args.poolId, chainId);
+            const data = args.priceType === "oracle"
+                ? await getOraclePrice(client, args.poolId, chainId)
+                : await getMarketPrice(client, args.poolId, chainId);
             return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (k, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {

package/dist/tools/getUserTradingFeeRate.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
 export const getUserTradingFeeRateTool = {
     name: "get_user_trading_fee_rate",
-    description: "Get maker/taker fee rates for a given assetClass and riskTier.",
+    description: "[TRADE] Get maker/taker fee rates for a given assetClass and riskTier.",
     schema: {
         assetClass: z.coerce.number().int().nonnegative().describe("Asset class ID"),
         riskTier: z.coerce.number().int().nonnegative().describe("Risk tier"),

package/dist/tools/index.js

@@ -1,36 +1,32 @@
 // Tools — 交易
 export { openPositionSimpleTool } from "./openPositionSimple.js";
 export { executeTradeTool } from "./executeTrade.js";
-export { cancelOrderTool } from "./cancelOrder.js";
-export { cancelAllOrdersTool } from "./cancelAllOrders.js";
+export { cancelOrdersTool } from "./cancelOrders.js"; // Unified
 export { closePositionTool } from "./closePosition.js";
-export { setTpSlTool } from "./setTpSl.js";
-export { updateOrderTpSlTool } from "./updateOrderTpSl.js";
+export { manageTpSlTool } from "./manageTpSl.js"; // Unified
 export { adjustMarginTool } from "./adjustMargin.js";
 export { closeAllPositionsTool } from "./closeAllPositions.js";
 export { checkApprovalTool } from "./checkApproval.js";
 export { getUserTradingFeeRateTool } from "./getUserTradingFeeRate.js";
 export { getNetworkFeeTool } from "./getNetworkFee.js";
+export { checkAccountReadyTool } from "./checkAccountReady.js";
 // Tools — 市场数据
-export { getMarketPriceTool } from "./getMarketPrice.js";
-export { getOraclePriceTool } from "./getOraclePrice.js";
-export { searchMarketTool } from "./searchMarket.js";
-export { getKlineTool } from "./getKline.js";
-export { getKlineLatestBarTool } from "./getKlineLatestBar.js";
-export { getAllTickersTool } from "./getAllTickers.js";
-export { getMarketDetailTool, getPoolInfoTool, getLiquidityInfoTool } from "./marketInfo.js";
-export { getPoolListTool } from "./getPoolList.js";
-export { getPoolSymbolAllTool } from "./getPoolSymbolAll.js";
-export { getPoolLevelConfigTool } from "./poolConfig.js";
+export { getPriceTool } from "./getPrice.js"; // Unified
+export { getKlineTool } from "./getKline.js"; // Enhanced
+export { listPoolsTool } from "./listPools.js"; // Unified
+export { findPoolTool } from "./findPool.js"; // Unified
+export { getPoolMetadataTool } from "./getPoolMetadata.js"; // Unified
 export { getBaseDetailTool } from "./getBaseDetail.js";
+export { getAllTickersTool } from "./getAllTickers.js";
 // Tools — 池子 & 流动性
 export { createPerpMarketTool } from "./createPerpMarket.js";
 export { manageLiquidityTool, getLpPriceTool } from "./manageLiquidity.js";
 // Tools — 账户 & 查询
-export { getPositionsTool } from "./getPositions.js";
-export { getOpenOrdersTool, getOrderHistoryTool } from "./orderQueries.js";
-export { getPositionHistoryTool } from "./positionHistory.js";
-export { getAccountTool, getTradeFlowTool } from "./accountInfo.js";
+export { getPositionsAllTool } from "./getPositionsAll.js"; // Unified
+export { getOrdersTool } from "./getOrders.js"; // Unified
+export { getAccountSnapshotTool } from "./getAccountSnapshot.js"; // Unified
+export { getTradeFlowTool } from "./accountInfo.js"; // Kept for trade flow detail
 export { getMyLpHoldingsTool } from "./getMyLpHoldings.js";
-export { getAccountVipInfoTool } from "./getAccountVipInfo.js";
 export { accountDepositTool, accountWithdrawTool } from "./accountTransfer.js";
+// Tools — 系统
+export { searchToolsTool } from "./searchTools.js";