@michaleffffff/mcp-trading-server 3.0.4 → 3.0.7

package/dist/auth/resolveClient.js

@@ -24,6 +24,8 @@ export async function resolveClient() {
     const rpcUrl = process.env.RPC_URL || "https://rpc.sepolia.linea.build";
     const privateKey = process.env.PRIVATE_KEY;
     const chainId = Number(process.env.CHAIN_ID) || 59141;
+    const isTestnet = process.env.IS_TESTNET !== "false";
+    const isBetaMode = String(process.env.IS_BETA_MODE ?? "").trim().toLowerCase() === "true";
     const brokerAddressRaw = process.env.BROKER_ADDRESS || getDefaultBrokerByChainId(chainId);
     const quoteTokenRaw = process.env.QUOTE_TOKEN_ADDRESS || getDefaultQuoteTokenByChainId(chainId);
     const quoteDecimals = Number(process.env.QUOTE_TOKEN_DECIMALS) || 6;
@@ -42,12 +44,27 @@ export async function resolveClient() {
     // Inject the EIP-1193 mock so SDK can sign transactions seamlessly
     const { injectBrowserProviderMock } = await import("../utils/injectProvider.js");
     injectBrowserProviderMock(chainId, provider, signer);
+    const ethereumProvider = globalThis.window.ethereum;
+    const walletClient = {
+        transport: ethereumProvider,
+        chain: { id: chainId },
+        account: { address: signer.address, type: "json-rpc" },
+        getAddresses: async () => [signer.address],
+        request: async (args) => ethereumProvider.request(args),
+        signMessage: async ({ message }) => {
+            const payload = typeof message === "string"
+                ? message
+                : (message?.raw ?? message?.message ?? "");
+            return signer.signMessage(payload);
+        },
+    };
     const client = new MyxClient({
         chainId,
         signer: signer,
         brokerAddress,
-        isTestnet: process.env.IS_TESTNET !== "false",
-        walletClient: { transport: globalThis.window.ethereum }
+        isTestnet,
+        isBetaMode,
+        walletClient: walletClient
     });
     cached = { client, address: signer.address, signer, chainId, quoteToken, quoteDecimals };
     return cached;

package/dist/prompts/tradingGuide.js

@@ -12,35 +12,28 @@ export const tradingGuidePrompt = {
                     content: {
                         type: "text",
                         text: `
-# MYX Trading MCP Best Practices (v3.0.0)
+# MYX Trading MCP Best Practices (v3.0.4)
 
 You are an expert crypto trader using the MYX Protocol. To ensure successful execution and safe handling of user funds, follow these patterns:
 
 ## 1. The Standard Workflow
-1. **Discovery**: Use \`search_market\` with a keyword (or empty keyword) to find active \`poolId\` values. If needed, fallback to \`get_pool_list\`.
-2. **Context**: Use \`get_market_price\` and \`get_account\` (with \`poolId\`) to check market state, wallet balance, and trading-account margin.
-3. **Execution**: Prefer \`open_position_simple\` for new trades. It handles unit conversions and pool resolution automatically.
-4. **Validation**: Always check the \`verification.verified\` flag in the output. If \`false\`, read the \`cancelReason\` to explain the failure to the user.
-5. **Limit Order Loop**: For limit orders, always follow \`execute_trade -> get_open_orders -> get_order_history -> cancel_order/cancel_all_orders\`.
+1. **Discovery**: Use \`find_pool\` with a keyword (e.g. "BTC") to get the \`poolId\`. 
+2. **Context**: Use \`get_account_snapshot\` (with \`poolId\`) to check balances, trading metrics, and VIP tier. Use \`get_price\` for real-time market/oracle prices.
+3. **Pre-check**: Use \`check_account_ready\` to ensure the trading account has enough collateral.
+4. **Execution**: Prefer \`open_position_simple\` for entry. It supports Stop-Loss (\`slPrice\`) and Take-Profit (\`tpPrice\`) in one call.
+5. **Monitoring**: Use \`get_positions_all\` to track active trades and \`get_orders\` for pending/filled history.
+6. **Unified Operations**: Use \`cancel_orders\` for targeted or global撤单, and \`manage_tp_sl\` to update protection orders.
 
 ## 2. Parameter Tips
-- **Position IDs**: When opening a NEW position, \`positionId\` MUST be an empty string \`""\`.
-- **Decimals**: Human-readable units (e.g., "0.1" BTC) are default for \`open_position_simple\`. SDK-native tools often require raw units; use the \`raw:\` prefix if you need forced precision.
-- **Unit Prefixes**: For mutation tools, prefer explicit prefixes: \`human:\` for readable amounts, \`raw:\` for exact on-chain units.
-- **Slippage**: Default is 100 (1%). For volatile meme tokens, consider 200-300 (2-3%).
-- **Fees**: Use \`get_user_trading_fee_rate\` to estimate fees before large trades.
-- **execute_trade**: Has built-in preflight normalization and can auto-compute \`tradingFee\` when omitted.
-- **Balances**: Use \`get_account\` to clearly separate wallet balance vs trading-account balance (pass \`poolId\` for trading-account metrics).
-- **LP Holdings**: Use \`get_my_lp_holdings\` to scan base/quote LP token balances across pools on the current chain; naming convention is \`baseLpAssetName=mBASE.QUOTE\`, \`quoteLpAssetName=mQUOTE.BASE\` (e.g., \`mBTC.USDC\`, \`mUSDC.BTC\`).
-- **Liquidity Mutation Output**: \`manage_liquidity\` success output includes \`data.lpAssetNames\` with \`baseLpAssetName\`, \`quoteLpAssetName\`, and \`operatedLpAssetName\`.
-- **Adjust Margin**: \`adjust_margin.adjustAmount\` supports human amount (e.g. "1"), and also supports exact raw amount via \`raw:\` prefix.
-- **TP/SL Updates**: \`update_order_tp_sl\` accepts boolean-like values for \`useOrderCollateral\` and \`isTpSlOrder\`, but pending LIMIT/STOP orders can still be rejected by protocol rules; after fill, prefer \`set_tp_sl\`.
-- **Pool Reads**: \`get_pool_info\` auto-retries with oracle/ticker price when direct on-chain read returns divide-by-zero.
-- **Liquidity Price Input**: \`get_liquidity_info.marketPrice\` accepts raw 30-dec price and human price strings (e.g. \`2172.5\`, \`human:2172.5\`).
-- **close_all_positions Slippage**: accepts both raw 4dp and human percent strings (e.g. \`"100"\`, \`"1.0"\`, \`"1%"\`).
-- **close_position Full Close**: \`size\`/\`collateralAmount\` can use \`ALL\`/\`FULL\`/\`MAX\` to auto-fill exact live raw values from the current position snapshot.
-- **Deposits & Approval**: \`account_deposit\` supports \`autoApprove\` + \`approveMax\`; without auto-approve, allowance errors should be handled via \`check_approval\`.
-- **Examples**: Follow \`TOOL_EXAMPLES.md\` payload patterns when building tool arguments.
+- **Consolidated Tools**: Many legacy tools have been merged. Always use the high-level versions (e.g., \`get_price\` instead of \`get_market_price\`).
+- **Unit Prefixes**: Prefer \`human:\` for readable amounts (e.g., "100" USDC) and \`raw:\` for exact on-chain units.
+- **Slippage**: Default is 100 (1%). For volatile tokens, consider 200-300 (2-3%).
+- **Fees**: Use \`get_pool_metadata\` to view current fee tiers and pool configuration.
+- **LP Strategy**: Use \`get_my_lp_holdings\` to monitor liquidity positions. Naming follows \`mBASE.QUOTE\` (e.g., \`mBTC.USDC\`).
+
+Current Session:
+- Wallet: ${address}
+- Chain ID: ${chainId}
 
 ## 3. Self-Healing
 If a transaction reverts with a hex code, the server will attempt to decode it (e.g., "AccountInsufficientFreeAmount"). Error payloads now include structured \`code/hint/action\` fields; use them to provide concrete next steps.

package/dist/server.js

@@ -57,6 +57,12 @@ function inferToolErrorCode(message) {
     if (lower.includes("network") || lower.includes("rpc")) {
         return "NETWORK_ERROR";
     }
+    if (lower.includes("order size out of range") || lower.includes("minordersize")) {
+        return "ORDER_SIZE_TOO_SMALL";
+    }
+    if (lower.includes("marketid missing") || lower.includes("could not find pool metadata")) {
+        return "POOL_NOT_FOUND";
+    }
     return "TOOL_EXECUTION_ERROR";
 }
 function defaultHintForErrorCode(code, toolName) {
@@ -78,6 +84,12 @@ function defaultHintForErrorCode(code, toolName) {
     if (code === "NETWORK_ERROR") {
         return "Check RPC/network health and retry.";
     }
+    if (code === "ORDER_SIZE_TOO_SMALL") {
+        return "Increase collateralAmount or leverage to meet the minimum order size requirement.";
+    }
+    if (code === "POOL_NOT_FOUND") {
+        return "The pool ID seems invalid or not supported. Use 'find_pool' or 'list_pools' to find the correct Pool ID.";
+    }
     return `Check prerequisites for "${toolName}" and retry.`;
 }
 function errorResult(payload) {
@@ -313,6 +325,12 @@ function zodSchemaToJsonSchema(zodSchema) {
         }
         if (zodType === "string")
             return { type: "string" };
+        if (zodType === "enum") {
+            return { type: "string", enum: def?.values || [] };
+        }
+        if (zodType === "nativeEnum") {
+            return { type: "string", enum: Object.values(def?.values || {}) };
+        }
         if (zodType === "number")
             return { type: "number" };
         if (zodType === "boolean")
@@ -352,7 +370,7 @@ function zodSchemaToJsonSchema(zodSchema) {
     };
 }
 // ─── MCP Server ───
-const server = new Server({ name: "myx-mcp-trading-server", version: "3.0.4" }, { capabilities: { tools: {}, resources: {}, prompts: {} } });
+const server = new Server({ name: "myx-mcp-trading-server", version: "3.0.7" }, { capabilities: { tools: {}, resources: {}, prompts: {} } });
 // List tools
 server.setRequestHandler(ListToolsRequestSchema, async () => {
     return {
@@ -473,7 +491,7 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
 async function main() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    logger.info("🚀 MYX Trading MCP Server v3.0.4 running (stdio, pure on-chain, prod ready)");
+    logger.info("🚀 MYX Trading MCP Server v3.0.7 running (stdio, pure on-chain, prod ready)");
 }
 main().catch((err) => {
     logger.error("Fatal Server Startup Error", err);

package/dist/services/balanceService.js

@@ -1,9 +1,9 @@
 import { getChainId } from "../auth/resolveClient.js";
-export async function getBalances(client, address) {
-    const chainId = getChainId();
+export async function getBalances(client, address, chainIdOverride) {
+    const chainId = chainIdOverride ?? getChainId();
     return client.account.getWalletQuoteTokenBalance(chainId, address);
 }
-export async function getMarginBalance(client, address, poolId) {
-    const chainId = getChainId();
+export async function getMarginBalance(client, address, poolId, chainIdOverride) {
+    const chainId = chainIdOverride ?? getChainId();
     return client.account.getAvailableMarginBalance({ poolId, chainId, address });
 }

package/dist/services/marketService.js

@@ -51,14 +51,33 @@ function matchesKeyword(row, keywordUpper) {
         .join("|");
     return haystack.includes(keywordUpper);
 }
-async function fetchApiMarketRows(client) {
-    const marketListRes = await client.api.getMarketList().catch(() => null);
-    const marketRows = extractMarketRows(marketListRes, getChainId());
+async function fetchApiMarketRows(client, chainId) {
+    // Preferred path: documented markets.searchMarket
+    try {
+        const searchRes = await client.markets.searchMarket({ chainId, keyword: "", limit: 2000 });
+        const searchRows = extractMarketRows(searchRes, chainId).filter((row) => normalizePoolId(row));
+        if (searchRows.length > 0)
+            return searchRows;
+    }
+    catch {
+    }
+    // Secondary path: documented markets.getPoolSymbolAll
+    try {
+        const symbolsRes = await client.markets.getPoolSymbolAll();
+        const symbolRows = collectRows(symbolsRes?.data ?? symbolsRes).filter((row) => normalizePoolId(row));
+        if (symbolRows.length > 0)
+            return symbolRows;
+    }
+    catch {
+    }
+    // Legacy fallback: internal api namespace (for backward compatibility)
+    const marketListRes = await client.api?.getMarketList?.().catch(() => null);
+    const marketRows = extractMarketRows(marketListRes, chainId);
     const marketRowsWithPoolId = marketRows.filter((row) => normalizePoolId(row));
     if (marketRowsWithPoolId.length > 0)
         return marketRowsWithPoolId;
-    const poolListRes = await client.api.getPoolList().catch(() => null);
-    return collectRows(poolListRes?.data ?? poolListRes);
+    const poolListRes = await client.api?.getPoolList?.().catch(() => null);
+    return collectRows(poolListRes?.data ?? poolListRes).filter((row) => normalizePoolId(row));
 }
 export async function getMarketPrice(client, poolId, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
@@ -73,8 +92,8 @@ export async function getOraclePrice(client, poolId, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
     return client.utils.getOraclePrice(poolId, chainId);
 }
-export async function searchMarket(client, keyword, limit = 1000) {
-    const chainId = getChainId();
+export async function searchMarket(client, keyword, limit = 1000, chainIdOverride) {
+    const chainId = chainIdOverride ?? getChainId();
     const normalizedKeyword = String(keyword ?? "").trim();
     const requestedLimit = Number.isFinite(limit) && limit > 0 ? Math.floor(limit) : 1000;
     let dataList = [];
@@ -86,7 +105,7 @@ export async function searchMarket(client, keyword, limit = 1000) {
         dataList = [];
     }
     if (dataList.length === 0 || normalizedKeyword.length === 0) {
-        const fallbackRows = await fetchApiMarketRows(client);
+        const fallbackRows = await fetchApiMarketRows(client, chainId);
         if (fallbackRows.length > 0) {
             dataList = fallbackRows;
         }
@@ -149,8 +168,25 @@ export async function getMarketDetail(client, poolId, chainIdOverride) {
 /**
  * 获取所有池子列表
  */
-export async function getPoolList(client) {
-    return client.api.getPoolList();
+export async function getPoolList(client, chainIdOverride) {
+    const chainId = chainIdOverride ?? getChainId();
+    try {
+        const searchRes = await client.markets.searchMarket({ chainId, keyword: "", limit: 2000 });
+        const rows = extractMarketRows(searchRes, chainId).filter((row) => normalizePoolId(row));
+        if (rows.length > 0)
+            return rows;
+    }
+    catch {
+    }
+    try {
+        const symbolsRes = await client.markets.getPoolSymbolAll();
+        const rows = collectRows(symbolsRes?.data ?? symbolsRes).filter((row) => normalizePoolId(row));
+        if (rows.length > 0)
+            return rows;
+    }
+    catch {
+    }
+    return client.api?.getPoolList?.();
 }
 /**
  * 获取池子分级配置
@@ -181,14 +217,14 @@ export async function resolvePool(client, poolId, keyword, chainIdOverride) {
     // 2. 如果提供了 keyword，执行搜索
     const kw = keyword?.trim();
     if (kw) {
-        const markets = await searchMarket(client, kw, 10);
+        const markets = await searchMarket(client, kw, 10, chainId);
         if (markets.length > 0) {
             return markets[0].poolId;
         }
     }
     // 3. 最后手段：遍历全量活跃池列表
     if (kw || pid) {
-        const poolListRes = await client.api.getPoolList().catch(() => null);
+        const poolListRes = await getPoolList(client, chainId).catch(() => null);
         if (poolListRes) {
             // 这里的逻辑参考 openPositionSimple 中的 collectPoolRows
             const collect = (input) => {

package/dist/services/poolService.js

@@ -2,6 +2,7 @@ import { pool, quote, base } from "@myx-trade/sdk";
 import { getChainId, resolveClient } from "../auth/resolveClient.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
 import { ensureUnits } from "../utils/units.js";
+import { normalizeAddress } from "../utils/address.js";
 function isDivideByZeroError(message) {
     const lower = message.toLowerCase();
     return (lower.includes("divide_by_zero") ||
@@ -19,74 +20,74 @@ function toPositiveBigint(input) {
         return null;
     }
 }
+async function resolvePositiveMarketPrice30(client, poolId, chainId) {
+    if (!client)
+        return null;
+    try {
+        const oracle = await client.utils?.getOraclePrice?.(poolId, chainId);
+        const byValue = toPositiveBigint(oracle?.value);
+        const byPrice = toPositiveBigint(oracle?.price);
+        if (byValue)
+            return byValue;
+        if (byPrice)
+            return byPrice;
+    }
+    catch {
+    }
+    try {
+        const tickerRes = await client.markets?.getTickerList?.({ chainId, poolIds: [poolId] });
+        const row = Array.isArray(tickerRes) ? tickerRes[0] : tickerRes?.data?.[0];
+        if (row?.price) {
+            const tickerRaw = ensureUnits(row.price, 30, "ticker price");
+            const byTicker = toPositiveBigint(tickerRaw);
+            if (byTicker)
+                return byTicker;
+        }
+    }
+    catch {
+    }
+    return null;
+}
 /**
  * 创建合约市场池子
  */
 export async function createPool(baseToken, marketId) {
     await resolveClient();
     const chainId = getChainId();
-    return pool.createPool({ chainId, baseToken, marketId });
+    return pool.createPool({ chainId, baseToken: normalizeAddress(baseToken, "baseToken"), marketId });
 }
 /**
  * 获取池子信息
  */
 export async function getPoolInfo(poolId, chainIdOverride, clientOverride) {
     const chainId = chainIdOverride ?? getChainId();
-    let needOracleFallback = false;
+    const client = clientOverride ?? (await resolveClient()).client;
     try {
-        const direct = await pool.getPoolInfo(chainId, poolId);
-        if (direct)
-            return direct;
-        needOracleFallback = true;
+        const marketPrice30 = await resolvePositiveMarketPrice30(client, poolId, chainId);
+        if (marketPrice30 && marketPrice30 > 0n) {
+            const withPrice = await pool.getPoolInfo(chainId, poolId, marketPrice30);
+            if (withPrice)
+                return withPrice;
+        }
     }
     catch (error) {
         const message = extractErrorMessage(error);
         if (!isDivideByZeroError(message)) {
             throw new Error(`get_pool_info failed: ${message}`);
         }
-        needOracleFallback = true;
-    }
-    if (!needOracleFallback)
-        return undefined;
-    const client = clientOverride ?? (await resolveClient()).client;
-    if (!client?.utils?.getOraclePrice) {
-        throw new Error("get_pool_info failed and oracle fallback is unavailable (client.utils.getOraclePrice missing).");
     }
-    let oracleRaw = 0n;
     try {
-        const oracle = await client.utils.getOraclePrice(poolId, chainId);
-        const byValue = toPositiveBigint(oracle?.value);
-        const byPrice = toPositiveBigint(oracle?.price);
-        oracleRaw = byValue ?? byPrice ?? 0n;
+        const direct = await pool.getPoolInfo(chainId, poolId);
+        if (direct)
+            return direct;
+        throw new Error(`Pool info for ${poolId} returned undefined.`);
     }
     catch (error) {
-        throw new Error(`get_pool_info fallback failed to fetch oracle price: ${extractErrorMessage(error)}`);
-    }
-    if (oracleRaw <= 0n) {
-        try {
-            const tickerRes = await client.markets.getTickerList({ chainId, poolIds: [poolId] });
-            const row = Array.isArray(tickerRes) ? tickerRes[0] : tickerRes?.data?.[0];
-            if (row?.price) {
-                const tickerRaw = ensureUnits(row.price, 30, "ticker price");
-                const byTicker = toPositiveBigint(tickerRaw);
-                oracleRaw = byTicker ?? 0n;
-            }
-        }
-        catch {
-        }
-    }
-    if (oracleRaw <= 0n) {
-        throw new Error("get_pool_info fallback requires a positive oracle/ticker price, but both resolved to 0.");
-    }
-    try {
-        const retried = await pool.getPoolInfo(chainId, poolId, oracleRaw);
-        if (!retried) {
-            throw new Error(`Pool info for ${poolId} returned undefined after oracle-price retry.`);
+        const message = extractErrorMessage(error);
+        if (isDivideByZeroError(message)) {
+            throw new Error("get_pool_info unavailable: pool reserves are currently empty or market price context is unresolved.");
         }
-        return retried;
-    }
-    catch (error) {
-        throw new Error(`get_pool_info failed after oracle-price retry: ${extractErrorMessage(error)}`);
+        throw new Error(`get_pool_info failed: ${message}`);
     }
 }
 /**

package/dist/services/tradeService.js

@@ -6,11 +6,33 @@ import { normalizeSlippagePct4dp } from "../utils/slippage.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
 function resolveDirection(direction) {
+    if (typeof direction === "string") {
+        const text = direction.trim().toUpperCase();
+        if (text === "0" || text === "LONG" || text === "BUY")
+            return Direction.LONG;
+        if (text === "1" || text === "SHORT" || text === "SELL")
+            return Direction.SHORT;
+        throw new Error("direction must be LONG/SHORT or 0/1.");
+    }
     if (direction !== 0 && direction !== 1) {
-        throw new Error("direction must be 0 (LONG) or 1 (SHORT).");
+        throw new Error("direction must be LONG/SHORT or 0/1.");
     }
     return direction === 0 ? Direction.LONG : Direction.SHORT;
 }
+function resolveDirectionIndex(direction) {
+    if (typeof direction === "string") {
+        const text = direction.trim().toUpperCase();
+        if (text === "0" || text === "LONG" || text === "BUY")
+            return 0;
+        if (text === "1" || text === "SHORT" || text === "SELL")
+            return 1;
+        throw new Error("direction must be LONG/SHORT or 0/1.");
+    }
+    if (direction !== 0 && direction !== 1) {
+        throw new Error("direction must be LONG/SHORT or 0/1.");
+    }
+    return direction;
+}
 /**
  * 自动推断开启订单的触发类型 (Limit/Stop)
  */
@@ -71,6 +93,17 @@ function parseDecimals(value, fallback) {
 function normalizeIdentifier(value) {
     return String(value ?? "").trim().toLowerCase();
 }
+function toBigIntOrZero(value) {
+    try {
+        const text = String(value ?? "").trim();
+        if (!text)
+            return 0n;
+        return BigInt(text);
+    }
+    catch {
+        return 0n;
+    }
+}
 async function resolveDecimalsForUpdateOrder(client, chainId, marketId, poolIdHint) {
     let baseDecimals = 18;
     let quoteDecimals = getQuoteDecimals();
@@ -171,16 +204,10 @@ export async function openPosition(client, address, args) {
     console.log(`[tradeService] Checking marginBalance for ${address} in pool ${args.poolId}...`);
     const marginInfo = await client.account.getAccountInfo(chainId, address, args.poolId);
     let marginBalanceRaw = BigInt(0);
-    let walletBalanceRaw = BigInt(0); // Using availableMargin as wallet balance per user
-    if (marginInfo?.code === 0) {
-        if (Array.isArray(marginInfo.data)) {
-            marginBalanceRaw = BigInt(marginInfo.data[0] || "0");
-            walletBalanceRaw = BigInt(marginInfo.data[1] || "0");
-        }
-        else {
-            marginBalanceRaw = BigInt(marginInfo.data?.marginBalance || "0");
-            walletBalanceRaw = BigInt(marginInfo.data?.availableMargin || "0");
-        }
+    let walletBalanceRaw = BigInt(0);
+    if (marginInfo?.code === 0 && marginInfo?.data) {
+        marginBalanceRaw = toBigIntOrZero(marginInfo.data.freeMargin);
+        walletBalanceRaw = toBigIntOrZero(marginInfo.data.walletBalance);
     }
     const requiredRaw = BigInt(collateralRaw);
     if (marginBalanceRaw < requiredRaw) {
@@ -191,15 +218,15 @@ export async function openPosition(client, address, args) {
         const neededRaw = requiredRaw - marginBalanceRaw;
         console.log(`[tradeService] marginBalance (${marginBalanceRaw.toString()}) < Required (${requiredRaw.toString()}). Need to deposit: ${neededRaw.toString()}`);
         if (walletBalanceRaw < neededRaw) {
-            // Also check real wallet balance just in case user's availableMargin is truly empty
+            // Also check real wallet balance just in case account info wallet field is stale.
             const realWalletRes = await client.account.getWalletQuoteTokenBalance(chainId, address);
             const realWalletRaw = BigInt(realWalletRes?.data || "0");
             if (realWalletRaw < neededRaw) {
-                throw new Error(`Insufficient funds: marginBalance (${marginBalanceRaw.toString()}) + availableMargin (as wallet: ${walletBalanceRaw.toString()}) + real wallet (${realWalletRaw.toString()}) is less than required collateral (${requiredRaw.toString()}).`);
+                throw new Error(`Insufficient funds: marginBalance (${marginBalanceRaw.toString()}) + walletBalance (${walletBalanceRaw.toString()}) + realWallet (${realWalletRaw.toString()}) is less than required collateral (${requiredRaw.toString()}).`);
             }
             walletBalanceRaw = realWalletRaw;
         }
-        console.log(`[tradeService] Depositing ${neededRaw.toString()} ${poolData.quoteSymbol} from wallet (availableMargin)...`);
+        console.log(`[tradeService] Depositing ${neededRaw.toString()} ${poolData.quoteSymbol} from wallet...`);
         const depositRaw = await client.account.deposit({
             amount: neededRaw.toString(),
             tokenAddress: poolData.quoteToken,
@@ -276,13 +303,13 @@ export async function closePosition(client, address, args) {
 /**
  * 设置止盈止损
  */
-export async function setPositionTpSl(client, address, args) {
-    const chainId = getChainId();
-    const executionFeeToken = normalizeAddress(args.executionFeeToken, "executionFeeToken");
+export async function setPositionTpSl(client, address, args, chainIdOverride) {
+    const chainId = chainIdOverride ?? getChainId();
     if (!args.tpPrice && !args.slPrice) {
         throw new Error("At least one of tpPrice or slPrice must be provided.");
     }
     const dir = resolveDirection(args.direction);
+    const dirIndex = resolveDirectionIndex(args.direction);
     // Fetch pool detail for decimals
     const poolResponse = await client.markets.getMarketDetail({ chainId, poolId: args.poolId });
     const poolData = poolResponse?.data || (poolResponse?.marketId ? poolResponse : null);
@@ -290,6 +317,7 @@ export async function setPositionTpSl(client, address, args) {
         throw new Error(`Could not find pool metadata for ID: ${args.poolId}`);
     }
     const baseDecimals = poolData.baseDecimals || 18;
+    const executionFeeToken = normalizeAddress(args.executionFeeToken || poolData.quoteToken || getQuoteToken(), "executionFeeToken");
     const params = {
         chainId,
         address,
@@ -298,8 +326,8 @@ export async function setPositionTpSl(client, address, args) {
         direction: dir,
         leverage: args.leverage,
         executionFeeToken,
-        tpTriggerType: resolveTpSlTriggerType(true, args.direction, args.tpTriggerType),
-        slTriggerType: resolveTpSlTriggerType(false, args.direction, args.slTriggerType),
+        tpTriggerType: resolveTpSlTriggerType(true, dirIndex, args.tpTriggerType),
+        slTriggerType: resolveTpSlTriggerType(false, dirIndex, args.slTriggerType),
         slippagePct: normalizeSlippagePct4dp(args.slippagePct),
     };
     if (args.tpPrice)
@@ -408,8 +436,8 @@ export async function closeAllPositions(client, address) {
 /**
  * 更新止盈止损订单
  */
-export async function updateOrderTpSl(client, address, args) {
-    const chainId = getChainId();
+export async function updateOrderTpSl(client, address, args, chainIdOverride) {
+    const chainId = chainIdOverride ?? getChainId();
     const quoteToken = normalizeAddress(args.quoteToken, "quoteToken");
     const marketId = String(args.marketId ?? "").trim();
     const isTpSlOrder = typeof args.isTpSlOrder === "boolean" ? args.isTpSlOrder : true;
@@ -432,14 +460,14 @@ export async function updateOrderTpSl(client, address, args) {
         }
         const message = extractErrorMessage(result, "Failed to update order");
         if (/failed to update order/i.test(message)) {
-            throw new Error(`Failed to update TP/SL for order ${args.orderId}. If this is a pending LIMIT/STOP order, wait for fill and then use set_tp_sl on the position.`);
+            throw new Error(`Failed to update TP/SL for order ${args.orderId}. If this is a pending LIMIT/STOP order, wait for fill and then use manage_tp_sl on the position.`);
         }
         throw new Error(`update_order_tp_sl failed: ${message}`);
     }
     catch (error) {
         const message = extractErrorMessage(error, "Failed to update order");
         if (/failed to update order/i.test(message)) {
-            throw new Error(`Failed to update TP/SL for order ${args.orderId}. If this is a pending LIMIT/STOP order, wait for fill and then use set_tp_sl on the position.`);
+            throw new Error(`Failed to update TP/SL for order ${args.orderId}. If this is a pending LIMIT/STOP order, wait for fill and then use manage_tp_sl on the position.`);
         }
         throw new Error(message);
     }