@michaleffffff/mcp-trading-server 3.0.7 → 3.0.15

package/dist/services/tradeService.js

@@ -1,10 +1,12 @@
 import { Direction, OrderType, TriggerType } from "@myx-trade/sdk";
+import { formatUnits } from "ethers";
 import { getChainId, getQuoteToken, getQuoteDecimals } from "../auth/resolveClient.js";
 import { ensureUnits } from "../utils/units.js";
 import { normalizeAddress } from "../utils/address.js";
 import { normalizeSlippagePct4dp } from "../utils/slippage.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
+import { mapTimeInForce } from "../utils/mappings.js";
 function resolveDirection(direction) {
     if (typeof direction === "string") {
         const text = direction.trim().toUpperCase();
@@ -104,6 +106,54 @@ function toBigIntOrZero(value) {
         return 0n;
     }
 }
+const ORDER_VALUE_SCALE = 1000000n;
+const DECIMAL_INPUT_RE = /^\d+(\.\d+)?$/;
+function parseScaledDecimal(value, scale, label) {
+    const text = String(value ?? "").trim();
+    if (!text)
+        throw new Error(`${label} is required.`);
+    if (!DECIMAL_INPUT_RE.test(text)) {
+        throw new Error(`${label} must be numeric.`);
+    }
+    const [integerPart, fractionPart = ""] = text.split(".");
+    const normalizedFraction = fractionPart.slice(0, scale).padEnd(scale, "0");
+    return BigInt(`${integerPart}${normalizedFraction}`);
+}
+function absBigInt(value) {
+    return value < 0n ? -value : value;
+}
+function computeQuoteNotionalRaw(sizeRaw, priceRaw30, baseDecimals, quoteDecimals) {
+    const numerator = sizeRaw * priceRaw30 * (10n ** BigInt(quoteDecimals));
+    const denominator = 10n ** BigInt(baseDecimals + 30);
+    return numerator / denominator;
+}
+function computeRecommendedSizeRaw(targetQuoteRaw, priceRaw30, baseDecimals, quoteDecimals) {
+    const numerator = targetQuoteRaw * (10n ** BigInt(baseDecimals + 30));
+    const denominator = priceRaw30 * (10n ** BigInt(quoteDecimals));
+    return numerator / denominator;
+}
+function validateIncreaseOrderEconomics(args) {
+    const collateralRawBig = BigInt(args.collateralRaw);
+    const sizeRawBig = BigInt(args.sizeRaw);
+    const priceRawBig = BigInt(args.priceRaw30);
+    if (collateralRawBig <= 0n || sizeRawBig <= 0n || priceRawBig <= 0n)
+        return;
+    const leverageScaled = parseScaledDecimal(args.leverage, 6, "leverage");
+    const targetQuoteRaw = (collateralRawBig * leverageScaled) / ORDER_VALUE_SCALE;
+    const actualQuoteRaw = computeQuoteNotionalRaw(sizeRawBig, priceRawBig, args.baseDecimals, args.quoteDecimals);
+    const deltaRaw = absBigInt(actualQuoteRaw - targetQuoteRaw);
+    const minToleranceRaw = args.quoteDecimals >= 2 ? 10n ** BigInt(args.quoteDecimals - 2) : 1n;
+    const pctToleranceRaw = targetQuoteRaw / 100n;
+    const toleranceRaw = pctToleranceRaw > minToleranceRaw ? pctToleranceRaw : minToleranceRaw;
+    if (deltaRaw <= toleranceRaw)
+        return;
+    const recommendedSizeRaw = computeRecommendedSizeRaw(targetQuoteRaw, priceRawBig, args.baseDecimals, args.quoteDecimals);
+    const targetHuman = formatUnits(targetQuoteRaw, args.quoteDecimals);
+    const actualHuman = formatUnits(actualQuoteRaw, args.quoteDecimals);
+    const recommendedSizeHuman = formatUnits(recommendedSizeRaw, args.baseDecimals);
+    const priceHuman = formatUnits(priceRawBig, 30);
+    throw new Error(`Invalid size semantics: size is BASE quantity, not USD notional. collateralAmount*leverage implies ≈${targetHuman} quote, but size*price implies ≈${actualHuman} quote. At price ${priceHuman}, recommended size is ≈${recommendedSizeHuman}.`);
+}
 async function resolveDecimalsForUpdateOrder(client, chainId, marketId, poolIdHint) {
     let baseDecimals = 18;
     let quoteDecimals = getQuoteDecimals();
@@ -199,6 +249,15 @@ export async function openPosition(client, address, args) {
     const sizeRaw = ensureUnits(args.size, baseDecimals, "size", { allowImplicitRaw: false });
     const priceRaw = ensureUnits(args.price, 30, "price", { allowImplicitRaw: false });
     const tradingFeeRaw = ensureUnits(args.tradingFee, quoteDecimals, "tradingFee", { allowImplicitRaw: false });
+    validateIncreaseOrderEconomics({
+        collateralRaw,
+        sizeRaw,
+        priceRaw30: priceRaw,
+        leverage: args.leverage,
+        baseDecimals,
+        quoteDecimals,
+    });
+    const timeInForce = mapTimeInForce(args.timeInForce);
     // --- Auto-Deposit Logic (Strict) ---
     const allowAutoDeposit = args.autoDeposit !== false;
     console.log(`[tradeService] Checking marginBalance for ${address} in pool ${args.poolId}...`);
@@ -247,7 +306,7 @@ export async function openPosition(client, address, args) {
         collateralAmount: collateralRaw,
         size: sizeRaw,
         price: priceRaw,
-        timeInForce: args.timeInForce,
+        timeInForce,
         postOnly: args.postOnly,
         slippagePct: normalizeSlippagePct4dp(args.slippagePct),
         executionFeeToken,
@@ -282,6 +341,7 @@ export async function closePosition(client, address, args) {
     }
     const baseDecimals = poolData.baseDecimals || 18;
     const quoteDecimals = poolData.quoteDecimals || 6;
+    const timeInForce = mapTimeInForce(args.timeInForce);
     return client.order.createDecreaseOrder({
         chainId,
         address,
@@ -293,7 +353,7 @@ export async function closePosition(client, address, args) {
         collateralAmount: ensureUnits(args.collateralAmount, quoteDecimals, "collateralAmount", { allowImplicitRaw: false }),
         size: ensureUnits(args.size, baseDecimals, "size", { allowImplicitRaw: false }),
         price: ensureUnits(args.price, 30, "price", { allowImplicitRaw: false }),
-        timeInForce: args.timeInForce,
+        timeInForce,
         postOnly: args.postOnly,
         slippagePct: normalizeSlippagePct4dp(args.slippagePct),
         executionFeeToken,

package/dist/tools/closePosition.js

@@ -41,7 +41,7 @@ export const closePositionTool = {
         collateralAmount: z.union([z.string(), z.number()]).describe("Collateral amount (human/raw). Also supports ALL/FULL/MAX to use live position collateral raw."),
         size: z.union([z.string(), z.number()]).describe("Position size (human/raw). Also supports ALL/FULL/MAX for exact full-close raw size."),
         price: z.union([z.string(), z.number()]).describe("Price (human or 30-dec raw units)"),
-        timeInForce: z.coerce.number().int().describe("TimeInForce: 0=GTC, 1=IOC, 2=FOK"),
+        timeInForce: z.union([z.number(), z.string()]).describe("SDK v1.0.2 supports IOC only. Use 0 or 'IOC'."),
         postOnly: z.coerce.boolean().describe("Post-only flag"),
         slippagePct: z.coerce.string().default("50").describe(SLIPPAGE_PCT_4DP_DESC),
         executionFeeToken: z.string().describe("Execution fee token address"),

package/dist/tools/createPerpMarket.js

@@ -1,7 +1,115 @@
 import { z } from "zod";
-import { createPool } from "../services/poolService.js";
-import { resolveClient } from "../auth/resolveClient.js";
+import { createPool, getMarketPoolByBaseToken } from "../services/poolService.js";
+import { resolveClient, getChainId } from "../auth/resolveClient.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
+import { normalizeAddress } from "../utils/address.js";
+import { extractErrorMessage } from "../utils/errorMessage.js";
+import { decodeErrorSelector } from "../utils/errors.js";
+const MARKET_ID_RE = /^0x[0-9a-fA-F]{64}$/;
+function compactMessage(message) {
+    const flat = String(message ?? "").replace(/\s+/g, " ").trim();
+    if (!flat)
+        return "Unknown create_perp_market error.";
+    if (flat.length <= 420)
+        return flat;
+    return `${flat.slice(0, 420)}...`;
+}
+function extractSelectorCandidate(input) {
+    const queue = [input];
+    const visited = new Set();
+    const LONG_HEX_RE = /0x[0-9a-fA-F]{8,}/g;
+    const EXACT_SELECTOR_RE = /0x[0-9a-fA-F]{8}\b/g;
+    const KEYED_SELECTOR_RE = /\b(?:data|selector|error|revert)\s*[:=]\s*["']?(0x[0-9a-fA-F]{8,})/gi;
+    let fallback = null;
+    while (queue.length > 0) {
+        const current = queue.shift();
+        if (current === null || current === undefined)
+            continue;
+        if (visited.has(current))
+            continue;
+        visited.add(current);
+        if (typeof current === "string") {
+            const exactMatches = current.match(EXACT_SELECTOR_RE) ?? [];
+            for (const candidate of exactMatches) {
+                const normalized = candidate.toLowerCase();
+                if (decodeErrorSelector(normalized))
+                    return normalized;
+                if (!fallback)
+                    fallback = normalized;
+            }
+            for (const match of current.matchAll(KEYED_SELECTOR_RE)) {
+                const raw = String(match[1] ?? "").toLowerCase();
+                if (raw.length < 10)
+                    continue;
+                const selector = `0x${raw.slice(2, 10)}`;
+                if (decodeErrorSelector(selector))
+                    return selector;
+                if (!fallback)
+                    fallback = selector;
+            }
+            const matches = current.match(LONG_HEX_RE) ?? [];
+            for (const hex of matches) {
+                const normalized = hex.toLowerCase();
+                if (normalized.length === 42)
+                    continue; // likely plain address
+                if (normalized.length < 10)
+                    continue;
+                const selector = `0x${normalized.slice(2, 10)}`;
+                if (decodeErrorSelector(selector)) {
+                    return selector;
+                }
+                if (!fallback)
+                    fallback = selector;
+            }
+            continue;
+        }
+        if (typeof current !== "object")
+            continue;
+        const record = current;
+        for (const value of Object.values(record)) {
+            queue.push(value);
+        }
+    }
+    return fallback;
+}
+function buildCreateMarketErrorPayload(args, messageLike) {
+    const message = compactMessage(extractErrorMessage(messageLike, "create_perp_market failed."));
+    const selectorCandidate = extractSelectorCandidate(messageLike);
+    const decodedSelector = selectorCandidate ? decodeErrorSelector(selectorCandidate) : null;
+    const lower = message.toLowerCase();
+    const code = lower.includes("marketid") && lower.includes("66")
+        ? "INVALID_PARAM"
+        : lower.includes("not a valid evm address")
+            ? "INVALID_PARAM"
+            : lower.includes("abi") && lower.includes("size")
+                ? "INVALID_PARAM"
+                : lower.includes("reverted")
+                    ? "CONTRACT_REVERT"
+                    : "TOOL_EXECUTION_ERROR";
+    const decoratedMessage = decodedSelector
+        ? `${message} (Decoded Contract Error: ${decodedSelector})`
+        : message;
+    const hint = code === "INVALID_PARAM"
+        ? "Use a valid baseToken address and a 66-char marketId config hash (0x + 64 hex)."
+        : "Check market allocation / permissions / duplicate pool status, then retry.";
+    return {
+        status: "error",
+        error: {
+            tool: "create_perp_market",
+            code,
+            message: decoratedMessage,
+            hint,
+            action: "Adjust parameters or prerequisites and retry.",
+            details: {
+                chainId: getChainId(),
+                baseToken: args?.baseToken ?? null,
+                marketId: args?.marketId ?? null,
+                selector: selectorCandidate,
+                decodedSelector,
+            },
+        },
+    };
+}
 export const createPerpMarketTool = {
     name: "create_perp_market",
     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.",
@@ -13,13 +121,32 @@ export const createPerpMarketTool = {
         try {
             if (!args.baseToken || !args.marketId)
                 throw new Error("baseToken and marketId are required.");
+            const baseToken = normalizeAddress(args.baseToken, "baseToken");
+            const marketId = String(args.marketId).trim();
+            if (!MARKET_ID_RE.test(marketId)) {
+                throw new Error(`marketId must be a 66-character config hash (0x + 64 hex). Received: ${marketId}`);
+            }
             const { signer } = await resolveClient();
-            const raw = await createPool(args.baseToken, args.marketId);
+            const raw = await createPool(baseToken, marketId);
             const data = await finalizeMutationResult(raw, signer, "create_perp_market");
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            let onChainPool = null;
+            try {
+                const resolved = await getMarketPoolByBaseToken(marketId, baseToken, getChainId());
+                if (resolved?.poolId && !/^0x0{64}$/i.test(String(resolved.poolId))) {
+                    onChainPool = resolved;
+                }
+            }
+            catch {
+                onChainPool = null;
+            }
+            const payload = onChainPool
+                ? { ...data, onChainPool }
+                : data;
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: payload }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
-            return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+            const payload = buildCreateMarketErrorPayload(args, error);
+            return { content: [{ type: "text", text: JSON.stringify(payload, (_, v) => typeof v === "bigint" ? v.toString() : v, 2) }], isError: true };
         }
     },
 };

package/dist/tools/executeTrade.js

@@ -23,7 +23,7 @@ export const executeTradeTool = {
         collateralAmount: z.union([z.string(), z.number()]).describe("Collateral. e.g. '100' or 'raw:100000000' (6 decimals for USDC)."),
         size: z.union([z.string(), z.number()]).describe("Notional size in base tokens. e.g. '0.5' BTC or 'raw:50000000'."),
         price: z.union([z.string(), z.number()]).describe("Execution or Limit price. e.g. '65000' or 'raw:...'"),
-        timeInForce: z.coerce.number().int().describe("0=GTC, 1=IOC, 2=FOK"),
+        timeInForce: z.union([z.number(), z.string()]).describe("SDK v1.0.2 supports IOC only. Use 0 or 'IOC'."),
         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().optional().describe("Address of token to pay gas/execution fees (typically USDC). Default is pool quoteToken."),
@@ -50,6 +50,11 @@ export const executeTradeTool = {
             const poolData = poolResponse?.data || (poolResponse?.marketId ? poolResponse : null);
             if (!poolData)
                 throw new Error(`Could not find pool metadata for ID: ${poolId}`);
+            const resolvedMarketId = String(poolData.marketId ?? "").trim();
+            const requestedMarketId = String(args.marketId ?? "").trim();
+            if (resolvedMarketId && requestedMarketId && resolvedMarketId.toLowerCase() !== requestedMarketId.toLowerCase()) {
+                throw new Error(`Invalid marketId: marketId mismatch for poolId=${poolId}. Provided=${requestedMarketId}, resolved=${resolvedMarketId}.`);
+            }
             const baseDecimals = Number(poolData.baseDecimals ?? 18);
             const quoteDecimals = Number(poolData.quoteDecimals ?? 6);
             const mappedDirection = mapDirection(args.direction);

package/dist/tools/getBaseDetail.js

@@ -1,5 +1,106 @@
 import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { normalizeAddress } from "../utils/address.js";
+import { extractErrorMessage } from "../utils/errorMessage.js";
+function collectRows(input) {
+    if (Array.isArray(input))
+        return input.flatMap(collectRows);
+    if (!input || typeof input !== "object")
+        return [];
+    if (input.poolId || input.pool_id || input.marketId || input.market_id)
+        return [input];
+    return Object.values(input).flatMap(collectRows);
+}
+function isNonEmptyObject(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length > 0;
+}
+async function findBaseDetailFromMarkets(client, chainId, baseAddress) {
+    let rows = [];
+    try {
+        const searchRes = await client.markets.searchMarket({ chainId, keyword: "", limit: 2000 });
+        rows = collectRows(searchRes?.data ?? searchRes);
+    }
+    catch {
+        rows = [];
+    }
+    if (rows.length === 0) {
+        try {
+            const poolListRes = await client.api?.getPoolList?.();
+            rows = collectRows(poolListRes?.data ?? poolListRes);
+        }
+        catch {
+            rows = [];
+        }
+    }
+    const normalized = baseAddress.toLowerCase();
+    const matched = rows.find((row) => String(row?.baseToken ?? row?.baseAddress ?? "").trim().toLowerCase() === normalized);
+    if (!matched)
+        return null;
+    const poolId = String(matched?.poolId ?? matched?.pool_id ?? "").trim();
+    if (!poolId) {
+        return {
+            chainId,
+            baseAddress,
+            baseToken: baseAddress,
+            baseSymbol: matched?.baseSymbol ?? null,
+            baseDecimals: matched?.baseDecimals ?? matched?.base_decimals ?? null,
+            baseTokenIcon: matched?.baseTokenIcon ?? matched?.base_token_icon ?? null,
+            marketId: matched?.marketId ?? matched?.market_id ?? null,
+            poolId: null,
+            source: "market_search_fallback",
+        };
+    }
+    try {
+        const detailRes = await client.markets.getMarketDetail({ chainId, poolId });
+        const detail = detailRes?.data || (detailRes?.marketId ? detailRes : null);
+        if (detail) {
+            return {
+                chainId,
+                baseAddress,
+                baseToken: detail.baseToken ?? baseAddress,
+                baseSymbol: detail.baseSymbol ?? matched?.baseSymbol ?? null,
+                baseDecimals: detail.baseDecimals ?? matched?.baseDecimals ?? matched?.base_decimals ?? null,
+                baseTokenIcon: detail.baseTokenIcon ?? matched?.baseTokenIcon ?? null,
+                quoteSymbol: detail.quoteSymbol ?? matched?.quoteSymbol ?? null,
+                marketId: detail.marketId ?? matched?.marketId ?? null,
+                poolId: detail.poolId ?? poolId,
+                source: "market_detail_fallback",
+            };
+        }
+    }
+    catch {
+    }
+    return {
+        chainId,
+        baseAddress,
+        baseToken: baseAddress,
+        baseSymbol: matched?.baseSymbol ?? null,
+        baseDecimals: matched?.baseDecimals ?? matched?.base_decimals ?? null,
+        baseTokenIcon: matched?.baseTokenIcon ?? matched?.base_token_icon ?? null,
+        quoteSymbol: matched?.quoteSymbol ?? null,
+        marketId: matched?.marketId ?? matched?.market_id ?? null,
+        poolId,
+        source: "market_search_fallback",
+    };
+}
+function buildReadErrorPayload(args, messageLike, code = "SDK_READ_ERROR") {
+    const chainId = args.chainId ?? getChainId();
+    const message = extractErrorMessage(messageLike, "Failed to read base token detail.");
+    return {
+        status: "error",
+        error: {
+            tool: "get_base_detail",
+            code,
+            message,
+            hint: "Check baseAddress validity and market availability on current chain.",
+            action: "Use list_pools/find_pool/get_pool_metadata to confirm base token, then retry.",
+            details: {
+                chainId,
+                baseAddress: args.baseAddress ?? null,
+            },
+        },
+    };
+}
 export const getBaseDetailTool = {
     name: "get_base_detail",
     description: "[MARKET] Get base token details.",
@@ -11,11 +112,36 @@ export const getBaseDetailTool = {
         try {
             const { client } = await resolveClient();
             const chainId = args.chainId ?? getChainId();
-            const result = await client.markets.getBaseDetail({ chainId, baseAddress: args.baseAddress });
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === "bigint" ? v.toString() : v, 2) }] };
+            const baseAddress = normalizeAddress(args.baseAddress, "baseAddress");
+            const result = await client.markets.getBaseDetail({ chainId, baseAddress });
+            const hasCode = !!result && typeof result === "object" && !Array.isArray(result) && Object.prototype.hasOwnProperty.call(result, "code");
+            const code = hasCode ? Number(result.code) : 0;
+            const payload = hasCode ? result.data : result;
+            if (hasCode && Number.isFinite(code) && code !== 0) {
+                const body = buildReadErrorPayload({ ...args, baseAddress }, result.msg ?? result.message ?? result, "SDK_READ_ERROR");
+                return { content: [{ type: "text", text: JSON.stringify(body, (_, v) => typeof v === "bigint" ? v.toString() : v, 2) }], isError: true };
+            }
+            if (payload === null || payload === undefined) {
+                const fallback = await findBaseDetailFromMarkets(client, chainId, baseAddress);
+                if (fallback) {
+                    return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: fallback }, null, 2) }] };
+                }
+                const body = buildReadErrorPayload({ ...args, baseAddress }, "get_base_detail returned empty data.", "NOT_FOUND");
+                return { content: [{ type: "text", text: JSON.stringify(body, null, 2) }], isError: true };
+            }
+            if (typeof payload === "object" && !Array.isArray(payload) && !isNonEmptyObject(payload)) {
+                const fallback = await findBaseDetailFromMarkets(client, chainId, baseAddress);
+                if (fallback) {
+                    return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: fallback }, null, 2) }] };
+                }
+                const body = buildReadErrorPayload({ ...args, baseAddress }, "get_base_detail returned an empty object.", "NOT_FOUND");
+                return { content: [{ type: "text", text: JSON.stringify(body, null, 2) }], isError: true };
+            }
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: payload }, (_, v) => typeof v === "bigint" ? v.toString() : v, 2) }] };
         }
         catch (error) {
-            return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
+            const body = buildReadErrorPayload(args, error, "TOOL_EXECUTION_ERROR");
+            return { content: [{ type: "text", text: JSON.stringify(body, (_, v) => typeof v === "bigint" ? v.toString() : v, 2) }], isError: true };
         }
     },
 };

