@michaleffffff/mcp-trading-server 3.0.20 → 3.0.24

package/dist/services/tradeService.js

@@ -7,6 +7,7 @@ import { normalizeSlippagePct4dp } from "../utils/slippage.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
 import { mapTimeInForce } from "../utils/mappings.js";
+import { getFreshOraclePrice } from "./marketService.js";
 function resolveDirection(direction) {
     if (typeof direction === "string") {
         const text = direction.trim().toUpperCase();
@@ -154,6 +155,37 @@ function validateIncreaseOrderEconomics(args) {
     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}.`);
 }
+function countAdditionalExecutionOrders(args) {
+    let count = 1;
+    if (String(args.tpPrice ?? "").trim()) {
+        count += 1;
+    }
+    if (String(args.slPrice ?? "").trim()) {
+        count += 1;
+    }
+    return count;
+}
+async function getRequiredIncreaseSpendRaw(client, marketId, args, chainId) {
+    const collateralRaw = BigInt(args.collateralRaw);
+    const tradingFeeRaw = BigInt(args.tradingFeeRaw);
+    const executionOrderCount = countAdditionalExecutionOrders(args);
+    const networkFeeText = String(await client.utils.getNetworkFee(marketId, chainId) ?? "").trim();
+    if (!/^\d+$/.test(networkFeeText)) {
+        throw new Error(`Failed to resolve networkFee for marketId=${marketId}.`);
+    }
+    const baseNetworkFeeRaw = BigInt(networkFeeText);
+    if (baseNetworkFeeRaw <= 0n) {
+        throw new Error(`networkFee must be > 0 for marketId=${marketId}.`);
+    }
+    const networkFeeRaw = baseNetworkFeeRaw * BigInt(executionOrderCount);
+    return {
+        collateralRaw,
+        tradingFeeRaw,
+        networkFeeRaw,
+        executionOrderCount,
+        totalSpendRaw: collateralRaw + tradingFeeRaw + networkFeeRaw,
+    };
+}
 async function resolveDecimalsForUpdateOrder(client, chainId, marketId, poolIdHint) {
     let baseDecimals = 18;
     let quoteDecimals = getQuoteDecimals();
@@ -249,6 +281,18 @@ 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 });
+    const resolvedMarketId = String(args.marketId ?? poolData.marketId ?? "").trim();
+    if (!resolvedMarketId) {
+        throw new Error(`marketId is required to compute networkFee for poolId=${args.poolId}.`);
+    }
+    const spend = await getRequiredIncreaseSpendRaw(client, resolvedMarketId, {
+        collateralRaw,
+        tradingFeeRaw,
+        tpPrice: args.tpPrice,
+        tpSize: args.tpSize,
+        slPrice: args.slPrice,
+        slSize: args.slSize,
+    }, chainId);
     validateIncreaseOrderEconomics({
         collateralRaw,
         sizeRaw,
@@ -268,7 +312,7 @@ export async function openPosition(client, address, args) {
         marginBalanceRaw = toBigIntOrZero(marginInfo.data.freeMargin);
         walletBalanceRaw = toBigIntOrZero(marginInfo.data.walletBalance);
     }
-    const requiredRaw = BigInt(collateralRaw);
+    const requiredRaw = spend.totalSpendRaw;
     if (marginBalanceRaw < requiredRaw) {
         if (!allowAutoDeposit) {
             throw new Error(`Insufficient marginBalance (${marginBalanceRaw.toString()}) for required collateral (${requiredRaw.toString()}). ` +
@@ -459,9 +503,14 @@ export async function closeAllPositions(client, address) {
     const results = [];
     for (const pos of positions) {
         const dir = pos.direction === 0 ? Direction.LONG : Direction.SHORT;
-        // Get current price for slippage protection
-        const oracleData = await client.utils.getOraclePrice(pos.poolId, chainId);
-        const currentPrice30 = ensureUnits(oracleData.price, 30, "oracle price");
+        const marketDetailRes = await client.markets.getMarketDetail({ chainId, poolId: pos.poolId });
+        const marketDetail = marketDetailRes?.data || (marketDetailRes?.marketId ? marketDetailRes : null);
+        if (!marketDetail?.marketId) {
+            throw new Error(`Could not resolve market metadata for poolId=${pos.poolId}.`);
+        }
+        const baseDecimals = Number(marketDetail.baseDecimals ?? 18);
+        const oracleData = await getFreshOraclePrice(client, pos.poolId, chainId);
+        const currentPrice30 = ensureUnits(oracleData.price, 30, "oracle price", { allowImplicitRaw: false });
         // For LONG close (Decrease LONG): Price should be lower (e.g. 90% of current)
         // For SHORT close (Decrease SHORT): Price should be higher (e.g. 110% of current)
         // Here we use a safe 10% slippage price
@@ -472,7 +521,13 @@ export async function closeAllPositions(client, address) {
         else {
             slippagePrice30 = (BigInt(currentPrice30) * 110n) / 100n;
         }
-        const sizeWei = ensureUnits(pos.size, 18, "size");
+        const sizeInput = /^\d+$/.test(String(pos.sizeRaw ?? pos.positionSizeRaw ?? "").trim())
+            ? `raw:${String(pos.sizeRaw ?? pos.positionSizeRaw).trim()}`
+            : String(pos.size ?? pos.positionSize ?? "").trim();
+        if (!sizeInput) {
+            throw new Error(`Position size missing for positionId=${String(pos.positionId ?? "").trim()}.`);
+        }
+        const sizeWei = ensureUnits(sizeInput, baseDecimals, "size", { allowImplicitRaw: false });
         const res = await client.order.createDecreaseOrder({
             chainId,
             address,
@@ -485,7 +540,7 @@ export async function closeAllPositions(client, address) {
             size: sizeWei,
             price: slippagePrice30.toString(),
             postOnly: false,
-            slippagePct: "1000", // 10%
+            slippagePct: "100", // 1%
             executionFeeToken: getQuoteToken(),
             leverage: pos.userLeverage,
         });

package/dist/tools/accountTransfer.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { resolveClient, getChainId, getQuoteToken } from "../auth/resolveClient.js";
 import { normalizeAddress } from "../utils/address.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
+import { fetchErc20Decimals } from "../utils/token.js";
 const MAX_UINT256 = "115792089237316195423570985008687907853269984665640564039457584007913129639935";
 function asBigintOrNull(value) {
     try {
@@ -52,11 +53,9 @@ export const accountDepositTool = {
             const chainId = getChainId();
             const tokenAddressInput = String(args.tokenAddress ?? "").trim() || getQuoteToken();
             const tokenAddress = normalizeAddress(tokenAddressInput, "tokenAddress");
-            // For deposit, we default to quote decimals (6) as it's the most common use case.
-            // ensureUnits handles 'raw:' prefix if absolute precision is needed.
             const { ensureUnits } = await import("../utils/units.js");
-            const { getQuoteDecimals } = await import("../auth/resolveClient.js");
-            const amount = ensureUnits(args.amount, getQuoteDecimals(), "amount", { allowImplicitRaw: false });
+            const tokenDecimals = await fetchErc20Decimals(signer.provider ?? signer, tokenAddress, "deposit token");
+            const amount = ensureUnits(args.amount, tokenDecimals, "amount", { allowImplicitRaw: false });
             let approval = null;
             const needApproval = await client.utils.needsApproval(address, chainId, tokenAddress, amount);
             if (needApproval) {
@@ -102,9 +101,17 @@ export const accountWithdrawTool = {
             const { client, address, signer } = await resolveClient();
             const chainId = getChainId();
             const { ensureUnits } = await import("../utils/units.js");
-            const { getQuoteDecimals } = await import("../auth/resolveClient.js");
-            // Assuming 18 decimals for base and quoteDecimals for quote
-            const decimals = args.isQuoteToken ? getQuoteDecimals() : 18;
+            const marketDetailRes = await client.markets.getMarketDetail({ chainId, poolId: args.poolId });
+            const marketDetail = marketDetailRes?.data || (marketDetailRes?.marketId ? marketDetailRes : null);
+            if (!marketDetail?.marketId) {
+                throw new Error(`Could not resolve market metadata for poolId=${args.poolId}.`);
+            }
+            const decimals = Number(Boolean(args.isQuoteToken)
+                ? marketDetail.quoteDecimals
+                : marketDetail.baseDecimals);
+            if (!Number.isFinite(decimals) || decimals < 0) {
+                throw new Error(`Invalid token decimals for withdraw on poolId=${args.poolId}.`);
+            }
             const amount = ensureUnits(args.amount, decimals, "amount", { allowImplicitRaw: false });
             const amountRaw = asBigintOrNull(amount);
             if (amountRaw === null || amountRaw <= 0n) {

package/dist/tools/closeAllPositions.js

@@ -1,9 +1,25 @@
 import { z } from "zod";
 import { resolveClient, getChainId, getQuoteToken } from "../auth/resolveClient.js";
-import { getOraclePrice, resolvePool } from "../services/marketService.js";
+import { getFreshOraclePrice, 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";
+const INTEGER_RE = /^\d+$/;
+function resolvePositionSizeInput(position) {
+    const rawCandidates = [position?.sizeRaw, position?.positionSizeRaw];
+    for (const candidate of rawCandidates) {
+        const text = String(candidate ?? "").trim();
+        if (INTEGER_RE.test(text))
+            return `raw:${text}`;
+    }
+    const humanCandidates = [position?.size, position?.positionSize];
+    for (const candidate of humanCandidates) {
+        const text = String(candidate ?? "").trim();
+        if (text)
+            return text;
+    }
+    throw new Error(`Position size missing for positionId=${String(position?.positionId ?? position?.position_id ?? "").trim()}.`);
+}
 export const closeAllPositionsTool = {
     name: "close_all_positions",
     description: "[TRADE] Emergency: close ALL open positions in a pool at once. Use for risk management.",
@@ -28,27 +44,18 @@ export const closeAllPositionsTool = {
                 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) }] };
             }
             // 2) 为每个仓位构建平仓参数
-            const slippagePct = normalizeSlippagePct4dpFlexible(args.slippagePct ?? "200");
-            // 3) We need actual oracle prices to avoid Revert 0x613970e0 (InvalidParameter)
-            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, poolId).catch(() => null);
-                if (marketData && marketData.price) {
-                    fallbackPrice = marketData.price.toString();
-                }
-                else {
-                    // Extreme fallback - but this may still revert
-                    fallbackPrice = poolPositions[0]?.entryPrice || "0";
-                }
+            const slippagePct = normalizeSlippagePct4dpFlexible(args.slippagePct ?? "100");
+            const marketDetailRes = await client.markets.getMarketDetail({ chainId, poolId });
+            const marketDetail = marketDetailRes?.data || (marketDetailRes?.marketId ? marketDetailRes : null);
+            if (!marketDetail?.marketId) {
+                throw new Error(`Could not resolve market metadata for poolId=${poolId}.`);
             }
+            const baseDecimals = Number(marketDetail.baseDecimals ?? 18);
+            const quoteToken = String(marketDetail.quoteToken ?? "").trim() || getQuoteToken();
+            const oracle = await getFreshOraclePrice(client, poolId, chainId);
+            const freshOraclePrice = oracle.price.toString();
             const closeParams = poolPositions.map((pos) => {
-                const rawSize = pos.size || pos.positionSize || "0";
-                const rawPrice = pos.markPrice || pos.mark_price || fallbackPrice;
+                const sizeInput = resolvePositionSizeInput(pos);
                 return {
                     chainId,
                     address,
@@ -59,11 +66,11 @@ export const closeAllPositionsTool = {
                     timeInForce: 0, // IOC
                     direction: pos.direction ?? 0,
                     collateralAmount: "0",
-                    size: ensureUnits(rawSize, 18, "size"),
-                    price: ensureUnits(rawPrice, 30, "price"),
+                    size: ensureUnits(sizeInput, baseDecimals, "size", { allowImplicitRaw: false }),
+                    price: ensureUnits(freshOraclePrice, 30, "price", { allowImplicitRaw: false }),
                     postOnly: false,
                     slippagePct,
-                    executionFeeToken: pos.quoteToken || pos.quote_token || getQuoteToken(),
+                    executionFeeToken: quoteToken,
                     leverage: pos.userLeverage ?? pos.leverage ?? 1,
                 };
             });

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.union([z.number(), z.string()]).describe("SDK v1.0.2 supports IOC only. Use 0 or 'IOC'."),
+        timeInForce: z.union([z.number(), z.string()]).describe("SDK v1.0.4-beta.4 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"),
@@ -95,6 +95,20 @@ export const closePositionTool = {
                 triggerType: preparedArgs.triggerType !== undefined ? mapTriggerType(preparedArgs.triggerType) : undefined,
                 executionFeeToken: poolData.quoteToken || preparedArgs.executionFeeToken
             };
+            const positionsRes = await client.position.listPositions(address);
+            const positions = Array.isArray(positionsRes?.data) ? positionsRes.data : [];
+            const target = positions.find((position) => {
+                const pid = String(position?.positionId ?? position?.position_id ?? "").trim().toLowerCase();
+                const pool = String(position?.poolId ?? position?.pool_id ?? "").trim().toLowerCase();
+                return pid === String(preparedArgs.positionId ?? "").trim().toLowerCase() && pool === String(poolId).toLowerCase();
+            });
+            if (!target) {
+                throw new Error(`Could not find live position snapshot for positionId=${preparedArgs.positionId} in poolId=${poolId}.`);
+            }
+            const liveDirection = Number(target?.direction);
+            if (!Number.isFinite(liveDirection) || liveDirection !== mappedArgs.direction) {
+                throw new Error(`direction mismatch for positionId=${preparedArgs.positionId}: input=${mappedArgs.direction}, live=${String(target?.direction ?? "unknown")}.`);
+            }
             const raw = await closePos(client, address, mappedArgs);
             const data = await finalizeMutationResult(raw, signer, "close_position");
             const txHash = data.confirmation?.txHash;

package/dist/tools/executeTrade.js

@@ -10,6 +10,14 @@ import { parseUserUnits } from "../utils/units.js";
 import { isZeroAddress } from "../utils/address.js";
 const POSITION_ID_RE = /^$|^0x[0-9a-fA-F]{64}$/;
 const ZERO_POSITION_ID_RE = /^0x0{64}$/i;
+function pow10(decimals) {
+    return 10n ** BigInt(decimals);
+}
+function computeQuoteNotionalRaw(sizeRaw, priceRaw30, baseDecimals, quoteDecimals) {
+    const numerator = sizeRaw * priceRaw30 * pow10(quoteDecimals);
+    const denominator = pow10(baseDecimals + 30);
+    return numerator / denominator;
+}
 export const executeTradeTool = {
     name: "execute_trade",
     description: "[TRADE] Create an increase order (open or add to position) using SDK-native parameters.",
@@ -24,7 +32,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.union([z.number(), z.string()]).describe("SDK v1.0.2 supports IOC only. Use 0 or 'IOC'."),
+        timeInForce: z.union([z.number(), z.string()]).describe("SDK v1.0.4-beta.4 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."),
@@ -76,6 +84,22 @@ export const executeTradeTool = {
                 throw new Error("size must be > 0.");
             if (BigInt(priceRaw) <= 0n)
                 throw new Error("price must be > 0.");
+            if (normalizedPositionId) {
+                const positionsRes = await client.position.listPositions(address);
+                const positions = Array.isArray(positionsRes?.data) ? positionsRes.data : [];
+                const target = positions.find((position) => {
+                    const positionId = String(position?.positionId ?? position?.position_id ?? "").trim().toLowerCase();
+                    const positionPoolId = String(position?.poolId ?? position?.pool_id ?? "").trim().toLowerCase();
+                    return positionId === normalizedPositionId.toLowerCase() && positionPoolId === String(poolId).toLowerCase();
+                });
+                if (!target) {
+                    throw new Error(`Could not find live position for positionId=${normalizedPositionId} in poolId=${poolId}.`);
+                }
+                const liveDirection = Number(target?.direction);
+                if (!Number.isFinite(liveDirection) || liveDirection !== mappedDirection) {
+                    throw new Error(`direction mismatch for positionId=${normalizedPositionId}: input=${mappedDirection}, live=${String(target?.direction ?? "unknown")}.`);
+                }
+            }
             let tradingFeeRaw = "";
             let tradingFeeMeta = { source: "user" };
             const tradingFeeInput = String(args.tradingFee ?? "").trim();
@@ -107,7 +131,8 @@ export const executeTradeTool = {
                 }
                 const rateRaw = args.postOnly ? feeRes.data.makerFeeRate : feeRes.data.takerFeeRate;
                 const rateBig = BigInt(String(rateRaw ?? "0"));
-                tradingFeeRaw = ((BigInt(collateralRaw) * rateBig) / 1000000n).toString();
+                const notionalQuoteRaw = computeQuoteNotionalRaw(BigInt(sizeRaw), BigInt(priceRaw), baseDecimals, quoteDecimals);
+                tradingFeeRaw = ((notionalQuoteRaw * rateBig) / 1000000n).toString();
                 tradingFeeMeta = { source: "computed", assetClass, riskTier, feeRate: String(rateRaw ?? "0") };
             }
             const mappedArgs = {

package/dist/tools/getMyLpHoldings.js

@@ -121,9 +121,6 @@ function toSymbol(row) {
         return base;
     return normalizePoolId(row?.poolId ?? row?.pool_id);
 }
-function sumRaw(baseRaw, quoteRaw) {
-    return BigInt(baseRaw || "0") + BigInt(quoteRaw || "0");
-}
 async function readErc20Balance(provider, tokenAddress, holder) {
     const contract = new Contract(tokenAddress, ERC20_BALANCE_ABI, provider);
     const balance = await contract.balanceOf(holder);
@@ -227,11 +224,10 @@ export const getMyLpHoldingsTool = {
                 });
             }
             items.sort((left, right) => {
-                const leftSum = sumRaw(left.baseLpBalanceRaw, left.quoteLpBalanceRaw);
-                const rightSum = sumRaw(right.baseLpBalanceRaw, right.quoteLpBalanceRaw);
-                if (leftSum === rightSum)
-                    return 0;
-                return rightSum > leftSum ? 1 : -1;
+                const symbolCompare = String(left.symbol ?? "").localeCompare(String(right.symbol ?? ""));
+                if (symbolCompare !== 0)
+                    return symbolCompare;
+                return String(left.poolId ?? "").localeCompare(String(right.poolId ?? ""));
             });
             const payload = {
                 meta: {

package/dist/tools/getPoolMetadata.js

@@ -4,21 +4,8 @@ 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 SIGNED_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");
-}
 function compactWarning(scope, err) {
     const raw = extractErrorMessage(err);
     const flat = raw.replace(/\s+/g, " ").trim();
@@ -211,8 +198,8 @@ export const getPoolMetadataTool = {
     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)"),
+        includeLiquidity: z.boolean().default(false).describe("Whether to include liquidity depth (uses fresh oracle price automatically)"),
+        marketPrice: z.union([z.string(), z.number()]).optional().describe("Deprecated and ignored. MCP now uses fresh oracle price for liquidity depth."),
         includeConfig: z.boolean().default(false).describe("Whether to include pool level configuration/limits"),
         chainId: z.number().int().positive().optional().describe("Optional chainId override"),
     },
@@ -245,10 +232,15 @@ export const getPoolMetadataTool = {
             // 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);
+                    const liquidityResult = await getLiquidityInfo(client, poolId, chainId);
+                    results.liquidityInfo = liquidityResult.liquidityInfo;
+                    results.liquidityInfoMeta = {
+                        marketPriceSource: liquidityResult.marketPriceSource,
+                        marketPrice: liquidityResult.marketPrice,
+                        oraclePublishTime: liquidityResult.oraclePublishTime,
+                        oracleType: liquidityResult.oracleType,
+                        ignoredUserMarketPrice: args.marketPrice !== undefined ? String(args.marketPrice) : null,
+                    };
                 }
                 catch (err) {
                     errors.push(compactWarning("liquidityInfo", err));

package/dist/tools/manageLiquidity.js

@@ -5,6 +5,7 @@ import { resolveClient, getChainId } from "../auth/resolveClient.js";
 import { resolvePool } from "../services/marketService.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
+import { normalizeLpSlippageRatio } from "../utils/slippage.js";
 function normalizeAssetSymbol(value) {
     const text = String(value ?? "").trim();
     if (!text)
@@ -67,7 +68,7 @@ export const manageLiquidityTool = {
         action: z.coerce.string().describe("'deposit' or 'withdraw' (aliases: add/remove/increase/decrease; case-insensitive)"),
         poolType: z.enum(["BASE", "QUOTE"]).describe("'BASE' or 'QUOTE'"),
         poolId: z.string().describe("Pool ID or Base Token Address"),
-        amount: z.coerce.number().positive().describe("Amount in human-readable units"),
+        amount: z.coerce.string().describe("Amount in human-readable units string"),
         slippage: z.coerce.number().min(0).describe("LP slippage ratio (e.g. 0.01 = 1%)"),
         chainId: z.coerce.number().int().positive().optional().describe("Optional chainId override"),
     },
@@ -75,9 +76,13 @@ export const manageLiquidityTool = {
         try {
             const { client, signer } = await resolveClient();
             let { action, poolType, poolId } = args;
-            const { amount, slippage } = args;
+            const amount = String(args.amount ?? "").trim();
+            const slippage = normalizeLpSlippageRatio(args.slippage);
             const chainId = args.chainId ?? getChainId();
             action = String(action ?? "").trim().toLowerCase();
+            if (!amount) {
+                throw new Error("amount is required.");
+            }
             const validActions = new Set(["deposit", "withdraw", "add", "remove", "increase", "decrease"]);
             if (!validActions.has(action)) {
                 throw new Error(`Invalid action: ${args.action}. Use deposit/withdraw or aliases add/remove/increase/decrease.`);

package/dist/tools/manageTpSl.js

@@ -29,7 +29,7 @@ function readSnapshotText(snapshot, keys) {
     }
     return "";
 }
-function normalizeUnitsInput(text) {
+function normalizeSizeInput(text) {
     const raw = String(text ?? "").trim();
     if (!raw)
         return "";
@@ -39,6 +39,17 @@ function normalizeUnitsInput(text) {
         return `raw:${raw}`;
     return raw;
 }
+function normalizePriceInput(text, source = "user") {
+    const raw = String(text ?? "").trim();
+    if (!raw)
+        return "";
+    if (/^(raw|human):/i.test(raw))
+        return raw;
+    if (source === "snapshot" && /^\d+$/.test(raw) && raw.length > 12) {
+        return `raw:${raw}`;
+    }
+    return raw;
+}
 function isExplicitZeroValue(value) {
     if (value === undefined || value === null)
         return false;
@@ -160,6 +171,58 @@ function resolvePositionSizeRaw(positionSnapshot, baseDecimals) {
     }
     return "";
 }
+function resolveEntryPriceInput(positionSnapshot) {
+    const rawCandidates = [
+        positionSnapshot?.entryPriceRaw,
+        positionSnapshot?.openPriceRaw,
+        positionSnapshot?.avgPriceRaw,
+        positionSnapshot?.averageOpenPriceRaw,
+    ];
+    for (const value of rawCandidates) {
+        const text = String(value ?? "").trim();
+        if (INTEGER_RE.test(text))
+            return `raw:${text}`;
+    }
+    const humanCandidates = [
+        positionSnapshot?.entryPrice,
+        positionSnapshot?.openPrice,
+        positionSnapshot?.avgPrice,
+        positionSnapshot?.averageOpenPrice,
+    ];
+    for (const value of humanCandidates) {
+        const text = String(value ?? "").trim();
+        if (text)
+            return text;
+    }
+    return "";
+}
+function validateTpSlPriceSemantics(direction, entryPriceInput, tpPriceInput, slPriceInput) {
+    if (!entryPriceInput) {
+        throw new Error("Unable to resolve entryPrice for TP/SL validation.");
+    }
+    const entryPriceRaw = BigInt(parseUserUnits(entryPriceInput, 30, "entryPrice"));
+    if (entryPriceRaw <= 0n) {
+        throw new Error("entryPrice must be > 0 for TP/SL validation.");
+    }
+    if (tpPriceInput) {
+        const tpPriceRaw = BigInt(parseUserUnits(tpPriceInput, 30, "tpPrice"));
+        if (direction === 0 && tpPriceRaw <= entryPriceRaw) {
+            throw new Error("LONG TP must be greater than entryPrice.");
+        }
+        if (direction === 1 && tpPriceRaw >= entryPriceRaw) {
+            throw new Error("SHORT TP must be less than entryPrice.");
+        }
+    }
+    if (slPriceInput) {
+        const slPriceRaw = BigInt(parseUserUnits(slPriceInput, 30, "slPrice"));
+        if (direction === 0 && slPriceRaw >= entryPriceRaw) {
+            throw new Error("LONG SL must be less than entryPrice.");
+        }
+        if (direction === 1 && slPriceRaw <= entryPriceRaw) {
+            throw new Error("SHORT SL must be greater than entryPrice.");
+        }
+    }
+}
 async function cancelTpSlByIntent(client, address, signer, chainId, args) {
     if (args.orderId) {
         const raw = await client.order.cancelAllOrders([String(args.orderId)], chainId);
@@ -265,12 +328,21 @@ export const manageTpSlTool = {
                 const snapshotTpSize = readSnapshotText(orderSnapshot, ["tpSize", "takeProfitSize"]);
                 const snapshotSlPrice = readSnapshotText(orderSnapshot, ["slPrice", "stopLossPrice", "slTriggerPrice"]);
                 const snapshotSlSize = readSnapshotText(orderSnapshot, ["slSize", "stopLossSize"]);
+                const orderPositionId = readSnapshotText(orderSnapshot, ["positionId", "position_id"]);
                 const size = isNonEmpty(args.size) ? String(args.size) : snapshotSize;
                 const price = isNonEmpty(args.price) ? String(args.price) : snapshotPrice;
                 const tpPrice = isNonEmpty(args.tpPrice) ? String(args.tpPrice) : snapshotTpPrice;
                 const tpSize = isNonEmpty(args.tpSize) ? String(args.tpSize) : snapshotTpSize;
                 const slPrice = isNonEmpty(args.slPrice) ? String(args.slPrice) : snapshotSlPrice;
                 const slSize = isNonEmpty(args.slSize) ? String(args.slSize) : snapshotSlSize;
+                const updateDirection = normalizeDirectionInput(args.direction ?? orderSnapshot?.direction);
+                const positionSnapshot = orderPositionId
+                    ? await findPositionSnapshot(client, address, args.poolId, orderPositionId)
+                    : null;
+                if (updateDirection !== undefined) {
+                    const entryPriceInput = resolveEntryPriceInput(positionSnapshot);
+                    validateTpSlPriceSemantics(updateDirection, entryPriceInput, tpPrice || undefined, slPrice || undefined);
+                }
                 if (!size || !price) {
                     throw new Error("size and price are required for update. Provide them explicitly, or ensure orderId can be found via get_orders so they can be auto-resolved.");
                 }
@@ -288,12 +360,12 @@ export const manageTpSlTool = {
                         orderId: args.orderId,
                         marketId: market.marketId,
                         poolId: args.poolId,
-                        size: normalizeUnitsInput(size),
-                        price: normalizeUnitsInput(price),
-                        tpPrice: tpPrice ? normalizeUnitsInput(tpPrice) : "0",
-                        tpSize: tpSize ? normalizeUnitsInput(tpSize) : "0",
-                        slPrice: slPrice ? normalizeUnitsInput(slPrice) : "0",
-                        slSize: slSize ? normalizeUnitsInput(slSize) : "0",
+                        size: normalizeSizeInput(size),
+                        price: normalizePriceInput(price, isNonEmpty(args.price) ? "user" : "snapshot"),
+                        tpPrice: tpPrice ? normalizePriceInput(tpPrice, isNonEmpty(args.tpPrice) ? "user" : "snapshot") : "0",
+                        tpSize: tpSize ? normalizeSizeInput(tpSize) : "0",
+                        slPrice: slPrice ? normalizePriceInput(slPrice, isNonEmpty(args.slPrice) ? "user" : "snapshot") : "0",
+                        slSize: slSize ? normalizeSizeInput(slSize) : "0",
                         quoteToken: market.quoteToken,
                         useOrderCollateral: args.useOrderCollateral ?? true
                     }, chainId);
@@ -326,6 +398,8 @@ export const manageTpSlTool = {
                 if (resolvedDirection === undefined || !resolvedLeverage || Number(resolvedLeverage) <= 0) {
                     throw new Error("direction and leverage are required when creating new TP/SL.");
                 }
+                const entryPriceInput = resolveEntryPriceInput(positionSnapshot);
+                validateTpSlPriceSemantics(resolvedDirection, entryPriceInput, isNonEmpty(args.tpPrice) ? String(args.tpPrice) : undefined, isNonEmpty(args.slPrice) ? String(args.slPrice) : undefined);
                 let tpSizeInput = isNonEmpty(args.tpSize) ? String(args.tpSize) : "";
                 let slSizeInput = isNonEmpty(args.slSize) ? String(args.slSize) : "";
                 const needsTpSize = isNonEmpty(args.tpPrice) && !tpSizeInput;