fixparser-plugin-mcp 9.1.7-b2f9f891 → 9.1.7-b386e09a

package/build/esm/MCPLocal.mjs

@@ -1,187 +1,786 @@
 // src/MCPLocal.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { Field, Fields, Messages } from "fixparser";
+import { Fields as Fields3, MDEntryType as MDEntryType2, Messages as Messages3 } from "fixparser";
 import { z } from "zod";
-var MCPLocal = class {
-  parser;
-  server = new Server(
-    {
-      name: "fixparser",
-      version: "1.0.0"
-    },
-    {
-      capabilities: {
-        tools: {
-          parse: {
-            description: "Parses a FIX message and describes it in plain language",
-            parameters: {
-              type: "object",
-              properties: {
-                fixString: { type: "string" }
-              },
-              required: ["fixString"]
-            }
+
+// src/schemas/schemas.ts
+var toolSchemas = {
+  parse: {
+    description: "Parses a FIX message and describes it in plain language",
+    schema: {
+      type: "object",
+      properties: {
+        fixString: { type: "string" }
+      },
+      required: ["fixString"]
+    }
+  },
+  parseToJSON: {
+    description: "Parses a FIX message into JSON",
+    schema: {
+      type: "object",
+      properties: {
+        fixString: { type: "string" }
+      },
+      required: ["fixString"]
+    }
+  },
+  verifyOrder: {
+    description: "Verifies order parameters before execution. verifyOrder must be called before executeOrder.",
+    schema: {
+      type: "object",
+      properties: {
+        clOrdID: { type: "string" },
+        handlInst: {
+          type: "string",
+          enum: ["1", "2", "3"],
+          description: "Handling Instructions: 1=Automated Execution No Intervention, 2=Automated Execution Intervention OK, 3=Manual Order"
+        },
+        quantity: { type: "string" },
+        price: { type: "string" },
+        ordType: {
+          type: "string",
+          enum: [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "F",
+            "G",
+            "H",
+            "I",
+            "J",
+            "K",
+            "L",
+            "M",
+            "P",
+            "Q",
+            "R",
+            "S"
+          ],
+          description: "Order Type: 1=Market, 2=Limit, 3=Stop, 4=StopLimit, 5=MarketOnClose, 6=WithOrWithout, 7=LimitOrBetter, 8=LimitWithOrWithout, 9=OnBasis, A=OnClose, B=LimitOnClose, C=ForexMarket, D=PreviouslyQuoted, E=PreviouslyIndicated, F=ForexLimit, G=ForexSwap, H=ForexPreviouslyQuoted, I=Funari, J=MarketIfTouched, K=MarketWithLeftOverAsLimit, L=PreviousFundValuationPoint, M=NextFundValuationPoint, P=Pegged, Q=CounterOrderSelection, R=StopOnBidOrOffer, S=StopLimitOnBidOrOffer"
+        },
+        side: {
+          type: "string",
+          enum: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H"],
+          description: "Side: 1=Buy, 2=Sell, 3=BuyMinus, 4=SellPlus, 5=SellShort, 6=SellShortExempt, 7=Undisclosed, 8=Cross, 9=CrossShort, A=CrossShortExempt, B=AsDefined, C=Opposite, D=Subscribe, E=Redeem, F=Lend, G=Borrow, H=SellUndisclosed"
+        },
+        symbol: { type: "string" },
+        timeInForce: {
+          type: "string",
+          enum: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C"],
+          description: "Time In Force: 0=Day, 1=GoodTillCancel, 2=AtTheOpening, 3=ImmediateOrCancel, 4=FillOrKill, 5=GoodTillCrossing, 6=GoodTillDate, 7=AtTheClose, 8=GoodThroughCrossing, 9=AtCrossing, A=GoodForTime, B=GoodForAuction, C=GoodForMonth"
+        }
+      },
+      required: ["clOrdID", "handlInst", "quantity", "price", "ordType", "side", "symbol", "timeInForce"]
+    }
+  },
+  executeOrder: {
+    description: "Executes a verified order. verifyOrder must be called before executeOrder. user has to explicitly allow executeOrder.",
+    schema: {
+      type: "object",
+      properties: {
+        clOrdID: { type: "string" },
+        handlInst: {
+          type: "string",
+          enum: ["1", "2", "3"],
+          description: "Handling Instructions: 1=Automated Execution No Intervention, 2=Automated Execution Intervention OK, 3=Manual Order"
+        },
+        quantity: { type: "string" },
+        price: { type: "string" },
+        ordType: {
+          type: "string",
+          enum: [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "A",
+            "B",
+            "C",
+            "D",
+            "E",
+            "F",
+            "G",
+            "H",
+            "I",
+            "J",
+            "K",
+            "L",
+            "M",
+            "P",
+            "Q",
+            "R",
+            "S"
+          ],
+          description: "Order Type: 1=Market, 2=Limit, 3=Stop, 4=StopLimit, 5=MarketOnClose, 6=WithOrWithout, 7=LimitOrBetter, 8=LimitWithOrWithout, 9=OnBasis, A=OnClose, B=LimitOnClose, C=ForexMarket, D=PreviouslyQuoted, E=PreviouslyIndicated, F=ForexLimit, G=ForexSwap, H=ForexPreviouslyQuoted, I=Funari, J=MarketIfTouched, K=MarketWithLeftOverAsLimit, L=PreviousFundValuationPoint, M=NextFundValuationPoint, P=Pegged, Q=CounterOrderSelection, R=StopOnBidOrOffer, S=StopLimitOnBidOrOffer"
+        },
+        side: {
+          type: "string",
+          enum: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H"],
+          description: "Side: 1=Buy, 2=Sell, 3=BuyMinus, 4=SellPlus, 5=SellShort, 6=SellShortExempt, 7=Undisclosed, 8=Cross, 9=CrossShort, A=CrossShortExempt, B=AsDefined, C=Opposite, D=Subscribe, E=Redeem, F=Lend, G=Borrow, H=SellUndisclosed"
+        },
+        symbol: { type: "string" },
+        timeInForce: {
+          type: "string",
+          enum: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C"],
+          description: "Time In Force: 0=Day, 1=GoodTillCancel, 2=AtTheOpening, 3=ImmediateOrCancel, 4=FillOrKill, 5=GoodTillCrossing, 6=GoodTillDate, 7=AtTheClose, 8=GoodThroughCrossing, 9=AtCrossing, A=GoodForTime, B=GoodForAuction, C=GoodForMonth"
+        }
+      },
+      required: ["clOrdID", "handlInst", "quantity", "price", "ordType", "side", "symbol", "timeInForce"]
+    }
+  },
+  marketDataRequest: {
+    description: "Requests market data for specified symbols",
+    schema: {
+      type: "object",
+      properties: {
+        mdUpdateType: {
+          type: "string",
+          enum: ["0", "1"],
+          description: "Market Data Update Type: 0=Full Refresh, 1=Incremental Refresh"
+        },
+        symbols: { type: "array", items: { type: "string" } },
+        mdReqID: { type: "string" },
+        subscriptionRequestType: {
+          type: "string",
+          enum: ["0", "1", "2"],
+          description: "Subscription Request Type: 0=Snapshot, 1=Snapshot + Updates, 2=Disable Previous Snapshot + Update Request"
+        },
+        mdEntryTypes: {
+          type: "array",
+          items: {
+            type: "string",
+            enum: [
+              "0",
+              "1",
+              "2",
+              "3",
+              "4",
+              "5",
+              "6",
+              "7",
+              "8",
+              "9",
+              "A",
+              "B",
+              "C",
+              "D",
+              "E",
+              "F",
+              "G",
+              "H",
+              "I",
+              "J",
+              "K",
+              "L",
+              "M",
+              "N",
+              "O",
+              "P",
+              "Q",
+              "R",
+              "S",
+              "T",
+              "U",
+              "V",
+              "W",
+              "X",
+              "Y",
+              "Z"
+            ]
           },
-          parseToJSON: {
-            description: "Parses a FIX message into JSON",
-            parameters: {
-              type: "object",
-              properties: {
-                fixString: { type: "string" }
-              },
-              required: ["fixString"]
+          description: "Market Data Entry Types: 0=Bid, 1=Offer, 2=Trade, 3=Index Value, 4=Opening Price, 5=Closing Price, 6=Settlement Price, 7=High Price, 8=Low Price, 9=Trade Volume, A=Open Interest, B=Simulated Sell Price, C=Simulated Buy Price, D=Empty Book, E=Session High Bid, F=Session Low Offer, G=Fixing Price, H=Electronic Volume, I=Threshold Limits and Price Band Variation, J=Clearing Price, K=Open Interest Change, L=Last Trade Price, M=Last Trade Volume, N=Last Trade Time, O=Last Trade Tick, P=Last Trade Exchange, Q=Last Trade ID, R=Last Trade Side, S=Last Trade Price Change, T=Last Trade Price Change Percent, U=Last Trade Price Change Basis Points, V=Last Trade Price Change Points, W=Last Trade Price Change Ticks, X=Last Trade Price Change Ticks Percent, Y=Last Trade Price Change Ticks Basis Points, Z=Last Trade Price Change Ticks Points"
+        }
+      },
+      required: ["mdUpdateType", "symbols", "mdReqID", "subscriptionRequestType"]
+    }
+  },
+  getStockGraph: {
+    description: "Generates a price chart for a given symbol",
+    schema: {
+      type: "object",
+      properties: {
+        symbol: { type: "string" }
+      },
+      required: ["symbol"]
+    }
+  },
+  getStockPriceHistory: {
+    description: "Returns price history for a given symbol",
+    schema: {
+      type: "object",
+      properties: {
+        symbol: { type: "string" }
+      },
+      required: ["symbol"]
+    }
+  }
+};
+
+// src/tools/marketData.ts
+import { Field, Fields, MDEntryType, Messages } from "fixparser";
+import QuickChart from "quickchart-js";
+var createMarketDataRequestHandler = (parser, pendingRequests) => {
+  return async (args) => {
+    try {
+      const response = new Promise((resolve) => {
+        pendingRequests.set(args.mdReqID, resolve);
+      });
+      const entryTypes = args.mdEntryTypes || [MDEntryType.Bid, MDEntryType.Offer, MDEntryType.TradeVolume];
+      const messageFields = [
+        new Field(Fields.MsgType, Messages.MarketDataRequest),
+        new Field(Fields.SenderCompID, parser.sender),
+        new Field(Fields.MsgSeqNum, parser.getNextTargetMsgSeqNum()),
+        new Field(Fields.TargetCompID, parser.target),
+        new Field(Fields.SendingTime, parser.getTimestamp()),
+        new Field(Fields.MDReqID, args.mdReqID),
+        new Field(Fields.SubscriptionRequestType, args.subscriptionRequestType),
+        new Field(Fields.MarketDepth, 0),
+        new Field(Fields.MDUpdateType, args.mdUpdateType)
+      ];
+      messageFields.push(new Field(Fields.NoRelatedSym, args.symbols.length));
+      args.symbols.forEach((symbol) => {
+        messageFields.push(new Field(Fields.Symbol, symbol));
+      });
+      messageFields.push(new Field(Fields.NoMDEntryTypes, entryTypes.length));
+      entryTypes.forEach((entryType) => {
+        messageFields.push(new Field(Fields.MDEntryType, entryType));
+      });
+      const mdr = parser.createMessage(...messageFields);
+      if (!parser.connected) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: "Error: Not connected. Ignoring message.",
+              uri: "marketDataRequest"
             }
-          },
-          verifyOrder: {
-            description: "Verifies order parameters before execution",
-            parameters: {
-              type: "object",
-              properties: {
-                clOrdID: { type: "string" },
-                handlInst: { type: "string", enum: ["1", "2", "3"] },
-                quantity: { type: "string" },
-                price: { type: "string" },
-                ordType: {
-                  type: "string",
-                  enum: [
-                    "1",
-                    "2",
-                    "3",
-                    "4",
-                    "5",
-                    "6",
-                    "7",
-                    "8",
-                    "9",
-                    "A",
-                    "B",
-                    "C",
-                    "D",
-                    "E",
-                    "F",
-                    "G",
-                    "H",
-                    "I",
-                    "J",
-                    "K",
-                    "L",
-                    "M",
-                    "P",
-                    "Q",
-                    "R",
-                    "S"
-                  ]
-                },
-                side: {
-                  type: "string",
-                  enum: [
-                    "1",
-                    "2",
-                    "3",
-                    "4",
-                    "5",
-                    "6",
-                    "7",
-                    "8",
-                    "9",
-                    "A",
-                    "B",
-                    "C",
-                    "D",
-                    "E",
-                    "F",
-                    "G",
-                    "H"
-                  ]
-                },
-                symbol: { type: "string" },
-                timeInForce: {
-                  type: "string",
-                  enum: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C"]
-                }
-              },
-              required: [
-                "clOrdID",
-                "handlInst",
-                "quantity",
-                "price",
-                "ordType",
-                "side",
-                "symbol",
-                "timeInForce"
-              ]
+          ],
+          isError: true
+        };
+      }
+      parser.send(mdr);
+      const fixData = await response;
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Market data for ${args.symbols.join(", ")}: ${JSON.stringify(fixData.toFIXJSON())}`,
+            uri: "marketDataRequest"
+          }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to request market data"}`,
+            uri: "marketDataRequest"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+var createGetStockGraphHandler = (marketDataPrices) => {
+  return async (args) => {
+    try {
+      const symbol = args.symbol;
+      const priceHistory = marketDataPrices.get(symbol) || [];
+      if (priceHistory.length === 0) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `No price data available for ${symbol}`,
+              uri: "getStockGraph"
             }
-          },
-          executeOrder: {
-            description: "Executes a verified order",
-            parameters: {
-              type: "object",
-              properties: {
-                clOrdID: { type: "string" },
-                handlInst: { type: "string", enum: ["1", "2", "3"] },
-                quantity: { type: "string" },
-                price: { type: "string" },
-                ordType: { type: "string" },
-                side: { type: "string" },
-                symbol: { type: "string" },
-                timeInForce: { type: "string" }
-              },
-              required: [
-                "clOrdID",
-                "handlInst",
-                "quantity",
-                "price",
-                "ordType",
-                "side",
-                "symbol",
-                "timeInForce"
-              ]
+          ]
+        };
+      }
+      const chart = new QuickChart();
+      chart.setWidth(300);
+      chart.setHeight(150);
+      chart.setBackgroundColor("transparent");
+      const labels = priceHistory.map((point) => new Date(point.timestamp).toLocaleTimeString());
+      const bidData = priceHistory.map((point) => point.bid);
+      const offerData = priceHistory.map((point) => point.offer);
+      const spreadData = priceHistory.map((point) => point.spread);
+      const volumeData = priceHistory.map((point) => point.volume);
+      const config = {
+        type: "line",
+        data: {
+          labels,
+          datasets: [
+            {
+              label: "Bid",
+              data: bidData,
+              borderColor: "#28a745",
+              backgroundColor: "rgba(40, 167, 69, 0.1)",
+              fill: false,
+              tension: 0.4
+            },
+            {
+              label: "Offer",
+              data: offerData,
+              borderColor: "#dc3545",
+              backgroundColor: "rgba(220, 53, 69, 0.1)",
+              fill: false,
+              tension: 0.4
+            },
+            {
+              label: "Spread",
+              data: spreadData,
+              borderColor: "#6c757d",
+              backgroundColor: "rgba(108, 117, 125, 0.1)",
+              fill: false,
+              tension: 0.4
+            },
+            {
+              label: "Volume",
+              data: volumeData,
+              borderColor: "#007bff",
+              backgroundColor: "rgba(0, 123, 255, 0.1)",
+              fill: true,
+              tension: 0.4
+            }
+          ]
+        },
+        options: {
+          responsive: true,
+          plugins: {
+            title: {
+              display: true,
+              text: `${symbol} Market Data`
             }
           },
-          marketDataRequest: {
-            description: "Requests market data for specified symbols",
-            parameters: {
-              type: "object",
-              properties: {
-                mdUpdateType: { type: "string", enum: ["0", "1"] },
-                symbols: { type: "array", items: { type: "string" } },
-                mdReqID: { type: "string" },
-                subscriptionRequestType: { type: "string", enum: ["0", "1", "2"] },
-                mdEntryTypes: { type: "array", items: { type: "string" } }
-              },
-              required: ["mdUpdateType", "symbols", "mdReqID", "subscriptionRequestType", "mdEntryTypes"]
+          scales: {
+            y: {
+              beginAtZero: false
             }
           }
-        },
-        resources: {
-          greeting: {
-            description: "A simple greeting resource",
-            uri: "greeting-resource"
-          },
-          stockGraph: {
-            description: "Generates a price chart for a given symbol",
-            uri: "stockGraph",
-            parameters: {
-              type: "object",
-              properties: {
-                symbol: { type: "string" }
-              },
-              required: ["symbol"]
+        }
+      };
+      chart.setConfig(config);
+      const imageBuffer = await chart.toBinary();
+      const base64Image = imageBuffer.toString("base64");
+      return {
+        content: [
+          {
+            type: "image",
+            data: `image/png;base64, ${base64Image}`,
+            mimeType: "image/png",
+            metadata: {
+              width: 300,
+              height: 150
             }
-          },
-          stockPriceHistory: {
-            description: "Returns price history for a given symbol",
-            uri: "stockPriceHistory",
-            parameters: {
-              type: "object",
-              properties: {
-                symbol: { type: "string" }
+          }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to generate chart"}`,
+            uri: "getStockGraph"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+var createGetStockPriceHistoryHandler = (marketDataPrices) => {
+  return async (args) => {
+    try {
+      const symbol = args.symbol;
+      const priceHistory = marketDataPrices.get(symbol) || [];
+      if (priceHistory.length === 0) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `No price data available for ${symbol}`,
+              uri: "getStockPriceHistory"
+            }
+          ]
+        };
+      }
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify(
+              {
+                symbol,
+                count: priceHistory.length,
+                data: priceHistory.map((point) => ({
+                  timestamp: new Date(point.timestamp).toISOString(),
+                  bid: point.bid,
+                  offer: point.offer,
+                  spread: point.spread,
+                  volume: point.volume
+                }))
               },
-              required: ["symbol"]
+              null,
+              2
+            ),
+            uri: "getStockPriceHistory"
+          }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to get stock price history"}`,
+            uri: "getStockPriceHistory"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+
+// src/tools/order.ts
+import { Field as Field2, Fields as Fields2, Messages as Messages2 } from "fixparser";
+var ordTypeNames = {
+  "1": "Market",
+  "2": "Limit",
+  "3": "Stop",
+  "4": "StopLimit",
+  "5": "MarketOnClose",
+  "6": "WithOrWithout",
+  "7": "LimitOrBetter",
+  "8": "LimitWithOrWithout",
+  "9": "OnBasis",
+  A: "OnClose",
+  B: "LimitOnClose",
+  C: "ForexMarket",
+  D: "PreviouslyQuoted",
+  E: "PreviouslyIndicated",
+  F: "ForexLimit",
+  G: "ForexSwap",
+  H: "ForexPreviouslyQuoted",
+  I: "Funari",
+  J: "MarketIfTouched",
+  K: "MarketWithLeftOverAsLimit",
+  L: "PreviousFundValuationPoint",
+  M: "NextFundValuationPoint",
+  P: "Pegged",
+  Q: "CounterOrderSelection",
+  R: "StopOnBidOrOffer",
+  S: "StopLimitOnBidOrOffer"
+};
+var sideNames = {
+  "1": "Buy",
+  "2": "Sell",
+  "3": "BuyMinus",
+  "4": "SellPlus",
+  "5": "SellShort",
+  "6": "SellShortExempt",
+  "7": "Undisclosed",
+  "8": "Cross",
+  "9": "CrossShort",
+  A: "CrossShortExempt",
+  B: "AsDefined",
+  C: "Opposite",
+  D: "Subscribe",
+  E: "Redeem",
+  F: "Lend",
+  G: "Borrow",
+  H: "SellUndisclosed"
+};
+var timeInForceNames = {
+  "0": "Day",
+  "1": "GoodTillCancel",
+  "2": "AtTheOpening",
+  "3": "ImmediateOrCancel",
+  "4": "FillOrKill",
+  "5": "GoodTillCrossing",
+  "6": "GoodTillDate",
+  "7": "AtTheClose",
+  "8": "GoodThroughCrossing",
+  "9": "AtCrossing",
+  A: "GoodForTime",
+  B: "GoodForAuction",
+  C: "GoodForMonth"
+};
+var handlInstNames = {
+  "1": "AutomatedExecutionNoIntervention",
+  "2": "AutomatedExecutionInterventionOK",
+  "3": "ManualOrder"
+};
+var createVerifyOrderHandler = (parser, verifiedOrders) => {
+  return async (args) => {
+    try {
+      verifiedOrders.set(args.clOrdID, {
+        clOrdID: args.clOrdID,
+        handlInst: args.handlInst,
+        quantity: Number.parseFloat(String(args.quantity)),
+        price: Number.parseFloat(String(args.price)),
+        ordType: args.ordType,
+        side: args.side,
+        symbol: args.symbol,
+        timeInForce: args.timeInForce
+      });
+      return {
+        content: [
+          {
+            type: "text",
+            text: `VERIFICATION: All parameters valid. Ready to proceed with order execution.
+                            
+Parameters verified:
+- ClOrdID: ${args.clOrdID}
+- HandlInst: ${args.handlInst} (${handlInstNames[args.handlInst]})
+- Quantity: ${args.quantity}
+- Price: ${args.price}
+- OrdType: ${args.ordType} (${ordTypeNames[args.ordType]})
+- Side: ${args.side} (${sideNames[args.side]})
+- Symbol: ${args.symbol}
+- TimeInForce: ${args.timeInForce} (${timeInForceNames[args.timeInForce]})
+
+To execute this order, call the executeOrder tool with these exact same parameters.`,
+            uri: "verifyOrder"
+          }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to verify order parameters"}`,
+            uri: "verifyOrder"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+var createExecuteOrderHandler = (parser, verifiedOrders, pendingRequests) => {
+  return async (args) => {
+    try {
+      const verifiedOrder = verifiedOrders.get(args.clOrdID);
+      if (!verifiedOrder) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Error: Order ${args.clOrdID} has not been verified. Please call verifyOrder first.`,
+              uri: "executeOrder"
+            }
+          ],
+          isError: true
+        };
+      }
+      if (verifiedOrder.handlInst !== args.handlInst || verifiedOrder.quantity !== Number.parseFloat(String(args.quantity)) || verifiedOrder.price !== Number.parseFloat(String(args.price)) || verifiedOrder.ordType !== args.ordType || verifiedOrder.side !== args.side || verifiedOrder.symbol !== args.symbol || verifiedOrder.timeInForce !== args.timeInForce) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: "Error: Order parameters do not match the verified order. Please use the exact same parameters that were verified.",
+              uri: "executeOrder"
+            }
+          ],
+          isError: true
+        };
+      }
+      const response = new Promise((resolve) => {
+        pendingRequests.set(args.clOrdID, resolve);
+      });
+      const order = parser.createMessage(
+        new Field2(Fields2.MsgType, Messages2.NewOrderSingle),
+        new Field2(Fields2.MsgSeqNum, parser.getNextTargetMsgSeqNum()),
+        new Field2(Fields2.SenderCompID, parser.sender),
+        new Field2(Fields2.TargetCompID, parser.target),
+        new Field2(Fields2.SendingTime, parser.getTimestamp()),
+        new Field2(Fields2.ClOrdID, args.clOrdID),
+        new Field2(Fields2.Side, args.side),
+        new Field2(Fields2.Symbol, args.symbol),
+        new Field2(Fields2.OrderQty, Number.parseFloat(String(args.quantity))),
+        new Field2(Fields2.Price, Number.parseFloat(String(args.price))),
+        new Field2(Fields2.OrdType, args.ordType),
+        new Field2(Fields2.HandlInst, args.handlInst),
+        new Field2(Fields2.TimeInForce, args.timeInForce),
+        new Field2(Fields2.TransactTime, parser.getTimestamp())
+      );
+      if (!parser.connected) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: "Error: Not connected. Ignoring message.",
+              uri: "executeOrder"
             }
+          ],
+          isError: true
+        };
+      }
+      parser.send(order);
+      const fixData = await response;
+      verifiedOrders.delete(args.clOrdID);
+      return {
+        content: [
+          {
+            type: "text",
+            text: fixData.messageType === Messages2.Reject ? `Reject message for order ${args.clOrdID}: ${JSON.stringify(fixData.toFIXJSON())}` : `Execution Report for order ${args.clOrdID}: ${JSON.stringify(fixData.toFIXJSON())}`,
+            uri: "executeOrder"
           }
-        }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to execute order"}`,
+            uri: "executeOrder"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+
+// src/tools/parse.ts
+var createParseHandler = (parser) => {
+  return async (args) => {
+    try {
+      const parsedMessage = parser.parse(args.fixString);
+      if (!parsedMessage || parsedMessage.length === 0) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: "Error: Failed to parse FIX string",
+              uri: "parse"
+            }
+          ],
+          isError: true
+        };
+      }
+      return {
+        content: [
+          {
+            type: "text",
+            text: `${parsedMessage[0].description}
+${parsedMessage[0].messageTypeDescription}`,
+            uri: "parse"
+          }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to parse FIX string"}`,
+            uri: "parse"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+
+// src/tools/parseToJSON.ts
+var createParseToJSONHandler = (parser) => {
+  return async (args) => {
+    try {
+      const parsedMessage = parser.parse(args.fixString);
+      if (!parsedMessage || parsedMessage.length === 0) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: "Error: Failed to parse FIX string",
+              uri: "parseToJSON"
+            }
+          ],
+          isError: true
+        };
+      }
+      return {
+        content: [
+          {
+            type: "text",
+            text: `${parsedMessage[0].toFIXJSON()}`,
+            uri: "parseToJSON"
+          }
+        ]
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Error: ${error instanceof Error ? error.message : "Failed to parse FIX string"}`,
+            uri: "parseToJSON"
+          }
+        ],
+        isError: true
+      };
+    }
+  };
+};
+
+// src/tools/index.ts
+var createToolHandlers = (parser, verifiedOrders, pendingRequests, marketDataPrices) => ({
+  parse: createParseHandler(parser),
+  parseToJSON: createParseToJSONHandler(parser),
+  verifyOrder: createVerifyOrderHandler(parser, verifiedOrders),
+  executeOrder: createExecuteOrderHandler(parser, verifiedOrders, pendingRequests),
+  marketDataRequest: createMarketDataRequestHandler(parser, pendingRequests),
+  getStockGraph: createGetStockGraphHandler(marketDataPrices),
+  getStockPriceHistory: createGetStockPriceHistoryHandler(marketDataPrices)
+});
+
+// src/MCPLocal.ts
+var MCPLocal = class {
+  parser;
+  server = new Server(
+    {
+      name: "fixparser",
+      version: "1.0.0"
+    },
+    {
+      capabilities: {
+        tools: Object.entries(toolSchemas).reduce(
+          (acc, [name, { description, schema }]) => {
+            acc[name] = {
+              description,
+              parameters: schema
+            };
+            return acc;
+          },
+          {}
+        )
       }
     }
   );
@@ -189,7 +788,6 @@ var MCPLocal = class {
   onReady = void 0;
   pendingRequests = /* @__PURE__ */ new Map();
   verifiedOrders = /* @__PURE__ */ new Map();
-  // Store market data prices with timestamps
   marketDataPrices = /* @__PURE__ */ new Map();
   MAX_PRICE_HISTORY = 1e5;
   // Maximum number of price points to store per symbol
@@ -204,42 +802,63 @@ var MCPLocal = class {
         message: `MCP Server received message: ${message.messageType}: ${message.description}`
       });
       const msgType = message.messageType;
-      if (msgType === Messages.MarketDataSnapshotFullRefresh || msgType === Messages.ExecutionReport || msgType === Messages.Reject || msgType === Messages.MarketDataIncrementalRefresh) {
+      if (msgType === Messages3.MarketDataSnapshotFullRefresh || msgType === Messages3.ExecutionReport || msgType === Messages3.Reject || msgType === Messages3.MarketDataIncrementalRefresh) {
         this.parser?.logger.log({
           level: "info",
           message: `MCP Server handling message type: ${msgType}`
         });
         let id;
-        if (msgType === Messages.MarketDataIncrementalRefresh || msgType === Messages.MarketDataSnapshotFullRefresh) {
-          const symbol = message.getField(Fields.Symbol);
-          const price = message.getField(Fields.MDEntryPx);
-          const timestamp = message.getField(Fields.MDEntryTime)?.value || Date.now();
+        if (msgType === Messages3.MarketDataIncrementalRefresh || msgType === Messages3.MarketDataSnapshotFullRefresh) {
+          const symbol = message.getField(Fields3.Symbol);
+          const entryType = message.getField(Fields3.MDEntryType);
+          const price = message.getField(Fields3.MDEntryPx);
+          const size = message.getField(Fields3.MDEntrySize);
+          const timestamp = message.getField(Fields3.MDEntryTime)?.value || Date.now();
           if (symbol?.value && price?.value) {
             const symbolStr = String(symbol.value);
             const priceNum = Number(price.value);
+            const sizeNum = size?.value ? Number(size.value) : 0;
             const priceHistory = this.marketDataPrices.get(symbolStr) || [];
-            priceHistory.push({
+            const lastEntry = priceHistory[priceHistory.length - 1] || {
+              timestamp: 0,
+              bid: 0,
+              offer: 0,
+              spread: 0,
+              volume: 0
+            };
+            const newEntry = {
               timestamp: Number(timestamp),
-              price: priceNum
-            });
+              bid: entryType?.value === MDEntryType2.Bid ? priceNum : lastEntry.bid,
+              offer: entryType?.value === MDEntryType2.Offer ? priceNum : lastEntry.offer,
+              spread: entryType?.value === MDEntryType2.Offer ? priceNum - lastEntry.bid : entryType?.value === MDEntryType2.Bid ? lastEntry.offer - priceNum : lastEntry.spread,
+              volume: entryType?.value === MDEntryType2.TradeVolume ? sizeNum : lastEntry.volume
+            };
+            priceHistory.push(newEntry);
             if (priceHistory.length > this.MAX_PRICE_HISTORY) {
               priceHistory.shift();
             }
             this.marketDataPrices.set(symbolStr, priceHistory);
             this.parser?.logger.log({
               level: "info",
-              message: `MCP Server added ${symbol}: ${priceNum}`
+              message: `MCP Server added ${symbol}: ${JSON.stringify(newEntry)}`
+            });
+            this.server.notification({
+              method: "priceUpdate",
+              params: {
+                symbol: symbolStr,
+                ...newEntry
+              }
             });
           }
         }
-        if (msgType === Messages.MarketDataSnapshotFullRefresh) {
-          const mdReqID = message.getField(Fields.MDReqID);
+        if (msgType === Messages3.MarketDataSnapshotFullRefresh) {
+          const mdReqID = message.getField(Fields3.MDReqID);
           if (mdReqID) id = String(mdReqID.value);
-        } else if (msgType === Messages.ExecutionReport) {
-          const clOrdID = message.getField(Fields.ClOrdID);
+        } else if (msgType === Messages3.ExecutionReport) {
+          const clOrdID = message.getField(Fields3.ClOrdID);
           if (clOrdID) id = String(clOrdID.value);
-        } else if (msgType === Messages.Reject) {
-          const refSeqNum = message.getField(Fields.RefSeqNum);
+        } else if (msgType === Messages3.Reject) {
+          const refSeqNum = message.getField(Fields3.RefSeqNum);
           if (refSeqNum) id = String(refSeqNum.value);
         }
         if (id) {
@@ -264,662 +883,54 @@ var MCPLocal = class {
     if (!this.server) {
       return;
     }
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("resources/list") }),
-      async (request, extra) => {
-        return {
-          resources: [
-            {
-              name: "greeting",
-              description: "A simple greeting resource",
-              uri: "greeting-resource"
-            },
-            {
-              name: "stockGraph",
-              description: "Generates a price chart for a given symbol",
-              uri: "stockGraph",
-              parameters: {
-                type: "object",
-                properties: {
-                  symbol: { type: "string" }
-                },
-                required: ["symbol"]
-              }
-            },
-            {
-              name: "stockPriceHistory",
-              description: "Returns price history for a given symbol",
-              uri: "stockPriceHistory",
-              parameters: {
-                type: "object",
-                properties: {
-                  symbol: { type: "string" }
-                },
-                required: ["symbol"]
-              }
-            }
-          ]
-        };
-      }
-    );
     this.server.setRequestHandler(
       z.object({ method: z.literal("tools/list") }),
       async (request, extra) => {
         return {
-          tools: [
-            {
-              name: "parse",
-              description: "Parses a FIX message and describes it in plain language",
-              parameters: {
-                type: "object",
-                properties: {
-                  fixString: { type: "string" }
-                },
-                required: ["fixString"]
-              }
-            },
-            {
-              name: "parseToJSON",
-              description: "Parses a FIX message into JSON",
-              parameters: {
-                type: "object",
-                properties: {
-                  fixString: { type: "string" }
-                },
-                required: ["fixString"]
-              }
-            },
-            {
-              name: "verifyOrder",
-              description: "Verifies order parameters before execution",
-              parameters: {
-                type: "object",
-                properties: {
-                  clOrdID: { type: "string" },
-                  handlInst: { type: "string", enum: ["1", "2", "3"] },
-                  quantity: { type: "string" },
-                  price: { type: "string" },
-                  ordType: {
-                    type: "string",
-                    enum: [
-                      "1",
-                      "2",
-                      "3",
-                      "4",
-                      "5",
-                      "6",
-                      "7",
-                      "8",
-                      "9",
-                      "A",
-                      "B",
-                      "C",
-                      "D",
-                      "E",
-                      "F",
-                      "G",
-                      "H",
-                      "I",
-                      "J",
-                      "K",
-                      "L",
-                      "M",
-                      "P",
-                      "Q",
-                      "R",
-                      "S"
-                    ]
-                  },
-                  side: {
-                    type: "string",
-                    enum: [
-                      "1",
-                      "2",
-                      "3",
-                      "4",
-                      "5",
-                      "6",
-                      "7",
-                      "8",
-                      "9",
-                      "A",
-                      "B",
-                      "C",
-                      "D",
-                      "E",
-                      "F",
-                      "G",
-                      "H"
-                    ]
-                  },
-                  symbol: { type: "string" },
-                  timeInForce: {
-                    type: "string",
-                    enum: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C"]
-                  }
-                },
-                required: [
-                  "clOrdID",
-                  "handlInst",
-                  "quantity",
-                  "price",
-                  "ordType",
-                  "side",
-                  "symbol",
-                  "timeInForce"
-                ]
-              }
-            },
-            {
-              name: "executeOrder",
-              description: "Executes a verified order",
-              parameters: {
-                type: "object",
-                properties: {
-                  clOrdID: { type: "string" },
-                  handlInst: { type: "string", enum: ["1", "2", "3"] },
-                  quantity: { type: "string" },
-                  price: { type: "string" },
-                  ordType: { type: "string" },
-                  side: { type: "string" },
-                  symbol: { type: "string" },
-                  timeInForce: { type: "string" }
-                },
-                required: [
-                  "clOrdID",
-                  "handlInst",
-                  "quantity",
-                  "price",
-                  "ordType",
-                  "side",
-                  "symbol",
-                  "timeInForce"
-                ]
-              }
-            },
-            {
-              name: "marketDataRequest",
-              description: "Requests market data for specified symbols",
-              parameters: {
-                type: "object",
-                properties: {
-                  mdUpdateType: { type: "string", enum: ["0", "1"] },
-                  symbols: { type: "array", items: { type: "string" } },
-                  mdReqID: { type: "string" },
-                  subscriptionRequestType: { type: "string", enum: ["0", "1", "2"] },
-                  mdEntryTypes: { type: "array", items: { type: "string" } }
-                },
-                required: [
-                  "mdUpdateType",
-                  "symbols",
-                  "mdReqID",
-                  "subscriptionRequestType",
-                  "mdEntryTypes"
-                ]
-              }
-            }
-          ]
-        };
-      }
-    );
-    this.server.setRequestHandler(z.object({ method: z.literal("parse") }), async (request, extra) => {
-      try {
-        const args = request.params;
-        const parsedMessage = this.parser?.parse(args.fixString);
-        if (!parsedMessage || parsedMessage.length === 0) {
-          return {
-            content: [{ type: "text", text: "Error: Failed to parse FIX string" }],
-            isError: true
-          };
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: `${parsedMessage[0].description}
-${parsedMessage[0].messageTypeDescription}`
-            }
-          ]
-        };
-      } catch (error) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error: ${error instanceof Error ? error.message : "Failed to parse FIX string"}`
-            }
-          ],
-          isError: true
+          tools: Object.entries(toolSchemas).map(([name, { description, schema }]) => ({
+            name,
+            description,
+            inputSchema: schema
+          }))
         };
       }
-    });
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("parseToJSON") }),
-      async (request, extra) => {
-        try {
-          const args = request.params;
-          const parsedMessage = this.parser?.parse(args.fixString);
-          if (!parsedMessage || parsedMessage.length === 0) {
-            return {
-              content: [{ type: "text", text: "Error: Failed to parse FIX string" }],
-              isError: true
-            };
-          }
-          return {
-            content: [
-              {
-                type: "text",
-                text: `${parsedMessage[0].toFIXJSON()}`
-              }
-            ]
-          };
-        } catch (error) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error: ${error instanceof Error ? error.message : "Failed to parse FIX string"}`
-              }
-            ],
-            isError: true
-          };
-        }
-      }
-    );
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("verifyOrder") }),
-      async (request, extra) => {
-        try {
-          const args = request.params;
-          this.verifiedOrders.set(args.clOrdID, {
-            clOrdID: args.clOrdID,
-            handlInst: args.handlInst,
-            quantity: Number.parseFloat(args.quantity),
-            price: Number.parseFloat(args.price),
-            ordType: args.ordType,
-            side: args.side,
-            symbol: args.symbol,
-            timeInForce: args.timeInForce
-          });
-          const ordTypeNames = {
-            "1": "Market",
-            "2": "Limit",
-            "3": "Stop",
-            "4": "StopLimit",
-            "5": "MarketOnClose",
-            "6": "WithOrWithout",
-            "7": "LimitOrBetter",
-            "8": "LimitWithOrWithout",
-            "9": "OnBasis",
-            A: "OnClose",
-            B: "LimitOnClose",
-            C: "ForexMarket",
-            D: "PreviouslyQuoted",
-            E: "PreviouslyIndicated",
-            F: "ForexLimit",
-            G: "ForexSwap",
-            H: "ForexPreviouslyQuoted",
-            I: "Funari",
-            J: "MarketIfTouched",
-            K: "MarketWithLeftOverAsLimit",
-            L: "PreviousFundValuationPoint",
-            M: "NextFundValuationPoint",
-            P: "Pegged",
-            Q: "CounterOrderSelection",
-            R: "StopOnBidOrOffer",
-            S: "StopLimitOnBidOrOffer"
-          };
-          const sideNames = {
-            "1": "Buy",
-            "2": "Sell",
-            "3": "BuyMinus",
-            "4": "SellPlus",
-            "5": "SellShort",
-            "6": "SellShortExempt",
-            "7": "Undisclosed",
-            "8": "Cross",
-            "9": "CrossShort",
-            A: "CrossShortExempt",
-            B: "AsDefined",
-            C: "Opposite",
-            D: "Subscribe",
-            E: "Redeem",
-            F: "Lend",
-            G: "Borrow",
-            H: "SellUndisclosed"
-          };
-          const timeInForceNames = {
-            "0": "Day",
-            "1": "GoodTillCancel",
-            "2": "AtTheOpening",
-            "3": "ImmediateOrCancel",
-            "4": "FillOrKill",
-            "5": "GoodTillCrossing",
-            "6": "GoodTillDate",
-            "7": "AtTheClose",
-            "8": "GoodThroughCrossing",
-            "9": "AtCrossing",
-            A: "GoodForTime",
-            B: "GoodForAuction",
-            C: "GoodForMonth"
-          };
-          const handlInstNames = {
-            "1": "AutomatedExecutionNoIntervention",
-            "2": "AutomatedExecutionInterventionOK",
-            "3": "ManualOrder"
-          };
-          return {
-            content: [
-              {
-                type: "text",
-                text: `VERIFICATION: All parameters valid. Ready to proceed with order execution.
-                                    
-Parameters verified:
-- ClOrdID: ${args.clOrdID}
-- HandlInst: ${args.handlInst} (${handlInstNames[args.handlInst]})
-- Quantity: ${args.quantity}
-- Price: ${args.price}
-- OrdType: ${args.ordType} (${ordTypeNames[args.ordType]})
-- Side: ${args.side} (${sideNames[args.side]})
-- Symbol: ${args.symbol}
-- TimeInForce: ${args.timeInForce} (${timeInForceNames[args.timeInForce]})
-
-To execute this order, call the executeOrder tool with these exact same parameters.`
-              }
-            ]
-          };
-        } catch (error) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error: ${error instanceof Error ? error.message : "Failed to verify order parameters"}`
-              }
-            ],
-            isError: true
-          };
-        }
-      }
-    );
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("executeOrder") }),
-      async (request, extra) => {
-        try {
-          const args = request.params;
-          const verifiedOrder = this.verifiedOrders.get(args.clOrdID);
-          if (!verifiedOrder) {
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: `Error: Order ${args.clOrdID} has not been verified. Please call verifyOrder first.`
-                }
-              ],
-              isError: true
-            };
-          }
-          if (verifiedOrder.handlInst !== args.handlInst || verifiedOrder.quantity !== Number.parseFloat(args.quantity) || verifiedOrder.price !== Number.parseFloat(args.price) || verifiedOrder.ordType !== args.ordType || verifiedOrder.side !== args.side || verifiedOrder.symbol !== args.symbol || verifiedOrder.timeInForce !== args.timeInForce) {
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: "Error: Order parameters do not match the verified order. Please use the exact same parameters that were verified."
-                }
-              ],
-              isError: true
-            };
-          }
-          const response = new Promise((resolve) => {
-            this.pendingRequests.set(args.clOrdID, resolve);
-          });
-          const order = this.parser?.createMessage(
-            new Field(Fields.MsgType, Messages.NewOrderSingle),
-            new Field(Fields.MsgSeqNum, this.parser?.getNextTargetMsgSeqNum()),
-            new Field(Fields.SenderCompID, this.parser?.sender),
-            new Field(Fields.TargetCompID, this.parser?.target),
-            new Field(Fields.SendingTime, this.parser?.getTimestamp()),
-            new Field(Fields.ClOrdID, args.clOrdID),
-            new Field(Fields.Side, args.side),
-            new Field(Fields.Symbol, args.symbol),
-            new Field(Fields.OrderQty, Number.parseFloat(args.quantity)),
-            new Field(Fields.Price, Number.parseFloat(args.price)),
-            new Field(Fields.OrdType, args.ordType),
-            new Field(Fields.HandlInst, args.handlInst),
-            new Field(Fields.TimeInForce, args.timeInForce),
-            new Field(Fields.TransactTime, this.parser?.getTimestamp())
-          );
-          if (!this.parser?.connected) {
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: "Error: Not connected. Ignoring message."
-                }
-              ],
-              isError: true
-            };
-          }
-          this.parser?.send(order);
-          const fixData = await response;
-          this.verifiedOrders.delete(args.clOrdID);
-          return {
-            content: [
-              {
-                type: "text",
-                text: fixData.messageType === Messages.Reject ? `Reject message for order ${args.clOrdID}: ${JSON.stringify(fixData.toFIXJSON())}` : `Execution Report for order ${args.clOrdID}: ${JSON.stringify(fixData.toFIXJSON())}`
-              }
-            ]
-          };
-        } catch (error) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error: ${error instanceof Error ? error.message : "Failed to execute order"}`
-              }
-            ],
-            isError: true
-          };
-        }
-      }
     );
     this.server.setRequestHandler(
-      z.object({ method: z.literal("marketDataRequest") }),
+      z.object({
+        method: z.literal("tools/call"),
+        params: z.object({
+          name: z.string(),
+          arguments: z.any(),
+          _meta: z.object({
+            progressToken: z.number()
+          }).optional()
+        })
+      }),
       async (request, extra) => {
-        try {
-          const args = request.params;
-          const response = new Promise((resolve) => {
-            this.pendingRequests.set(args.mdReqID, resolve);
-          });
-          const messageFields = [
-            new Field(Fields.MsgType, Messages.MarketDataRequest),
-            new Field(Fields.SenderCompID, this.parser?.sender),
-            new Field(Fields.MsgSeqNum, this.parser?.getNextTargetMsgSeqNum()),
-            new Field(Fields.TargetCompID, this.parser?.target),
-            new Field(Fields.SendingTime, this.parser?.getTimestamp()),
-            new Field(Fields.MDReqID, args.mdReqID),
-            new Field(Fields.SubscriptionRequestType, args.subscriptionRequestType),
-            new Field(Fields.MarketDepth, 0),
-            new Field(Fields.MDUpdateType, args.mdUpdateType)
-          ];
-          messageFields.push(new Field(Fields.NoRelatedSym, args.symbols.length));
-          args.symbols.forEach((symbol) => {
-            messageFields.push(new Field(Fields.Symbol, symbol));
-          });
-          messageFields.push(new Field(Fields.NoMDEntryTypes, args.mdEntryTypes.length));
-          args.mdEntryTypes.forEach((entryType) => {
-            messageFields.push(new Field(Fields.MDEntryType, entryType));
-          });
-          const mdr = this.parser?.createMessage(...messageFields);
-          if (!this.parser?.connected) {
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: "Error: Not connected. Ignoring message."
-                }
-              ],
-              isError: true
-            };
-          }
-          this.parser?.send(mdr);
-          const fixData = await response;
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Market data for ${args.symbols.join(", ")}: ${JSON.stringify(fixData.toFIXJSON())}`
-              }
-            ]
-          };
-        } catch (error) {
+        const { name, arguments: args } = request.params;
+        const toolHandlers = createToolHandlers(
+          this.parser,
+          this.verifiedOrders,
+          this.pendingRequests,
+          this.marketDataPrices
+        );
+        const handler = toolHandlers[name];
+        if (!handler) {
           return {
             content: [
               {
                 type: "text",
-                text: `Error: ${error instanceof Error ? error.message : "Failed to request market data"}`
+                text: `Tool not found: ${name}`,
+                uri: name
               }
             ],
             isError: true
           };
         }
-      }
-    );
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("greeting-resource") }),
-      async (request, extra) => {
-        this.parser?.logger.log({
-          level: "info",
-          message: "MCP Server Resource called: greeting-resource"
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: "Hello, world!"
-            }
-          ]
-        };
-      }
-    );
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("stockGraph") }),
-      async (request, extra) => {
-        this.parser?.logger.log({
-          level: "info",
-          message: "MCP Server Resource called: stockGraph"
-        });
-        const args = request.params;
-        const symbol = args.symbol;
-        const priceHistory = this.marketDataPrices.get(symbol) || [];
-        if (priceHistory.length === 0) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: `No price data available for ${symbol}`
-              }
-            ]
-          };
-        }
-        const width = 600;
-        const height = 300;
-        const padding = 40;
-        const xScale = (width - 2 * padding) / (priceHistory.length - 1);
-        const yMin = Math.min(...priceHistory.map((d) => d.price));
-        const yMax = Math.max(...priceHistory.map((d) => d.price));
-        const yScale = (height - 2 * padding) / (yMax - yMin);
-        const points = priceHistory.map((d, i) => {
-          const x = padding + i * xScale;
-          const y = height - padding - (d.price - yMin) * yScale;
-          return `${x},${y}`;
-        }).join(" L ");
-        const svg = `<?xml version="1.0" encoding="UTF-8"?>
-<svg width="${width}" height="${height}" xmlns="http://www.w3.org/2000/svg">
-    <!-- Background -->
-    <rect width="100%" height="100%" fill="#f8f9fa"/>
-    
-    <!-- Grid lines -->
-    <g stroke="#e9ecef" stroke-width="1">
-        ${Array.from({ length: 5 }, (_, i) => {
-          const y = padding + (height - 2 * padding) * i / 4;
-          return `<line x1="${padding}" y1="${y}" x2="${width - padding}" y2="${y}"/>`;
-        }).join("\n")}
-    </g>
-    
-    <!-- Price line -->
-    <path d="M ${points}" 
-          fill="none" 
-          stroke="#007bff" 
-          stroke-width="2"/>
-    
-    <!-- Data points -->
-    ${priceHistory.map((d, i) => {
-          const x = padding + i * xScale;
-          const y = height - padding - (d.price - yMin) * yScale;
-          return `<circle cx="${x}" cy="${y}" r="3" fill="#007bff"/>`;
-        }).join("\n")}
-    
-    <!-- Labels -->
-    <g font-family="Arial" font-size="12" fill="#495057">
-        ${Array.from({ length: 5 }, (_, i) => {
-          const x = padding + (width - 2 * padding) * i / 4;
-          const index = Math.floor((priceHistory.length - 1) * i / 4);
-          const timestamp = new Date(priceHistory[index].timestamp).toLocaleTimeString();
-          return `<text x="${x + padding}" y="${height - padding + 20}" text-anchor="middle">${timestamp}</text>`;
-        }).join("\n")}
-        ${Array.from({ length: 5 }, (_, i) => {
-          const y = padding + (height - 2 * padding) * i / 4;
-          const price = yMax - (yMax - yMin) * i / 4;
-          return `<text x="${padding - 5}" y="${y + 4}" text-anchor="end">$${price.toFixed(2)}</text>`;
-        }).join("\n")}
-    </g>
-    
-    <!-- Title -->
-    <text x="${width / 2}" y="${padding / 2}" 
-          font-family="Arial" font-size="16" font-weight="bold" 
-          text-anchor="middle" fill="#212529">
-        ${symbol} - Price Chart (${priceHistory.length} points)
-    </text>
-</svg>`;
-        return {
-          content: [
-            {
-              type: "text",
-              text: svg
-            }
-          ]
-        };
-      }
-    );
-    this.server.setRequestHandler(
-      z.object({ method: z.literal("stockPriceHistory") }),
-      async (request, extra) => {
-        this.parser?.logger.log({
-          level: "info",
-          message: "MCP Server Resource called: stockPriceHistory"
-        });
-        const args = request.params;
-        const symbol = args.symbol;
-        const priceHistory = this.marketDataPrices.get(symbol) || [];
+        const result = await handler(args);
         return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(
-                {
-                  symbol,
-                  count: priceHistory.length,
-                  prices: priceHistory.map((point) => ({
-                    timestamp: new Date(point.timestamp).toISOString(),
-                    price: point.price
-                  }))
-                },
-                null,
-                2
-              )
-            }
-          ]
+          content: result.content,
+          isError: result.isError
         };
       }
     );