schwab_mcp 0.1.0 → 0.2.0

data/lib/schwab_mcp/tools/cancel_order_tool.rb

@@ -2,6 +2,7 @@ require "mcp"
 require "schwab_rb"
 require "json"
 require_relative "../loggable"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -52,20 +53,8 @@ module SchwabMCP
         end
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
           account_id = ENV[account_name]
           unless account_id
@@ -80,9 +69,9 @@ module SchwabMCP
           log_debug("Found account ID: [REDACTED] for account name: #{account_name}")
           log_debug("Fetching account numbers mapping")
 
-          account_numbers_response = client.get_account_numbers
 
-          unless account_numbers_response&.body
+          account_numbers = client.get_account_numbers # returns SchwabRb::DataObjects::AccountNumbers
+          unless account_numbers && account_numbers.respond_to?(:accounts)
             log_error("Failed to retrieve account numbers")
             return MCP::Tool::Response.new([{
               type: "text",
@@ -90,13 +79,10 @@ module SchwabMCP
             }])
           end
 
-          account_mappings = JSON.parse(account_numbers_response.body, symbolize_names: true)
-          log_debug("Account mappings retrieved (#{account_mappings.length} accounts found)")
-
           account_hash = nil
-          account_mappings.each do |mapping|
-            if mapping[:accountNumber] == account_id
-              account_hash = mapping[:hashValue]
+          account_numbers.accounts.each do |acct|
+            if acct.account_number.to_s == account_id.to_s
+              account_hash = acct.hash_value
               break
             end
           end
@@ -105,16 +91,16 @@ module SchwabMCP
             log_error("Account ID not found in available accounts")
             return MCP::Tool::Response.new([{
               type: "text",
-              text: "**Error**: Account ID not found in available accounts. #{account_mappings.length} accounts available."
+              text: "**Error**: Account ID not found in available accounts. #{account_numbers.accounts.length} accounts available."
             }])
           end
 
           log_debug("Found account hash for account ID: #{account_name}")
           log_debug("Verifying order exists before attempting cancellation")
 
-          order_response = client.get_order(order_id, account_hash)
 
-          unless order_response&.body
+          order = client.get_order(order_id, account_hash) # returns SchwabRb::DataObjects::Order
+          unless order
             log_warn("Order not found or empty response for order ID: #{order_id}")
             return MCP::Tool::Response.new([{
               type: "text",
@@ -122,9 +108,8 @@ module SchwabMCP
             }])
           end
 
-          order_data = JSON.parse(order_response.body)
-          order_status = order_data['status']
-          cancelable = order_data['cancelable']
+          order_status = order.status
+          cancelable = order.respond_to?(:cancelable) ? order.cancelable : true # fallback if attribute not present
 
           log_debug("Order found - Status: #{order_status}, Cancelable: #{cancelable}")
           if cancelable == false
@@ -140,7 +125,7 @@ module SchwabMCP
 
           if cancel_response.respond_to?(:status) && cancel_response.status == 200
             log_info("Successfully cancelled order ID: #{order_id}")
-            formatted_response = format_cancellation_success(order_id, account_name, order_data)
+            formatted_response = format_cancellation_success(order_id, account_name, order)
           elsif cancel_response.respond_to?(:status) && cancel_response.status == 404
             log_warn("Order not found during cancellation: #{order_id}")
             return MCP::Tool::Response.new([{
@@ -149,7 +134,7 @@ module SchwabMCP
             }])
           else
             log_info("Order cancellation request submitted for order ID: #{order_id}")
-            formatted_response = format_cancellation_success(order_id, account_name, order_data)
+            formatted_response = format_cancellation_success(order_id, account_name, order)
           end
 
           MCP::Tool::Response.new([{
@@ -157,12 +142,7 @@ module SchwabMCP
             text: formatted_response
           }])
 
