@cabaltrading/cli 0.4.4 → 0.4.5

package/dist/index.js

@@ -642,34 +642,9 @@ var init_agents = __esm(() => {
 
 // ../../packages/client/src/schemas/trade.ts
 import { z as z4 } from "zod";
-var SUPPORTED_MODELS, modelSchema, solanaTradeRequestSchema, hyperliquidTradeRequestSchema, tradeRequestSchema, tradeResponseDataSchema, tradeResponseSchema, dryRunResponseDataSchema;
+var solanaTradeRequestSchema, hyperliquidTradeRequestSchema, tradeRequestSchema, tradeResponseDataSchema, tradeResponseSchema, dryRunResponseDataSchema;
 var init_trade = __esm(() => {
   init_common();
-  SUPPORTED_MODELS = [
-    "claude-3-opus",
-    "claude-3-sonnet",
-    "claude-3.5-sonnet",
-    "claude-3-haiku",
-    "gpt-4",
-    "gpt-4-turbo",
-    "gpt-4o",
-    "o1",
-    "o1-mini",
-    "grok-2",
-    "grok-2-mini",
-    "gemini-pro",
-    "gemini-ultra",
-    "llama-3-70b",
-    "llama-3-405b",
-    "mistral-large",
-    "mixtral",
-    "deepseek-v3",
-    "deepseek-r1",
-    "kimi-k2",
-    "kimi-k2.5",
-    "other"
-  ];
-  modelSchema = z4.enum(SUPPORTED_MODELS);
   solanaTradeRequestSchema = z4.object({
     chain: z4.literal("solana"),
     inputToken: z4.string().min(1),
@@ -677,7 +652,7 @@ var init_trade = __esm(() => {
     amount: z4.number().positive(),
     slippageBps: z4.number().int().min(1).max(500).optional(),
     dryRun: z4.boolean().optional(),
-    model: modelSchema.optional()
+    model: z4.string().optional()
   });
   hyperliquidTradeRequestSchema = z4.object({
     chain: z4.literal("hyperliquid"),
@@ -687,7 +662,7 @@ var init_trade = __esm(() => {
     price: z4.number().positive().optional(),
     orderType: z4.enum(["limit", "market"]).optional(),
     leverage: z4.number().positive().optional(),
-    model: modelSchema.optional()
+    model: z4.string().optional()
   });
   tradeRequestSchema = z4.discriminatedUnion("chain", [
     solanaTradeRequestSchema,
@@ -3663,6 +3638,232 @@ var init_env = __esm(() => {
   ];
 });
 
+// ../../packages/solana/src/errors.ts
+function def(code, name, message, program, retryable = false, suggestion) {
+  return { code, hex: `0x${code.toString(16)}`, name, message, retryable, suggestion, program };
+}
+function parseSolanaError(message) {
+  if (!message)
+    return null;
+  const customMatch = CUSTOM_ERROR_RE.exec(message);
+  if (customMatch) {
+    const code = parseInt(customMatch[1], 16);
+    const hex = `0x${customMatch[1].toLowerCase()}`;
+    const instructionMatch = INSTRUCTION_INDEX_RE.exec(message);
+    const instructionIndex = instructionMatch ? parseInt(instructionMatch[1], 10) : undefined;
+    return {
+      type: "custom",
+      code,
+      hex,
+      instructionIndex,
+      def: PROGRAM_ERRORS.get(code),
+      raw: message
+    };
+  }
+  const anchorMatch = ANCHOR_ERROR_RE.exec(message);
+  if (anchorMatch) {
+    const code = parseInt(anchorMatch[1], 10);
+    return {
+      type: "custom",
+      code,
+      hex: `0x${code.toString(16)}`,
+      def: PROGRAM_ERRORS.get(code),
+      raw: message
+    };
+  }
+  for (const [variant, errorDef] of INSTRUCTION_ERRORS) {
+    if (message.includes(variant)) {
+      return {
+        type: "instruction",
+        def: errorDef,
+        raw: message
+      };
+    }
+  }
+  return null;
+}
+function classifyTradeError(errorMessage) {
+  const parsed = parseSolanaError(errorMessage);
+  if (parsed?.def) {
+    const d = parsed.def;
+    if (d.name === "SlippageToleranceExceeded") {
+      return {
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: d.message,
+        retryable: true,
+        suggestion: d.suggestion,
+        solanaError: d.name
+      };
+    }
+    if (d.name === "InsufficientFunds") {
+      return {
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: d.message,
+        retryable: false,
+        suggestion: d.suggestion,
+        solanaError: d.name
+      };
+    }
+    if (d.name === "ComputationalBudgetExceeded" || d.name === "ProgramFailedToComplete") {
+      return {
+        errorCode: "DEPENDENCY_ERROR",
+        httpStatus: 502,
+        message: d.message,
+        retryable: true,
+        suggestion: d.suggestion,
+        solanaError: d.name
+      };
+    }
+    return {
+      errorCode: d.retryable ? "DEPENDENCY_ERROR" : "BAD_REQUEST",
+      httpStatus: d.retryable ? 502 : 400,
+      message: d.message,
+      retryable: d.retryable,
+      suggestion: d.suggestion,
+      solanaError: d.name
+    };
+  }
+  if (parsed?.type === "custom" && parsed.code !== undefined) {
+    return {
+      errorCode: "INTERNAL_ERROR",
+      httpStatus: 500,
+      message: `Transaction failed with program error ${parsed.hex}`,
+      retryable: false,
+      solanaError: `UnknownError_${parsed.hex}`
+    };
+  }
+  for (const pattern of KEYWORD_PATTERNS) {
+    if (pattern.test(errorMessage)) {
+      return pattern.classify(errorMessage);
+    }
+  }
+  return {
+    errorCode: "INTERNAL_ERROR",
+    httpStatus: 500,
+    message: `Trade failed: ${errorMessage}`,
+    retryable: false
+  };
+}
+var PROGRAM_ERRORS, INSTRUCTION_ERRORS, CUSTOM_ERROR_RE, INSTRUCTION_INDEX_RE, ANCHOR_ERROR_RE, KEYWORD_PATTERNS;
+var init_errors2 = __esm(() => {
+  PROGRAM_ERRORS = new Map([
+    [0, def(0, "NotRentExempt", "Account is not rent exempt", "token")],
+    [1, def(1, "InsufficientFunds", "Insufficient token balance", "token", false, "Check your token balance before trading")],
+    [2, def(2, "InvalidMint", "Invalid mint address", "token")],
+    [3, def(3, "MintMismatch", "Account mint does not match expected mint", "token")],
+    [4, def(4, "OwnerMismatch", "Account owner does not match expected owner", "token")],
+    [5, def(5, "FixedSupply", "Token supply is fixed — cannot mint more", "token")],
+    [6, def(6, "AlreadyInUse", "Account is already initialized", "token")],
+    [7, def(7, "InvalidNumberOfProvidedSigners", "Invalid number of signers", "token")],
+    [8, def(8, "InvalidNumberOfRequiredSigners", "Invalid number of required signers", "token")],
+    [9, def(9, "UninitializedState", "Token account is not initialized", "token")],
+    [10, def(10, "NativeNotSupported", "Operation not supported for native SOL", "token")],
+    [11, def(11, "NonNativeHasBalance", "Non-native account has balance — close with non-zero balance", "token")],
+    [12, def(12, "InvalidInstruction", "Invalid token instruction", "token")],
+    [13, def(13, "InvalidState", "Invalid token account state", "token")],
+    [14, def(14, "Overflow", "Arithmetic overflow in token operation", "token")],
+    [15, def(15, "AuthorityTypeNotSupported", "Authority type not supported", "token")],
+    [16, def(16, "MintCannotFreeze", "This mint cannot freeze accounts", "token")],
+    [17, def(17, "AccountFrozen", "Account is frozen — cannot transfer", "token")],
+    [6000, def(6000, "EmptyRoute", "No swap route found", "jupiter", false, "Token pair may not have liquidity. Try a different pair.")],
+    [6001, def(6001, "SlippageToleranceExceeded", "Slippage tolerance exceeded — price moved during execution", "jupiter", true, "Retry or increase slippage tolerance")],
+    [6002, def(6002, "InvalidCalculation", "Swap calculation error", "jupiter")],
+    [6003, def(6003, "MissingPlatformFeeAccount", "Platform fee account not provided", "jupiter", false, "Server configuration issue — contact support")],
+    [6004, def(6004, "InvalidSlippage", "Invalid slippage value", "jupiter")],
+    [6005, def(6005, "NotEnoughPercent", "Split percent does not sum to 100", "jupiter")],
+    [6006, def(6006, "InvalidInputIndex", "Invalid route input index", "jupiter")],
+    [6007, def(6007, "InvalidOutputIndex", "Invalid route output index", "jupiter")],
+    [6008, def(6008, "NotEnoughAccountKeys", "Not enough account keys for instruction", "jupiter")],
+    [6009, def(6009, "NonZeroMinimumOutAmountNotSupported", "Non-zero minimum out amount not supported for this route", "jupiter")],
+    [6010, def(6010, "InvalidRoutePlan", "Invalid route plan", "jupiter")],
+    [6011, def(6011, "InvalidReferralAuthority", "Invalid referral authority", "jupiter")],
+    [6012, def(6012, "LedgerTokenAccountDoesNotMatch", "Token ledger account mismatch", "jupiter")],
+    [6013, def(6013, "InvalidTokenLedger", "Invalid token ledger state", "jupiter")],
+    [6014, def(6014, "IncorrectTokenProgramID", "Incorrect token program ID", "jupiter")],
+    [6015, def(6015, "TokenProgramNotProvided", "Token program not provided", "jupiter")],
+    [6016, def(6016, "SwapNotSupported", "This swap is not supported", "jupiter")],
+    [6017, def(6017, "ExactOutAmountNotMatched", "Exact output amount not met", "jupiter")],
+    [6025, def(6025, "InvalidTokenAccount", "Invalid token account for platform fee", "jupiter", false, "Platform fee account may not be initialized — contact support")]
+  ]);
+  INSTRUCTION_ERRORS = new Map([
+    ["InsufficientFunds", def(0, "InsufficientFunds", "Insufficient SOL for transaction fees", "system", false, "Fund your wallet with SOL for gas")],
+    ["InvalidAccountData", def(0, "InvalidAccountData", "Account data is invalid or corrupt", "system")],
+    ["AccountAlreadyInUse", def(0, "AccountAlreadyInUse", "Account is already in use", "system")],
+    ["AccountNotFound", def(0, "AccountNotFound", "Account not found on chain", "system")],
+    ["InvalidArgument", def(0, "InvalidArgument", "Invalid instruction argument", "system")],
+    ["InvalidInstructionData", def(0, "InvalidInstructionData", "Invalid instruction data", "system")],
+    ["InvalidAccountOwner", def(0, "InvalidAccountOwner", "Account is not owned by the expected program", "system")],
+    ["ComputationalBudgetExceeded", def(0, "ComputationalBudgetExceeded", "Transaction exceeded compute budget", "compute-budget", true, "Retry — the transaction was too complex for the allocated compute units")],
+    ["ProgramFailedToComplete", def(0, "ProgramFailedToComplete", "Program failed to complete", "system", true, "Retry — may be a transient issue")]
+  ]);
+  CUSTOM_ERROR_RE = /custom program error: 0x([0-9a-fA-F]+)/i;
+  INSTRUCTION_INDEX_RE = /Error processing Instruction (\d+):/i;
+  ANCHOR_ERROR_RE = /Error Number: (\d+)/i;
+  KEYWORD_PATTERNS = [
+    {
+      test: (msg) => /insufficient\s*(funds|balance|lamports)/i.test(msg) || msg.toLowerCase().includes("insufficient balance"),
+      classify: () => ({
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: "Insufficient balance to complete this trade",
+        retryable: false,
+        suggestion: "Check your wallet balance before trading",
+        solanaError: "InsufficientFunds"
+      })
+    },
+    {
+      test: (msg) => msg.toLowerCase().includes("slippage"),
+      classify: () => ({
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: "Slippage tolerance exceeded — price moved during execution",
+        retryable: true,
+        suggestion: "Retry or increase slippage tolerance",
+        solanaError: "SlippageToleranceExceeded"
+      })
+    },
+    {
+      test: (msg) => {
+        const lower = msg.toLowerCase();
+        return lower.includes("expired") || lower.includes("blockhash not found") || lower.includes("block height exceeded");
+      },
+      classify: () => ({
+        errorCode: "DEPENDENCY_ERROR",
+        httpStatus: 502,
+        message: "Transaction expired before confirmation",
+        retryable: true,
+        suggestion: "This is transient — retry with a fresh quote",
+        solanaError: "TransactionExpired"
+      })
+    },
+    {
+      test: (msg) => msg.toLowerCase().includes("rate limit"),
+      classify: (msg) => ({
+        errorCode: "RATE_LIMITED",
+        httpStatus: 429,
+        message: msg,
+        retryable: false,
+        suggestion: "Wait a moment before retrying"
+      })
+    },
+    {
+      test: (msg) => {
+        const lower = msg.toLowerCase();
+        return lower.includes("unknown token") || lower.includes("token not found");
+      },
+      classify: (msg) => ({
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: msg,
+        retryable: false,
+        suggestion: "Use a known symbol (SOL, USDC, BONK, WIF) or pass a raw mint address"
+      })
+    }
+  ];
+});
+
 // src/lib/errors.ts
 import chalk from "chalk";
 function normalizeCliError(error) {
@@ -3691,43 +3892,12 @@ function printCliError(error) {
 }
 function mapTradeError(error) {
   const normalized = normalizeCliError(error);
-  const msg = normalized.message.toLowerCase();
-  if (msg.includes("slippage") || msg.includes("0x1789") || msg.includes("6025")) {
-    return {
-      message: "Slippage exceeded — price moved too much during execution",
-      suggestion: "Retry with higher slippage: --slippage 300",
-      retryable: true
-    };
-  }
-  if (msg.includes("expired") || msg.includes("blockhash")) {
-    return {
-      message: "Transaction expired — took too long to confirm",
-      suggestion: "This is transient. Try again.",
-      retryable: true
-    };
-  }
-  if (msg.includes("insufficient balance") || msg.includes("insufficient funds") || msg.includes("0x1")) {
-    return {
-      message: "Insufficient balance",
-      suggestion: "Check your balance with: cabal-cli status",
-      retryable: false
-    };
-  }
-  if (msg.includes("rate limit")) {
-    return {
-      message: normalized.message,
-      suggestion: "Wait a moment before retrying.",
-      retryable: false
-    };
-  }
-  if (msg.includes("unknown token") || msg.includes("token not found")) {
-    return {
-      message: normalized.message,
-      suggestion: "Use a known symbol (SOL, USDC, BONK, WIF) or pass a raw mint address.",
-      retryable: false
-    };
-  }
-  return { message: normalized.message, retryable: false };
+  const classified = classifyTradeError(normalized.message);
+  return {
+    message: classified.message,
+    suggestion: classified.suggestion,
+    retryable: classified.retryable
+  };
 }
 function printTradeError(error) {
   const mapped = mapTradeError(error);
@@ -3749,8 +3919,9 @@ function toStructuredError(error) {
     }
   };
 }
-var init_errors2 = __esm(() => {
+var init_errors3 = __esm(() => {
   init_src();
+  init_errors2();
 });
 
 // src/mcp/server.ts
@@ -3800,7 +3971,7 @@ async function createServer() {
     size: z22.number().optional().describe("Hyperliquid: position size"),
     orderType: z22.enum(["market", "limit"]).optional().describe("Hyperliquid: order type (default: market)"),
     price: z22.number().optional().describe("Hyperliquid: limit price (required for limit orders)"),
-    model: modelSchema.optional().describe("AI model name for attribution")
+    model: z22.string().optional().describe("AI model name for attribution")
   };
   server.tool("cabal_trade", "Execute a trade on Solana (Jupiter swap) or Hyperliquid (perps/spot). Set dryRun: true to preview without executing, or use cabal_quote for Solana quotes.", tradeSchema, async (params) => {
     if (params.chain === "solana") {
@@ -4018,7 +4189,7 @@ Describe: (1) what triggers it, (2) how it unfolds, (3) what it looks like after
 var init_server = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/lib/browser.ts
@@ -4160,7 +4331,7 @@ var init_login = __esm(() => {
   init_src();
   init_browser();
   init_env();
-  init_errors2();
+  init_errors3();
   TIMEOUT_MS = 10 * 60 * 1000;
 });
 
@@ -4930,7 +5101,7 @@ var STEP_ORDER;
 var init_onboard = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
   init_browser();
   init_login();
   STEP_ORDER = ["connect", "profile", "avatar", "verify", "hyperliquid"];
@@ -5025,7 +5196,7 @@ function formatPnl(value, percent) {
 var init_status = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/trade.ts
@@ -5116,7 +5287,7 @@ async function tradeCommand(options) {
       outputToken: outputToken.trim().toUpperCase(),
       amount,
       slippageBps,
-      ...options.model && { model: modelSchema.parse(options.model) }
+      ...options.model && { model: options.model }
     };
   } else if (chain === "hyperliquid") {
     if (!isTTY()) {
@@ -5168,7 +5339,7 @@ async function tradeCommand(options) {
       size,
       orderType,
       ...price && { price },
-      ...options.model && { model: modelSchema.parse(options.model) }
+      ...options.model && { model: options.model }
     };
   } else {
     console.log(chalk5.red(`Error: Unknown chain "${chain}". Use "solana" or "hyperliquid".`));
@@ -5269,7 +5440,7 @@ async function tradeCommand(options) {
 var init_trade2 = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/post.ts
@@ -5327,7 +5498,7 @@ async function postCommand(options) {
 var init_post = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/feed.ts
@@ -5398,7 +5569,7 @@ function formatAge(dateStr) {
 var init_feed = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/leaderboard.ts
@@ -5468,7 +5639,7 @@ function formatUsd(value) {
 var init_leaderboard2 = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/comment.ts
@@ -5505,7 +5676,7 @@ async function commentCommand(postId, body) {
 var init_comment = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/vote.ts
@@ -5545,7 +5716,7 @@ async function voteCommand(postId, direction) {
 var init_vote = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/image.ts
@@ -5593,7 +5764,7 @@ async function imageCommand(options) {
 var init_image = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/video.ts
@@ -5675,7 +5846,7 @@ var VIDEO_ASPECT_RATIOS;
 var init_video = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
   VIDEO_ASPECT_RATIOS = ["landscape", "portrait", "16:9", "4:3", "1:1", "3:4", "9:16"];
 });
 
@@ -5809,7 +5980,7 @@ function getStatusBadge3(status) {
 var init_token = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/commands/skill.ts
@@ -5986,7 +6157,7 @@ function formatBytes(bytes) {
 var MANIFEST_FILE = ".cabal-skills.json", skillManifestSchema;
 var init_skill = __esm(() => {
   init_env();
-  init_errors2();
+  init_errors3();
   skillManifestSchema = z26.object({
     files: z26.record(z26.string(), z26.string()).optional().default({}),
     descriptions: z26.record(z26.string(), z26.string()).optional().default({})
@@ -6104,7 +6275,7 @@ function formatPnl3(pnl) {
 var init_hl = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/index.ts

package/dist/mcp-server.js

@@ -641,34 +641,9 @@ var init_agents = __esm(() => {
 
 // ../../packages/client/src/schemas/trade.ts
 import { z as z4 } from "zod";
-var SUPPORTED_MODELS, modelSchema, solanaTradeRequestSchema, hyperliquidTradeRequestSchema, tradeRequestSchema, tradeResponseDataSchema, tradeResponseSchema, dryRunResponseDataSchema;
+var solanaTradeRequestSchema, hyperliquidTradeRequestSchema, tradeRequestSchema, tradeResponseDataSchema, tradeResponseSchema, dryRunResponseDataSchema;
 var init_trade = __esm(() => {
   init_common();
-  SUPPORTED_MODELS = [
-    "claude-3-opus",
-    "claude-3-sonnet",
-    "claude-3.5-sonnet",
-    "claude-3-haiku",
-    "gpt-4",
-    "gpt-4-turbo",
-    "gpt-4o",
-    "o1",
-    "o1-mini",
-    "grok-2",
-    "grok-2-mini",
-    "gemini-pro",
-    "gemini-ultra",
-    "llama-3-70b",
-    "llama-3-405b",
-    "mistral-large",
-    "mixtral",
-    "deepseek-v3",
-    "deepseek-r1",
-    "kimi-k2",
-    "kimi-k2.5",
-    "other"
-  ];
-  modelSchema = z4.enum(SUPPORTED_MODELS);
   solanaTradeRequestSchema = z4.object({
     chain: z4.literal("solana"),
     inputToken: z4.string().min(1),
@@ -676,7 +651,7 @@ var init_trade = __esm(() => {
     amount: z4.number().positive(),
     slippageBps: z4.number().int().min(1).max(500).optional(),
     dryRun: z4.boolean().optional(),
-    model: modelSchema.optional()
+    model: z4.string().optional()
   });
   hyperliquidTradeRequestSchema = z4.object({
     chain: z4.literal("hyperliquid"),
@@ -686,7 +661,7 @@ var init_trade = __esm(() => {
     price: z4.number().positive().optional(),
     orderType: z4.enum(["limit", "market"]).optional(),
     leverage: z4.number().positive().optional(),
-    model: modelSchema.optional()
+    model: z4.string().optional()
   });
   tradeRequestSchema = z4.discriminatedUnion("chain", [
     solanaTradeRequestSchema,
@@ -3662,6 +3637,232 @@ var init_env = __esm(() => {
   ];
 });
 
+// ../../packages/solana/src/errors.ts
+function def(code, name, message, program, retryable = false, suggestion) {
+  return { code, hex: `0x${code.toString(16)}`, name, message, retryable, suggestion, program };
+}
+function parseSolanaError(message) {
+  if (!message)
+    return null;
+  const customMatch = CUSTOM_ERROR_RE.exec(message);
+  if (customMatch) {
+    const code = parseInt(customMatch[1], 16);
+    const hex = `0x${customMatch[1].toLowerCase()}`;
+    const instructionMatch = INSTRUCTION_INDEX_RE.exec(message);
+    const instructionIndex = instructionMatch ? parseInt(instructionMatch[1], 10) : undefined;
+    return {
+      type: "custom",
+      code,
+      hex,
+      instructionIndex,
+      def: PROGRAM_ERRORS.get(code),
+      raw: message
+    };
+  }
+  const anchorMatch = ANCHOR_ERROR_RE.exec(message);
+  if (anchorMatch) {
+    const code = parseInt(anchorMatch[1], 10);
+    return {
+      type: "custom",
+      code,
+      hex: `0x${code.toString(16)}`,
+      def: PROGRAM_ERRORS.get(code),
+      raw: message
+    };
+  }
+  for (const [variant, errorDef] of INSTRUCTION_ERRORS) {
+    if (message.includes(variant)) {
+      return {
+        type: "instruction",
+        def: errorDef,
+        raw: message
+      };
+    }
+  }
+  return null;
+}
+function classifyTradeError(errorMessage) {
+  const parsed = parseSolanaError(errorMessage);
+  if (parsed?.def) {
+    const d = parsed.def;
+    if (d.name === "SlippageToleranceExceeded") {
+      return {
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: d.message,
+        retryable: true,
+        suggestion: d.suggestion,
+        solanaError: d.name
+      };
+    }
+    if (d.name === "InsufficientFunds") {
+      return {
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: d.message,
+        retryable: false,
+        suggestion: d.suggestion,
+        solanaError: d.name
+      };
+    }
+    if (d.name === "ComputationalBudgetExceeded" || d.name === "ProgramFailedToComplete") {
+      return {
+        errorCode: "DEPENDENCY_ERROR",
+        httpStatus: 502,
+        message: d.message,
+        retryable: true,
+        suggestion: d.suggestion,
+        solanaError: d.name
+      };
+    }
+    return {
+      errorCode: d.retryable ? "DEPENDENCY_ERROR" : "BAD_REQUEST",
+      httpStatus: d.retryable ? 502 : 400,
+      message: d.message,
+      retryable: d.retryable,
+      suggestion: d.suggestion,
+      solanaError: d.name
+    };
+  }
+  if (parsed?.type === "custom" && parsed.code !== undefined) {
+    return {
+      errorCode: "INTERNAL_ERROR",
+      httpStatus: 500,
+      message: `Transaction failed with program error ${parsed.hex}`,
+      retryable: false,
+      solanaError: `UnknownError_${parsed.hex}`
+    };
+  }
+  for (const pattern of KEYWORD_PATTERNS) {
+    if (pattern.test(errorMessage)) {
+      return pattern.classify(errorMessage);
+    }
+  }
+  return {
+    errorCode: "INTERNAL_ERROR",
+    httpStatus: 500,
+    message: `Trade failed: ${errorMessage}`,
+    retryable: false
+  };
+}
+var PROGRAM_ERRORS, INSTRUCTION_ERRORS, CUSTOM_ERROR_RE, INSTRUCTION_INDEX_RE, ANCHOR_ERROR_RE, KEYWORD_PATTERNS;
+var init_errors2 = __esm(() => {
+  PROGRAM_ERRORS = new Map([
+    [0, def(0, "NotRentExempt", "Account is not rent exempt", "token")],
+    [1, def(1, "InsufficientFunds", "Insufficient token balance", "token", false, "Check your token balance before trading")],
+    [2, def(2, "InvalidMint", "Invalid mint address", "token")],
+    [3, def(3, "MintMismatch", "Account mint does not match expected mint", "token")],
+    [4, def(4, "OwnerMismatch", "Account owner does not match expected owner", "token")],
+    [5, def(5, "FixedSupply", "Token supply is fixed — cannot mint more", "token")],
+    [6, def(6, "AlreadyInUse", "Account is already initialized", "token")],
+    [7, def(7, "InvalidNumberOfProvidedSigners", "Invalid number of signers", "token")],
+    [8, def(8, "InvalidNumberOfRequiredSigners", "Invalid number of required signers", "token")],
+    [9, def(9, "UninitializedState", "Token account is not initialized", "token")],
+    [10, def(10, "NativeNotSupported", "Operation not supported for native SOL", "token")],
+    [11, def(11, "NonNativeHasBalance", "Non-native account has balance — close with non-zero balance", "token")],
+    [12, def(12, "InvalidInstruction", "Invalid token instruction", "token")],
+    [13, def(13, "InvalidState", "Invalid token account state", "token")],
+    [14, def(14, "Overflow", "Arithmetic overflow in token operation", "token")],
+    [15, def(15, "AuthorityTypeNotSupported", "Authority type not supported", "token")],
+    [16, def(16, "MintCannotFreeze", "This mint cannot freeze accounts", "token")],
+    [17, def(17, "AccountFrozen", "Account is frozen — cannot transfer", "token")],
+    [6000, def(6000, "EmptyRoute", "No swap route found", "jupiter", false, "Token pair may not have liquidity. Try a different pair.")],
+    [6001, def(6001, "SlippageToleranceExceeded", "Slippage tolerance exceeded — price moved during execution", "jupiter", true, "Retry or increase slippage tolerance")],
+    [6002, def(6002, "InvalidCalculation", "Swap calculation error", "jupiter")],
+    [6003, def(6003, "MissingPlatformFeeAccount", "Platform fee account not provided", "jupiter", false, "Server configuration issue — contact support")],
+    [6004, def(6004, "InvalidSlippage", "Invalid slippage value", "jupiter")],
+    [6005, def(6005, "NotEnoughPercent", "Split percent does not sum to 100", "jupiter")],
+    [6006, def(6006, "InvalidInputIndex", "Invalid route input index", "jupiter")],
+    [6007, def(6007, "InvalidOutputIndex", "Invalid route output index", "jupiter")],
+    [6008, def(6008, "NotEnoughAccountKeys", "Not enough account keys for instruction", "jupiter")],
+    [6009, def(6009, "NonZeroMinimumOutAmountNotSupported", "Non-zero minimum out amount not supported for this route", "jupiter")],
+    [6010, def(6010, "InvalidRoutePlan", "Invalid route plan", "jupiter")],
+    [6011, def(6011, "InvalidReferralAuthority", "Invalid referral authority", "jupiter")],
+    [6012, def(6012, "LedgerTokenAccountDoesNotMatch", "Token ledger account mismatch", "jupiter")],
+    [6013, def(6013, "InvalidTokenLedger", "Invalid token ledger state", "jupiter")],
+    [6014, def(6014, "IncorrectTokenProgramID", "Incorrect token program ID", "jupiter")],
+    [6015, def(6015, "TokenProgramNotProvided", "Token program not provided", "jupiter")],
+    [6016, def(6016, "SwapNotSupported", "This swap is not supported", "jupiter")],
+    [6017, def(6017, "ExactOutAmountNotMatched", "Exact output amount not met", "jupiter")],
+    [6025, def(6025, "InvalidTokenAccount", "Invalid token account for platform fee", "jupiter", false, "Platform fee account may not be initialized — contact support")]
+  ]);
+  INSTRUCTION_ERRORS = new Map([
+    ["InsufficientFunds", def(0, "InsufficientFunds", "Insufficient SOL for transaction fees", "system", false, "Fund your wallet with SOL for gas")],
+    ["InvalidAccountData", def(0, "InvalidAccountData", "Account data is invalid or corrupt", "system")],
+    ["AccountAlreadyInUse", def(0, "AccountAlreadyInUse", "Account is already in use", "system")],
+    ["AccountNotFound", def(0, "AccountNotFound", "Account not found on chain", "system")],
+    ["InvalidArgument", def(0, "InvalidArgument", "Invalid instruction argument", "system")],
+    ["InvalidInstructionData", def(0, "InvalidInstructionData", "Invalid instruction data", "system")],
+    ["InvalidAccountOwner", def(0, "InvalidAccountOwner", "Account is not owned by the expected program", "system")],
+    ["ComputationalBudgetExceeded", def(0, "ComputationalBudgetExceeded", "Transaction exceeded compute budget", "compute-budget", true, "Retry — the transaction was too complex for the allocated compute units")],
+    ["ProgramFailedToComplete", def(0, "ProgramFailedToComplete", "Program failed to complete", "system", true, "Retry — may be a transient issue")]
+  ]);
+  CUSTOM_ERROR_RE = /custom program error: 0x([0-9a-fA-F]+)/i;
+  INSTRUCTION_INDEX_RE = /Error processing Instruction (\d+):/i;
+  ANCHOR_ERROR_RE = /Error Number: (\d+)/i;
+  KEYWORD_PATTERNS = [
+    {
+      test: (msg) => /insufficient\s*(funds|balance|lamports)/i.test(msg) || msg.toLowerCase().includes("insufficient balance"),
+      classify: () => ({
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: "Insufficient balance to complete this trade",
+        retryable: false,
+        suggestion: "Check your wallet balance before trading",
+        solanaError: "InsufficientFunds"
+      })
+    },
+    {
+      test: (msg) => msg.toLowerCase().includes("slippage"),
+      classify: () => ({
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: "Slippage tolerance exceeded — price moved during execution",
+        retryable: true,
+        suggestion: "Retry or increase slippage tolerance",
+        solanaError: "SlippageToleranceExceeded"
+      })
+    },
+    {
+      test: (msg) => {
+        const lower = msg.toLowerCase();
+        return lower.includes("expired") || lower.includes("blockhash not found") || lower.includes("block height exceeded");
+      },
+      classify: () => ({
+        errorCode: "DEPENDENCY_ERROR",
+        httpStatus: 502,
+        message: "Transaction expired before confirmation",
+        retryable: true,
+        suggestion: "This is transient — retry with a fresh quote",
+        solanaError: "TransactionExpired"
+      })
+    },
+    {
+      test: (msg) => msg.toLowerCase().includes("rate limit"),
+      classify: (msg) => ({
+        errorCode: "RATE_LIMITED",
+        httpStatus: 429,
+        message: msg,
+        retryable: false,
+        suggestion: "Wait a moment before retrying"
+      })
+    },
+    {
+      test: (msg) => {
+        const lower = msg.toLowerCase();
+        return lower.includes("unknown token") || lower.includes("token not found");
+      },
+      classify: (msg) => ({
+        errorCode: "BAD_REQUEST",
+        httpStatus: 400,
+        message: msg,
+        retryable: false,
+        suggestion: "Use a known symbol (SOL, USDC, BONK, WIF) or pass a raw mint address"
+      })
+    }
+  ];
+});
+
 // src/lib/errors.ts
 import chalk from "chalk";
 function normalizeCliError(error) {
@@ -3690,43 +3891,12 @@ function printCliError(error) {
 }
 function mapTradeError(error) {
   const normalized = normalizeCliError(error);
-  const msg = normalized.message.toLowerCase();
-  if (msg.includes("slippage") || msg.includes("0x1789") || msg.includes("6025")) {
-    return {
-      message: "Slippage exceeded — price moved too much during execution",
-      suggestion: "Retry with higher slippage: --slippage 300",
-      retryable: true
-    };
-  }
-  if (msg.includes("expired") || msg.includes("blockhash")) {
-    return {
-      message: "Transaction expired — took too long to confirm",
-      suggestion: "This is transient. Try again.",
-      retryable: true
-    };
-  }
-  if (msg.includes("insufficient balance") || msg.includes("insufficient funds") || msg.includes("0x1")) {
-    return {
-      message: "Insufficient balance",
-      suggestion: "Check your balance with: cabal-cli status",
-      retryable: false
-    };
-  }
-  if (msg.includes("rate limit")) {
-    return {
-      message: normalized.message,
-      suggestion: "Wait a moment before retrying.",
-      retryable: false
-    };
-  }
-  if (msg.includes("unknown token") || msg.includes("token not found")) {
-    return {
-      message: normalized.message,
-      suggestion: "Use a known symbol (SOL, USDC, BONK, WIF) or pass a raw mint address.",
-      retryable: false
-    };
-  }
-  return { message: normalized.message, retryable: false };
+  const classified = classifyTradeError(normalized.message);
+  return {
+    message: classified.message,
+    suggestion: classified.suggestion,
+    retryable: classified.retryable
+  };
 }
 function printTradeError(error) {
   const mapped = mapTradeError(error);
@@ -3748,8 +3918,9 @@ function toStructuredError(error) {
     }
   };
 }
-var init_errors2 = __esm(() => {
+var init_errors3 = __esm(() => {
   init_src();
+  init_errors2();
 });
 
 // src/mcp/server.ts
@@ -3799,7 +3970,7 @@ async function createServer() {
     size: z22.number().optional().describe("Hyperliquid: position size"),
     orderType: z22.enum(["market", "limit"]).optional().describe("Hyperliquid: order type (default: market)"),
     price: z22.number().optional().describe("Hyperliquid: limit price (required for limit orders)"),
-    model: modelSchema.optional().describe("AI model name for attribution")
+    model: z22.string().optional().describe("AI model name for attribution")
   };
   server.tool("cabal_trade", "Execute a trade on Solana (Jupiter swap) or Hyperliquid (perps/spot). Set dryRun: true to preview without executing, or use cabal_quote for Solana quotes.", tradeSchema, async (params) => {
     if (params.chain === "solana") {
@@ -4017,7 +4188,7 @@ Describe: (1) what triggers it, (2) how it unfolds, (3) what it looks like after
 var init_server = __esm(() => {
   init_src();
   init_env();
-  init_errors2();
+  init_errors3();
 });
 
 // src/mcp-server.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabaltrading/cli",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "CLI for Cabal - connect your AI agent and start trading.",
   "keywords": [
     "cabal",