package/dist/tools/getOrders.js

@@ -1,6 +1,34 @@
 import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
 import { getOrderTypeDesc, getOrderStatusDesc, getDirectionDesc, getHistoryOrderStatusDesc, getExecTypeDesc } from "../utils/mappings.js";
+function pickFirstDefined(...values) {
+    for (const value of values) {
+        if (value !== undefined && value !== null && String(value).trim() !== "") {
+            return value;
+        }
+    }
+    return undefined;
+}
+function toMaybeNumber(value) {
+    if (value === undefined || value === null || value === "")
+        return undefined;
+    const numeric = Number(value);
+    return Number.isFinite(numeric) ? numeric : undefined;
+}
+function resolveOpenOrderStatus(order) {
+    const statusRaw = toMaybeNumber(pickFirstDefined(order?.status, order?.orderStatus, order?.order_status));
+    if (statusRaw === undefined) {
+        return { statusRaw: undefined, statusDesc: "Open" };
+    }
+    return { statusRaw, statusDesc: getOrderStatusDesc(statusRaw) };
+}
+function resolveHistoryOrderStatus(order) {
+    const orderStatusRaw = toMaybeNumber(pickFirstDefined(order?.orderStatus, order?.order_status, order?.status));
+    return {
+        orderStatusRaw,
+        orderStatusDesc: getHistoryOrderStatusDesc(orderStatusRaw),
+    };
+}
 export const getOrdersTool = {
     name: "get_orders",
     description: "[ACCOUNT] Get orders (open or history) with optional filters.",
@@ -19,7 +47,7 @@ export const getOrdersTool = {
                 results.open = (openRes?.data || []).map((order) => ({
                     ...order,
                     orderTypeDesc: getOrderTypeDesc(order.orderType),
-                    statusDesc: getOrderStatusDesc(order.status),
+                    ...resolveOpenOrderStatus(order),
                     directionDesc: getDirectionDesc(order.direction)
                 }));
                 if (args.poolId) {
@@ -32,7 +60,7 @@ export const getOrdersTool = {
                 results.history = (historyRes?.data || []).map((order) => ({
                     ...order,
                     orderTypeDesc: getOrderTypeDesc(order.orderType),
-                    orderStatusDesc: getHistoryOrderStatusDesc(order.orderStatus),
+                    ...resolveHistoryOrderStatus(order),
                     directionDesc: getDirectionDesc(order.direction),
                     execTypeDesc: getExecTypeDesc(order.execType)
                 }));