-        rescue JSON::ParserError => e
-          log_error("JSON parsing error: #{e.message}")
-          MCP::Tool::Response.new([{
-            type: "text",
-            text: "**Error**: Failed to parse API response: #{e.message}"
-          }])
+        # No JSON::ParserError rescue needed with data objects
         rescue => e
           log_error("Error cancelling order ID #{order_id}: #{e.message}")
           log_debug("Backtrace: #{e.backtrace.first(3).join('\n')}")
@@ -186,27 +166,26 @@ module SchwabMCP
 
       private
 
-      def self.format_cancellation_success(order_id, account_name, order_data)
+      def self.format_cancellation_success(order_id, account_name, order)
         friendly_name = account_name.gsub('_ACCOUNT', '').split('_').map(&:capitalize).join(' ')
 
         formatted = "**✅ Order Cancellation Successful**\n\n"
         formatted += "**Order ID**: #{order_id}\n"
         formatted += "**Account**: #{friendly_name} (#{account_name})\n\n"
         formatted += "**Order Details:**\n"
-        formatted += "- Original Status: #{order_data['status']}\n" if order_data['status']
-        formatted += "- Order Type: #{order_data['orderType']}\n" if order_data['orderType']
-        formatted += "- Session: #{order_data['session']}\n" if order_data['session']
-        formatted += "- Duration: #{order_data['duration']}\n" if order_data['duration']
-        formatted += "- Quantity: #{order_data['quantity']}\n" if order_data['quantity']
-        formatted += "- Price: $#{format_currency(order_data['price'])}\n" if order_data['price']
-
-        if order_data['orderLegCollection'] && order_data['orderLegCollection'].any?
+        formatted += "- Original Status: #{order.status}\n" if order.status
+        formatted += "- Order Type: #{order.order_type}\n" if order.order_type
+        formatted += "- Duration: #{order.duration}\n" if order.duration
+        formatted += "- Quantity: #{order.quantity}\n" if order.quantity
+        formatted += "- Price: $#{format_currency(order.price)}\n" if order.price
+
+        if order.order_leg_collection && order.order_leg_collection.any?
           formatted += "\n**Instruments:**\n"
-          order_data['orderLegCollection'].each do |leg|
-            if leg['instrument']
-              symbol = leg['instrument']['symbol']
-              instruction = leg['instruction']
-              quantity = leg['quantity']
+          order.order_leg_collection.each do |leg|
+            if leg.instrument
+              symbol = leg.instrument.symbol
+              instruction = leg.instruction
+              quantity = leg.quantity
               formatted += "- #{symbol}: #{instruction} #{quantity}\n"
             end
           end

data/lib/schwab_mcp/tools/get_market_hours_tool.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "mcp"
 require "schwab_rb"
-require "json"
 require "date"
 require_relative "../loggable"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -42,22 +44,9 @@ module SchwabMCP
         log_debug("Date parameter: #{date || 'today'}")
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
-          # Parse date if provided
           parsed_date = nil
           if date
             begin
@@ -73,23 +62,24 @@ module SchwabMCP
           end
 
           log_debug("Making API request for markets: #{markets.join(', ')}")
-          response = client.get_market_hours(markets, date: parsed_date)
+          market_hours_obj = client.get_market_hours(markets, date: parsed_date, return_data_objects: true)
 
-          if response&.body
-            log_info("Successfully retrieved market hours for #{markets.join(', ')}")
-            date_info = date ? " for #{date}" : " for today"
-            MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Market Hours#{date_info}:**\n\n```json\n#{response.body}\n```"
-            }])
-          else
-            log_warn("Empty response from Schwab API for markets: #{markets.join(', ')}")
-            MCP::Tool::Response.new([{
+          unless market_hours_obj
+            log_warn("No market hours data object returned for markets: #{markets.join(', ')}")
+            return MCP::Tool::Response.new([{
               type: "text",
-              text: "**No Data**: Empty response from Schwab API for markets: #{markets.join(', ')}"
+              text: "**No Data**: No market hours data returned for markets: #{markets.join(', ')}"
             }])
           end
 
+          formatted = format_market_hours_object(market_hours_obj)
+          log_info("Successfully retrieved market hours for #{markets.join(', ')}")
+          date_info = date ? " for #{date}" : " for today"
+          MCP::Tool::Response.new([{
+            type: "text",
+            text: "**Market Hours#{date_info}:**\n\n#{formatted}"
+          }])
+
         rescue => e
           log_error("Error retrieving market hours for #{markets.join(', ')}: #{e.message}")
           log_debug("Backtrace: #{e.backtrace.first(3).join('\n')}")
@@ -99,6 +89,15 @@ module SchwabMCP
           }])
         end
       end
+
+      # Format the market hours object for display
+      def self.format_market_hours_object(obj)
+        if obj.respond_to?(:to_h)
+          obj.to_h.inspect
+        else
+          obj.inspect
+        end
+      end
     end
   end
 end

data/lib/schwab_mcp/tools/get_order_tool.rb

@@ -3,6 +3,7 @@ require "schwab_rb"
 require "json"
 require_relative "../loggable"
 require_relative "../redactor"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -53,20 +54,8 @@ module SchwabMCP
         end
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
           account_id = ENV[account_name]
           unless account_id
@@ -81,9 +70,9 @@ module SchwabMCP
           log_debug("Found account ID: [REDACTED] for account name: #{account_name}")
           log_debug("Fetching account numbers mapping")
 
-          account_numbers_response = client.get_account_numbers
 
-          unless account_numbers_response&.body
+          account_numbers = client.get_account_numbers # returns SchwabRb::DataObjects::AccountNumbers
+          unless account_numbers && account_numbers.respond_to?(:accounts)
             log_error("Failed to retrieve account numbers")
             return MCP::Tool::Response.new([{
               type: "text",
@@ -91,13 +80,10 @@ module SchwabMCP
             }])
           end
 
-          account_mappings = JSON.parse(account_numbers_response.body, symbolize_names: true)
-          log_debug("Account mappings retrieved (#{account_mappings.length} accounts found)")
-
           account_hash = nil
-          account_mappings.each do |mapping|
-            if mapping[:accountNumber] == account_id
-              account_hash = mapping[:hashValue]
+          account_numbers.accounts.each do |acct|
+            if acct.account_number.to_s == account_id.to_s
+              account_hash = acct.hash_value
               break
             end
           end
@@ -106,21 +92,17 @@ module SchwabMCP
             log_error("Account ID not found in available accounts")
             return MCP::Tool::Response.new([{
               type: "text",
-              text: "**Error**: Account ID not found in available accounts. #{account_mappings.length} accounts available."
+              text: "**Error**: Account ID not found in available accounts. #{account_numbers.accounts.length} accounts available."
             }])
           end
 
           log_debug("Found account hash for account ID: #{account_name}")
           log_debug("Fetching order details for order ID: #{order_id}")
 
-          order_response = client.get_order(order_id, account_hash)
-
-          if order_response&.body
+          order = client.get_order(order_id, account_hash) # returns SchwabRb::DataObjects::Order
+          if order
             log_info("Successfully retrieved order details for order ID: #{order_id}")
-            order_data = JSON.parse(order_response.body)
-
-            formatted_response = format_order_data(order_data, order_id, account_name)
-
+            formatted_response = format_order_object(order, order_id, account_name)
             MCP::Tool::Response.new([{
               type: "text",
               text: formatted_response
@@ -132,13 +114,6 @@ module SchwabMCP
               text: "**No Data**: Empty response from Schwab API for order ID: #{order_id}. Order may not exist or may be in a different account."
             }])
           end
-
-        rescue JSON::ParserError => e
-          log_error("JSON parsing error: #{e.message}")
-          MCP::Tool::Response.new([{
-            type: "text",
-            text: "**Error**: Failed to parse API response: #{e.message}"
-          }])
         rescue => e
           log_error("Error retrieving order details for order ID #{order_id}: #{e.message}")
           log_debug("Backtrace: #{e.backtrace.first(3).join('\n')}")
@@ -151,104 +126,72 @@ module SchwabMCP
 
       private
 
-      def self.format_order_data(order_data, order_id, account_name)
-        friendly_name = account_name.gsub('_ACCOUNT', '').split('_').map(&:capitalize).join(' ')
 
+      def self.format_order_object(order, order_id, account_name)
+        friendly_name = account_name.gsub('_ACCOUNT', '').split('_').map(&:capitalize).join(' ')
         formatted = "**Order Details for Order ID #{order_id}:**\n\n"
         formatted += "**Account:** #{friendly_name} (#{account_name})\n\n"
 
         formatted += "**Order Information:**\n"
-        formatted += "- Order ID: #{order_data['orderId']}\n" if order_data['orderId']
-        formatted += "- Status: #{order_data['status']}\n" if order_data['status']
-        formatted += "- Order Type: #{order_data['orderType']}\n" if order_data['orderType']
-        formatted += "- Session: #{order_data['session']}\n" if order_data['session']
-        formatted += "- Duration: #{order_data['duration']}\n" if order_data['duration']
-        formatted += "- Complex Order Strategy Type: #{order_data['complexOrderStrategyType']}\n" if order_data['complexOrderStrategyType']
-        formatted += "- Cancelable: #{order_data['cancelable']}\n" if order_data.key?('cancelable')
-        formatted += "- Editable: #{order_data['editable']}\n" if order_data.key?('editable')
+        formatted += "- Order ID: #{order.order_id}\n" if order.order_id
+        formatted += "- Status: #{order.status}\n" if order.status
+        formatted += "- Order Type: #{order.order_type}\n" if order.order_type
+        formatted += "- Duration: #{order.duration}\n" if order.duration
+        formatted += "- Complex Order Strategy Type: #{order.complex_order_strategy_type}\n" if order.complex_order_strategy_type
 
         formatted += "\n**Timing:**\n"
-        formatted += "- Entered Time: #{order_data['enteredTime']}\n" if order_data['enteredTime']
-        formatted += "- Close Time: #{order_data['closeTime']}\n" if order_data['closeTime']
+        formatted += "- Entered Time: #{order.entered_time}\n" if order.entered_time
+        formatted += "- Close Time: #{order.close_time}\n" if order.close_time
 
         formatted += "\n**Quantity & Pricing:**\n"
-        formatted += "- Quantity: #{order_data['quantity']}\n" if order_data['quantity']
-        formatted += "- Filled Quantity: #{order_data['filledQuantity']}\n" if order_data['filledQuantity']
-        formatted += "- Remaining Quantity: #{order_data['remainingQuantity']}\n" if order_data['remainingQuantity']
-        formatted += "- Requested Destination: #{order_data['requestedDestination']}\n" if order_data['requestedDestination']
-        formatted += "- Destination Link Name: #{order_data['destinationLinkName']}\n" if order_data['destinationLinkName']
-        formatted += "- Price: $#{format_currency(order_data['price'])}\n" if order_data['price']
-        formatted += "- Stop Price: $#{format_currency(order_data['stopPrice'])}\n" if order_data['stopPrice']
-        formatted += "- Stop Price Link Basis: #{order_data['stopPriceLinkBasis']}\n" if order_data['stopPriceLinkBasis']
-        formatted += "- Stop Price Link Type: #{order_data['stopPriceLinkType']}\n" if order_data['stopPriceLinkType']
-        formatted += "- Stop Price Offset: $#{format_currency(order_data['stopPriceOffset'])}\n" if order_data['stopPriceOffset']
-        formatted += "- Stop Type: #{order_data['stopType']}\n" if order_data['stopType']
+        formatted += "- Quantity: #{order.quantity}\n" if order.quantity
+        formatted += "- Filled Quantity: #{order.filled_quantity}\n" if order.filled_quantity
+        formatted += "- Remaining Quantity: #{order.remaining_quantity}\n" if order.remaining_quantity
+        formatted += "- Price: $#{format_currency(order.price)}\n" if order.price
 
-        if order_data['orderLegCollection'] && order_data['orderLegCollection'].any?
+        if order.order_leg_collection && order.order_leg_collection.any?
           formatted += "\n**Order Legs:**\n"
-          order_data['orderLegCollection'].each_with_index do |leg, index|
+          order.order_leg_collection.each_with_index do |leg, index|
             formatted += "**Leg #{index + 1}:**\n"
-            formatted += "- Instruction: #{leg['instruction']}\n" if leg['instruction']
-            formatted += "- Quantity: #{leg['quantity']}\n" if leg['quantity']
-            formatted += "- Position Effect: #{leg['positionEffect']}\n" if leg['positionEffect']
-            formatted += "- Quantity Type: #{leg['quantityType']}\n" if leg['quantityType']
+            formatted += "- Instruction: #{leg.instruction}\n" if leg.instruction
+            formatted += "- Quantity: #{leg.quantity}\n" if leg.quantity
+            formatted += "- Position Effect: #{leg.position_effect}\n" if leg.position_effect
 
-            if leg['instrument']
-              instrument = leg['instrument']
+            if leg.instrument
+              instrument = leg.instrument
               formatted += "- **Instrument:**\n"
-              formatted += "  * Asset Type: #{instrument['assetType']}\n" if instrument['assetType']
-              formatted += "  * Symbol: #{instrument['symbol']}\n" if instrument['symbol']
-              formatted += "  * Description: #{instrument['description']}\n" if instrument['description']
-              formatted += "  * CUSIP: #{instrument['cusip']}\n" if instrument['cusip']
-              formatted += "  * Net Change: #{instrument['netChange']}\n" if instrument['netChange']
-
-              if instrument['putCall']
-                formatted += "  * Option Type: #{instrument['putCall']}\n"
-                formatted += "  * Strike Price: $#{format_currency(instrument['strikePrice'])}\n" if instrument['strikePrice']
-                formatted += "  * Expiration Date: #{instrument['expirationDate']}\n" if instrument['expirationDate']
-                formatted += "  * Days to Expiration: #{instrument['daysToExpiration']}\n" if instrument['daysToExpiration']
-                formatted += "  * Expiration Type: #{instrument['expirationType']}\n" if instrument['expirationType']
-                formatted += "  * Exercise Type: #{instrument['exerciseType']}\n" if instrument['exerciseType']
-                formatted += "  * Settlement Type: #{instrument['settlementType']}\n" if instrument['settlementType']
-                formatted += "  * Deliverables: #{instrument['deliverables']}\n" if instrument['deliverables']
-              end
+              formatted += "  * Asset Type: #{instrument.asset_type}\n" if instrument.asset_type
+              formatted += "  * Symbol: #{instrument.symbol}\n" if instrument.symbol
+              formatted += "  * Description: #{instrument.description}\n" if instrument.description
             end
-            formatted += "\n" unless index == order_data['orderLegCollection'].length - 1
-          end
-        end
-
-        if order_data['childOrderStrategies'] && order_data['childOrderStrategies'].any?
-          formatted += "\n**Child Order Strategies:**\n"
-          formatted += "- Number of Child Orders: #{order_data['childOrderStrategies'].length}\n"
-          order_data['childOrderStrategies'].each_with_index do |child, index|
-            formatted += "- Child Order #{index + 1}: #{child['orderId']} (Status: #{child['status']})\n" if child['orderId'] && child['status']
+            formatted += "\n" unless index == order.order_leg_collection.length - 1
           end
         end
 
-        if order_data['orderActivityCollection'] && order_data['orderActivityCollection'].any?
+        if order.order_activity_collection && order.order_activity_collection.any?
           formatted += "\n**Order Activities:**\n"
-          order_data['orderActivityCollection'].each_with_index do |activity, index|
+          order.order_activity_collection.each_with_index do |activity, index|
             formatted += "**Activity #{index + 1}:**\n"
-            formatted += "- Activity Type: #{activity['activityType']}\n" if activity['activityType']
-            formatted += "- Execution Type: #{activity['executionType']}\n" if activity['executionType']
-            formatted += "- Quantity: #{activity['quantity']}\n" if activity['quantity']
-            formatted += "- Order Remaining Quantity: #{activity['orderRemainingQuantity']}\n" if activity['orderRemainingQuantity']
+            formatted += "- Activity Type: #{activity.activity_type}\n" if activity.activity_type
+            formatted += "- Execution Type: #{activity.execution_type}\n" if activity.execution_type
+            formatted += "- Quantity: #{activity.quantity}\n" if activity.quantity
+            formatted += "- Order Remaining Quantity: #{activity.order_remaining_quantity}\n" if activity.order_remaining_quantity
 
-            if activity['executionLegs'] && activity['executionLegs'].any?
-              activity['executionLegs'].each_with_index do |exec_leg, leg_index|
+            if activity.execution_legs && activity.execution_legs.any?
+              activity.execution_legs.each_with_index do |exec_leg, leg_index|
                 formatted += "- **Execution Leg #{leg_index + 1}:**\n"
-                formatted += "  * Leg ID: #{exec_leg['legId']}\n" if exec_leg['legId']
-                formatted += "  * Price: $#{format_currency(exec_leg['price'])}\n" if exec_leg['price']
-                formatted += "  * Quantity: #{exec_leg['quantity']}\n" if exec_leg['quantity']
-                formatted += "  * Mismarked Quantity: #{exec_leg['mismarkedQuantity']}\n" if exec_leg['mismarkedQuantity']
-                formatted += "  * Time: #{exec_leg['time']}\n" if exec_leg['time']
+                formatted += "  * Leg ID: #{exec_leg.leg_id}\n" if exec_leg.leg_id
+                formatted += "  * Price: $#{format_currency(exec_leg.price)}\n" if exec_leg.price
+                formatted += "  * Quantity: #{exec_leg.quantity}\n" if exec_leg.quantity
+                formatted += "  * Mismarked Quantity: #{exec_leg.mismarked_quantity}\n" if exec_leg.mismarked_quantity
+                formatted += "  * Time: #{exec_leg.time}\n" if exec_leg.time
               end
             end
-            formatted += "\n" unless index == order_data['orderActivityCollection'].length - 1
+            formatted += "\n" unless index == order.order_activity_collection.length - 1
           end
         end
 
-        redacted_data = Redactor.redact(order_data)
+        redacted_data = Redactor.redact(order.to_h)
         formatted += "\n**Full Response (Redacted):**\n"
         formatted += "```json\n#{JSON.pretty_generate(redacted_data)}\n```"
         formatted

data/lib/schwab_mcp/tools/get_price_history_tool.rb

@@ -1,8 +1,8 @@
 require "mcp"
 require "schwab_rb"
-require "json"
 require "date"
 require_relative "../loggable"
+require_relative "../schwab_client_factory"
 
 module SchwabMCP
   module Tools
@@ -68,20 +68,8 @@ module SchwabMCP
         log_info("Getting price history for symbol: #{symbol}")
 
         begin
-          client = SchwabRb::Auth.init_client_easy(
-            ENV['SCHWAB_API_KEY'],
-            ENV['SCHWAB_APP_SECRET'],
-            ENV['SCHWAB_CALLBACK_URI'],
-            ENV['TOKEN_PATH']
-          )
-
-          unless client
-            log_error("Failed to initialize Schwab client")
-            return MCP::Tool::Response.new([{
-              type: "text",
-              text: "**Error**: Failed to initialize Schwab client. Check your credentials."
-            }])
-          end
+          client = SchwabClientFactory.create_client
+          return SchwabClientFactory.client_error_response unless client
 
           parsed_start = nil
           parsed_end = nil
@@ -146,7 +134,7 @@ module SchwabMCP
 
           log_debug("Making price history API request for symbol: #{symbol}")
 
-          response = client.get_price_history(
+          price_history = client.get_price_history(
             symbol.upcase,
             period_type: period_type_enum,
             period: period,
@@ -158,29 +146,29 @@ module SchwabMCP
             need_previous_close: need_previous_close
           )
 
-          if response&.body
+          if price_history
             log_info("Successfully retrieved price history for #{symbol}")
 
-            begin
-              data = JSON.parse(response.body)
-              candles = data.dig("candles") || []
-
-              summary = if candles.any?
-                "Retrieved #{candles.length} price candles"
-              else
-                "No price data available for the specified parameters"
-              end
+            summary = if price_history.empty?
+              "No price data available for the specified parameters"
+            else
+              "Retrieved #{price_history.count} price candles\n" \
+              "First candle: #{price_history.first_candle&.to_h}\n" \
+              "Last candle: #{price_history.last_candle&.to_h}"
+            end
 
-              MCP::Tool::Response.new([{
-                type: "text",
-                text: "**Price History for #{symbol.upcase}:**\n\n#{summary}\n\n```json\n#{response.body}\n```"
-              }])
-            rescue JSON::ParserError
-              MCP::Tool::Response.new([{
-                type: "text",
-                text: "**Price History for #{symbol.upcase}:**\n\n```json\n#{response.body}\n```"
-              }])
+            # Show a compact JSON representation for advanced users
+            json_preview = begin
+              require "json"
+              JSON.pretty_generate(price_history.to_h)
+            rescue
+              price_history.to_h.inspect
             end
+
+            MCP::Tool::Response.new([{
+              type: "text",
+              text: "**Price History for #{symbol.upcase}:**\n\n#{summary}\n\n```json\n#{json_preview}\n```"
+            }])
           else
             log_warn("Empty response from Schwab API for symbol: #{symbol}")
             MCP::Tool::Response.new([{

data/lib/schwab_mcp/tools/help_tool.rb

@@ -56,8 +56,7 @@ module SchwabMCP
           - **get_market_hours_tool**: Get market hours for specified markets
           - **list_movers_tool**: Get top ten movers for a given index
 
-          ### Option Strategy Tools:
-          - **option_strategy_finder_tool**: Find option strategies (iron condor, call spread, put spread)
+          ### Option Order Tools:
           - **preview_order_tool**: Preview an options order before placing (⚠️ SAFE PREVIEW)
           - **place_order_tool**: Place an options order for execution (⚠️ DESTRUCTIVE)
           - **replace_order_tool**: Replace an existing order with a new one (⚠️ DESTRUCTIVE)
@@ -84,7 +83,6 @@ module SchwabMCP
 
           # Options
           option_chain_tool(symbol: "SPX", contract_type: "ALL")
-          option_strategy_finder_tool(strategy_type: "ironcondor", underlying_symbol: "SPX", expiration_date: "2025-01-17")
           preview_order_tool(account_name: "TRADING_BROKERAGE_ACCOUNT", strategy_type: "ironcondor", price: 1.50, quantity: 1)
 
           # Account Management
@@ -197,25 +195,6 @@ module SchwabMCP
 
           **Example**: `option_chain_tool(symbol: "SPX", contract_type: "ALL")`
 
-          ### option_strategy_finder_tool
-          Find option strategies using sophisticated algorithms.
-          **Parameters**:
-          - `strategy_type` (required) - "ironcondor", "callspread", or "putspread"
-          - `underlying_symbol` (required) - e.g., "SPX", "$SPX"
-          - `expiration_date` (required) - Target expiration "YYYY-MM-DD"
-          - `max_delta` (optional) - Maximum delta for short legs (default: 0.15)
-          - `max_spread` (optional) - Maximum spread width (default: 20.0)
-          - `min_credit` (optional) - Minimum credit in dollars (default: 100.0)
-          - `min_open_interest` (optional) - Minimum open interest (default: 0)
-          - `dist_from_strike` (optional) - Min distance from current price (default: 0.07)
-          - `expiration_type`, `settlement_type`, `option_root` (optional) - Filters
-
-          **Examples**:
-          ```
-          option_strategy_finder_tool(strategy_type: "ironcondor", underlying_symbol: "SPX", expiration_date: "2025-01-17")
-          option_strategy_finder_tool(strategy_type: "callspread", underlying_symbol: "SPY", expiration_date: "2025-01-10", max_delta: 0.20, min_credit: 50.0)
-          ```
-
           ## Order Management Tools
 
           ### preview_order_tool ⚠️ SAFE PREVIEW